Projects >> jgralab >>71281855f5c50a1f756407624d58ebeb0d1a197a

Chunk
Conflicting content
	 */
	private void clearPathSystem() {
		if (isFinished) {
<<<<<<< HEAD
			throw new JValuePathException(
					"Cannot modify a finished path system");
		}
		while (!entriesWithoutParentEdge.isEmpty()) {
			PathSystemEntry te = entriesWithoutParentEdge.poll();
			PathSystemEntry pe = null;
			if (te.getParentVertex() != null) {
				pe = keyToEntryMap.get(new PathSystemKey(te.getParentVertex(),
						te.getParentStateNumber()));
			} else {
				pe = keyToEntryMap.get(new PathSystemKey(rootVertex, te
						.getParentStateNumber()));
=======
			throw new JValuePathException("Cannot modify a finished path system");
		}
			while (!entriesWithoutParentEdge.isEmpty()) {
				PathSystemEntry te = entriesWithoutParentEdge.poll();
				if (te.getDistanceToRoot() == 0)
					continue;
				PathSystemEntry pe = null;
				if (te.getParentVertex() != null) {
					pe = keyToEntryMap.get(new PathSystemKey(te
							.getParentVertex(), te.getParentStateNumber()));
				} else {
					pe = keyToEntryMap.get(new PathSystemKey(rootVertex, te
							.getParentStateNumber()));
				}
				te.setParentEdge(pe.getParentEdge());
				te.setDistanceToRoot(pe.getDistanceToRoot());
				te.setParentStateNumber(pe.getParentStateNumber());
				te.setParentVertex(pe.getParentVertex());
				if (te.getParentEdge() == null) {
					entriesWithoutParentEdge.add(te);
				}
>>>>>>> a7bdc877fc767fed0797d5b5e894752eefb85461
			}
			te.setParentEdge(pe.getParentEdge());
			te.setDistanceToRoot(pe.getDistanceToRoot());
Solution content
	 */
	private void clearPathSystem() {
		if (isFinished) {
			throw new JValuePathException(
					"Cannot modify a finished path system");
		}
		while (!entriesWithoutParentEdge.isEmpty()) {
			PathSystemEntry te = entriesWithoutParentEdge.poll();
				if (te.getDistanceToRoot() == 0)
					continue;
			PathSystemEntry pe = null;
			if (te.getParentVertex() != null) {
				pe = keyToEntryMap.get(new PathSystemKey(te.getParentVertex(),
						te.getParentStateNumber()));
			} else {
				pe = keyToEntryMap.get(new PathSystemKey(rootVertex, te
						.getParentStateNumber()));
			}
			te.setParentEdge(pe.getParentEdge());
			te.setDistanceToRoot(pe.getDistanceToRoot());
File
JValuePathSystem.java
Developer's decision
Combination
Kind of conflict
If statement
Method invocation
Throw statement
Variable
While statement