Projects information

Chunk

Conflicting content
return newGraph; } <<<<<<< HEAD public TriplesMapGraph copyGraph() { TriplesMapGraph newGraph = new TriplesMapGraph(); ======= public TriplesMapGraph copyGraph() { TriplesMapGraph newGraph = new TriplesMapGraph(); >>>>>>> 809ce39bfc7e855952fee7ee1d674f5293083eda for(TriplesMap triplesMap : triplesMapIndex.values()) { newGraph.addTriplesMap(triplesMap);

Conflicting content

		return newGraph;
	}
	
<<<<<<< HEAD
 	public TriplesMapGraph copyGraph() {
 		TriplesMapGraph newGraph = new TriplesMapGraph();
=======
	public TriplesMapGraph copyGraph() {
		TriplesMapGraph newGraph = new TriplesMapGraph();
>>>>>>> 809ce39bfc7e855952fee7ee1d674f5293083eda
		for(TriplesMap triplesMap : triplesMapIndex.values())
		{
			newGraph.addTriplesMap(triplesMap);

Solution content
return newGraph; } <<<<<<< HEAD public TriplesMapGraph copyGraph() { TriplesMapGraph newGraph = new TriplesMapGraph(); ======= public TriplesMapGraph copyGraph() { TriplesMapGraph newGraph = new TriplesMapGraph(); >>>>>>> atf-multiroots for(TriplesMap triplesMap : triplesMapIndex.values()) { newGraph.addTriplesMap(triplesMap);

Solution content

		return newGraph;
	}
	
<<<<<<< HEAD
 	public TriplesMapGraph copyGraph() {
 		TriplesMapGraph newGraph = new TriplesMapGraph();
=======
	public TriplesMapGraph copyGraph() {
		TriplesMapGraph newGraph = new TriplesMapGraph();
>>>>>>> atf-multiroots
		for(TriplesMap triplesMap : triplesMapIndex.values())
		{
			newGraph.addTriplesMap(triplesMap);

File
TriplesMapGraph.java

Developer's decision
Manual

Kind of conflict
Method invocation
Method signature
Variable

Chunk

Conflicting content
for(TriplesMapLink link : links) { newGraph.addLink(new TriplesMapLink(link.getSourceMap(), link.getTargetMap(), link.getPredicateObjectMapLink())); <<<<<<< HEAD ======= } return newGraph; } public TriplesMapGraph shallowCopyGraph() { TriplesMapGraph newGraph = new TriplesMapGraph(); newGraph.links.addAll(links); for (Entry> entry : neighboringTriplesMapCache.entrySet()) { newGraph.neighboringTriplesMapCache.put(entry.getKey(), new LinkedList(entry.getValue())); >>>>>>> 809ce39bfc7e855952fee7ee1d674f5293083eda } return newGraph; }

Conflicting content

		for(TriplesMapLink link : links)
		{
			newGraph.addLink(new TriplesMapLink(link.getSourceMap(), link.getTargetMap(), link.getPredicateObjectMapLink()));
<<<<<<< HEAD
=======
		}
		return newGraph;
	}
	public TriplesMapGraph shallowCopyGraph() {
		TriplesMapGraph newGraph = new TriplesMapGraph();
		newGraph.links.addAll(links);
		for (Entry> entry : neighboringTriplesMapCache.entrySet()) {
			
			newGraph.neighboringTriplesMapCache.put(entry.getKey(), new LinkedList(entry.getValue()));
>>>>>>> 809ce39bfc7e855952fee7ee1d674f5293083eda
		}
		return newGraph;
	}

Solution content
for(TriplesMapLink link : links) { newGraph.addLink(new TriplesMapLink(link.getSourceMap(), link.getTargetMap(), link.getPredicateObjectMapLink())); <<<<<<< HEAD ======= } return newGraph; } public TriplesMapGraph shallowCopyGraph() { TriplesMapGraph newGraph = new TriplesMapGraph(); newGraph.links.addAll(links); for (Entry> entry : neighboringTriplesMapCache.entrySet()) { newGraph.neighboringTriplesMapCache.put(entry.getKey(), new LinkedList(entry.getValue())); >>>>>>> atf-multiroots } return newGraph; }

Solution content

		for(TriplesMapLink link : links)
		{
			newGraph.addLink(new TriplesMapLink(link.getSourceMap(), link.getTargetMap(), link.getPredicateObjectMapLink()));
<<<<<<< HEAD
=======
		}
		return newGraph;
	}
	public TriplesMapGraph shallowCopyGraph() {
		TriplesMapGraph newGraph = new TriplesMapGraph();
		newGraph.links.addAll(links);
		for (Entry> entry : neighboringTriplesMapCache.entrySet()) {
			
			newGraph.neighboringTriplesMapCache.put(entry.getKey(), new LinkedList(entry.getValue()));
>>>>>>> atf-multiroots
		}
		return newGraph;
	}

File
TriplesMapGraph.java

Developer's decision
Manual

Kind of conflict
For statement
Method invocation
Method signature
Return statement
Variable

Chunk

Conflicting content
} return newGraph; } <<<<<<< HEAD public TriplesMapGraph shallowCopyGraph() { TriplesMapGraph newGraph = new TriplesMapGraph(); newGraph.links.addAll(links); for (Entry> entry : neighboringTriplesMapCache.entrySet()) { newGraph.neighboringTriplesMapCache.put(entry.getKey(), new LinkedList(entry.getValue())); } newGraph.triplesMapIndex.putAll(triplesMapIndex); return newGraph; } ======= >>>>>>> 809ce39bfc7e855952fee7ee1d674f5293083eda public void killTriplesMap(List tripleMapToKill, RootStrategy strategy) { if (tripleMapToKill.size() == 0) { return;

Conflicting content

		}
		return newGraph;
	}
<<<<<<< HEAD
	public TriplesMapGraph shallowCopyGraph() {
		TriplesMapGraph newGraph = new TriplesMapGraph();
 		newGraph.links.addAll(links);
 		for (Entry> entry : neighboringTriplesMapCache.entrySet()) {
			
 			newGraph.neighboringTriplesMapCache.put(entry.getKey(), new LinkedList(entry.getValue()));
 		}
 		newGraph.triplesMapIndex.putAll(triplesMapIndex);
 		return newGraph;
 	}

=======
>>>>>>> 809ce39bfc7e855952fee7ee1d674f5293083eda
	public void killTriplesMap(List tripleMapToKill, RootStrategy strategy) {
		if (tripleMapToKill.size() == 0) {
			return;

Solution content
} return newGraph; } <<<<<<< HEAD public TriplesMapGraph shallowCopyGraph() { TriplesMapGraph newGraph = new TriplesMapGraph(); newGraph.links.addAll(links); for (Entry> entry : neighboringTriplesMapCache.entrySet()) { newGraph.neighboringTriplesMapCache.put(entry.getKey(), new LinkedList(entry.getValue())); } newGraph.triplesMapIndex.putAll(triplesMapIndex); return newGraph; } ======= >>>>>>> atf-multiroots public void killTriplesMap(List tripleMapToKill, RootStrategy strategy) { if (tripleMapToKill.size() == 0) { return;

Solution content

		}
		return newGraph;
	}
<<<<<<< HEAD
	public TriplesMapGraph shallowCopyGraph() {
		TriplesMapGraph newGraph = new TriplesMapGraph();
 		newGraph.links.addAll(links);
 		for (Entry> entry : neighboringTriplesMapCache.entrySet()) {
			
 			newGraph.neighboringTriplesMapCache.put(entry.getKey(), new LinkedList(entry.getValue()));
 		}
 		newGraph.triplesMapIndex.putAll(triplesMapIndex);
 		return newGraph;
 	}

=======
>>>>>>> atf-multiroots
	public void killTriplesMap(List tripleMapToKill, RootStrategy strategy) {
		if (tripleMapToKill.size() == 0) {
			return;

File
TriplesMapGraph.java

Developer's decision
Manual

Kind of conflict
Method declaration

Chunk

Conflicting content
private Map> graphTriplesMapsProcessingOrder; private boolean generateContext; private Map hNodeToContextUriMap; <<<<<<< HEAD ======= >>>>>>> 809ce39bfc7e855952fee7ee1d674f5293083eda public TriplesMapWorkerPlan(RepFactory factory, TriplesMap triplesMap, KR2RMLMapping kr2rmlMapping, URIFormatter uriFormatter,

Conflicting content

	private Map> graphTriplesMapsProcessingOrder;
	private boolean generateContext;

	private Map hNodeToContextUriMap;
<<<<<<< HEAD
	
=======

>>>>>>> 809ce39bfc7e855952fee7ee1d674f5293083eda
	public TriplesMapWorkerPlan(RepFactory factory, TriplesMap triplesMap, 
			KR2RMLMapping kr2rmlMapping, URIFormatter uriFormatter,

Solution content
private boolean generateContext; private Map hNodeToContextUriMap; <<<<<<< HEAD ======= >>>>>>> atf-multiroots private Map> graphTriplesMapsProcessingOrder; public TriplesMapWorkerPlan(RepFactory factory, TriplesMap triplesMap, KR2RMLMapping kr2rmlMapping, URIFormatter uriFormatter,

Solution content

	private boolean generateContext;

	private Map hNodeToContextUriMap;
<<<<<<< HEAD
	
=======

>>>>>>> atf-multiroots
	private Map> graphTriplesMapsProcessingOrder;
	public TriplesMapWorkerPlan(RepFactory factory, TriplesMap triplesMap, 
			KR2RMLMapping kr2rmlMapping, URIFormatter uriFormatter,

File
TriplesMapWorkerPlan.java

Developer's decision
Manual

Kind of conflict
Blank

Chunk

Conflicting content
{ if(graph.getTriplesMapIds().contains(triplesMap.getId())) { <<<<<<< HEAD links = graph.getAllNeighboringTriplesMap(triplesMap.getId()); break; } } ======= links = graph.getAllNeighboringTriplesMap(triplesMap.getId()); break; } } >>>>>>> 809ce39bfc7e855952fee7ee1d674f5293083eda for(TriplesMapLink link : links) { try { if(link.getSourceMap().getId().compareTo(triplesMap.getId()) ==0 && !link.isFlipped() \|\|

Conflicting content

		{
			if(graph.getTriplesMapIds().contains(triplesMap.getId()))
			{
<<<<<<< HEAD
					links = graph.getAllNeighboringTriplesMap(triplesMap.getId());
					break;
			}
		}
=======
				links = graph.getAllNeighboringTriplesMap(triplesMap.getId());
				break;
			}
		}
	
>>>>>>> 809ce39bfc7e855952fee7ee1d674f5293083eda
		for(TriplesMapLink link : links) {
			try {
				if(link.getSourceMap().getId().compareTo(triplesMap.getId()) ==0  && !link.isFlipped() ||

Solution content
{ if(graph.getTriplesMapIds().contains(triplesMap.getId())) { <<<<<<< HEAD links = graph.getAllNeighboringTriplesMap(triplesMap.getId()); break; } } ======= links = graph.getAllNeighboringTriplesMap(triplesMap.getId()); break; } } >>>>>>> atf-multiroots for(TriplesMapLink link : links) { try { if(link.getSourceMap().getId().compareTo(triplesMap.getId()) ==0 && !link.isFlipped() \|\|

Solution content

		{
			if(graph.getTriplesMapIds().contains(triplesMap.getId()))
			{
<<<<<<< HEAD
					links = graph.getAllNeighboringTriplesMap(triplesMap.getId());
					break;
			}
		}
=======
				links = graph.getAllNeighboringTriplesMap(triplesMap.getId());
				break;
			}
		}
	
>>>>>>> atf-multiroots
		for(TriplesMapLink link : links) {
			try {
				if(link.getSourceMap().getId().compareTo(triplesMap.getId()) ==0  && !link.isFlipped() ||

File
TriplesMapWorkerPlan.java

Developer's decision
Manual

Kind of conflict
Break statement
Method invocation
Variable

Projects >> Web-Karma >>b7545c1237e6ff0d4de5ff4962bca370379edc74