Projects information

Chunk

Conflicting content

Conflicting content
public void putAfterEdge(Edge e); /** <<<<<<< HEAD * removes this edge from eSeq and erases its attributes @ if used on an * incidence / public void delete(); ======= sets the alpha vertex to v * * @param v * a vertex / void setAlpha(Vertex v); /* * sets the omega vertex to v * * @param v * a vertex / void setOmega(Vertex v); /* * sets the this vertex to v * * @param v * a vertex / void setThis(Vertex v); /* * sets the that vertex to v * * @param v * a vertex / void setThat(Vertex v); >>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890 /* * puts this edge immediately before the given edge `e` in the

	public void putAfterEdge(Edge e);

	/**
<<<<<<< HEAD
	 * removes this edge from eSeq and erases its attributes @ if used on an
	 * incidence
	 */
	public void delete();
=======
	 * sets the alpha vertex to v
	 * 
	 * @param v
	 *            a vertex
	 */
	void setAlpha(Vertex v);

	/**
	 * sets the omega vertex to v
	 * 
	 * @param v
	 *            a vertex
	 */
	void setOmega(Vertex v);

	/**
	 * sets the this vertex to v
	 * 
	 * @param v
	 *            a vertex
	 */
	void setThis(Vertex v);

	/**
	 * sets the that vertex to v
	 * 
	 * @param v
	 *            a vertex
	 */
	void setThat(Vertex v);
>>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890

	/**
	 * puts this edge immediately before the given edge e in the

Solution content

Solution content
public void putAfterEdge(Edge e); /** * removes this edge from eSeq and erases its attributes @ if used on an * incidence / public void delete(); /* * puts this edge immediately before the given edge `e` in the

	public void putAfterEdge(Edge e);

	/**
	 * removes this edge from eSeq and erases its attributes @ if used on an
	 * incidence
	 */
	public void delete();

	/**
	 * puts this edge immediately before the given edge e in the

File
Edge.java

Developer's decision
Version 1

Kind of conflict
Comment
Method interface

Chunk

Conflicting content
} code.setVariable("actualParams", ""); if (currentCycle.isAbstract()) { <<<<<<< HEAD code .add("/*", " @return the next #ecQualifiedName# edge in the global edge sequence"); code .add(" /", "public #ecQualifiedName# getNext#ecCamelName#InGraph(#formalParams#);"); if (currentCycle.isStdOrDbImplOrTransImpl()) { code .add( "public #ecQualifiedName# getNext#ecCamelName#InGraph(#formalParams#) {", "\treturn (#ecQualifiedName#)getNextEdge(#ecQualifiedName#.class#actualParams#);", "}"); ======= code.add("/", " @return the next #ecQualifiedName# edge in the global edge sequence"); code.add(" */", "public #ecQualifiedName# getNext#ecCamelName#(#formalParams#);"); } if (currentCycle.isStdOrDbImplOrTransImpl()) { code.add( "public #ecQualifiedName# getNext#ecCamelName#(#formalParams#) {", "\treturn (#ecQualifiedName#)getNextEdge(#ecQualifiedName#.class#actualParams#);", "}"); >>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890 } return code; }

Conflicting content

		}
		code.setVariable("actualParams", "");

		if (currentCycle.isAbstract()) {
<<<<<<< HEAD
			code
					.add("/**",
							" * @return the next #ecQualifiedName# edge in the global edge sequence");
			code
					.add(" */",
							"public #ecQualifiedName# getNext#ecCamelName#InGraph(#formalParams#);");
		if (currentCycle.isStdOrDbImplOrTransImpl()) {
			code
					.add(
							"public #ecQualifiedName# getNext#ecCamelName#InGraph(#formalParams#) {",
							"\treturn (#ecQualifiedName#)getNextEdge(#ecQualifiedName#.class#actualParams#);",
							"}");
=======
			code.add("/**",
					" * @return the next #ecQualifiedName# edge in the global edge sequence");
			code.add(" */",
					"public #ecQualifiedName# getNext#ecCamelName#(#formalParams#);");
		}
		if (currentCycle.isStdOrDbImplOrTransImpl()) {
			code.add(
					"public #ecQualifiedName# getNext#ecCamelName#(#formalParams#) {",
					"\treturn (#ecQualifiedName#)getNextEdge(#ecQualifiedName#.class#actualParams#);",
					"}");
>>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890
		}
		return code;
	}

Solution content
code.setVariable("actualParams", ""); if (currentCycle.isAbstract()) { code.add("/*", " @return the next #ecQualifiedName# edge in the global edge sequence"); code.add(" */", "public #ecQualifiedName# getNext#ecCamelName#(#formalParams#);"); } if (currentCycle.isStdOrDbImplOrTransImpl()) { code.add( "public #ecQualifiedName# getNext#ecCamelName#(#formalParams#) {", "\treturn (#ecQualifiedName#)getNextEdge(#ecQualifiedName#.class#actualParams#);", "}"); } return code; }

Solution content

		code.setVariable("actualParams", "");

		if (currentCycle.isAbstract()) {
			code.add("/**",
					" * @return the next #ecQualifiedName# edge in the global edge sequence");
			code.add(" */",
					"public #ecQualifiedName# getNext#ecCamelName#(#formalParams#);");
		}
		if (currentCycle.isStdOrDbImplOrTransImpl()) {
			code.add(
					"public #ecQualifiedName# getNext#ecCamelName#(#formalParams#) {",
					"\treturn (#ecQualifiedName#)getNextEdge(#ecQualifiedName#.class#actualParams#);",
					"}");
		}
		return code;
	}

File
EdgeCodeGenerator.java

Developer's decision
Version 2

Kind of conflict
If statement
Method invocation

Chunk

Conflicting content
if (withOrientation) { code.add(" * @param orientation the orientation of the edge"); } <<<<<<< HEAD code .add(" /", "public #ecQualifiedName# getNext#ecCamelName#(#formalParams#);"); } if (currentCycle.isStdOrDbImplOrTransImpl()) { code .add( "public #ecQualifiedName# getNext#ecCamelName#(#formalParams#) {", "\treturn (#ecQualifiedName#)getNextIncidence(#ecQualifiedName#.class#actualParams#);", "}"); ======= code.add(" /", "public #ecQualifiedName# getNext#ecCamelName#Incidence(#formalParams#);"); } if (currentCycle.isStdOrDbImplOrTransImpl()) { code.add( "public #ecQualifiedName# getNext#ecCamelName#Incidence(#formalParams#) {", "\treturn (#ecQualifiedName#)getNextIncidence(#ecQualifiedName#.class#actualParams#);", "}"); >>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890 } return code; }

Conflicting content

			if (withOrientation) {
				code.add(" * @param orientation the orientation of the edge");
			}
<<<<<<< HEAD
			code
					.add(" */",
							"public #ecQualifiedName# getNext#ecCamelName#(#formalParams#);");
		}
		if (currentCycle.isStdOrDbImplOrTransImpl()) {
			code
					.add(
							"public #ecQualifiedName# getNext#ecCamelName#(#formalParams#) {",
							"\treturn (#ecQualifiedName#)getNextIncidence(#ecQualifiedName#.class#actualParams#);",
							"}");
=======
			code.add(" */",
					"public #ecQualifiedName# getNext#ecCamelName#Incidence(#formalParams#);");
		}
		if (currentCycle.isStdOrDbImplOrTransImpl()) {
			code.add(
					"public #ecQualifiedName# getNext#ecCamelName#Incidence(#formalParams#) {",
					"\treturn (#ecQualifiedName#)getNextIncidence(#ecQualifiedName#.class#actualParams#);",
					"}");
>>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890
		}
		return code;
	}

Solution content
"}"); if (withOrientation) { code.add(" * @param orientation the orientation of the edge"); } code.add(" */", "public #ecQualifiedName# getNext#ecCamelName#Incidence(#formalParams#);"); } if (currentCycle.isStdOrDbImplOrTransImpl()) { code.add( } return code; } "public #ecQualifiedName# getNext#ecCamelName#Incidence(#formalParams#) {", "\treturn (#ecQualifiedName#)getNextIncidence(#ecQualifiedName#.class#actualParams#);",

Solution content

					"}");
			if (withOrientation) {
				code.add(" * @param orientation the orientation of the edge");
			}
			code.add(" */",
					"public #ecQualifiedName# getNext#ecCamelName#Incidence(#formalParams#);");
		}
		if (currentCycle.isStdOrDbImplOrTransImpl()) {
			code.add(
		}
		return code;
	}
					"public #ecQualifiedName# getNext#ecCamelName#Incidence(#formalParams#) {",
					"\treturn (#ecQualifiedName#)getNextIncidence(#ecQualifiedName#.class#actualParams#);",

File
EdgeCodeGenerator.java

Developer's decision
Version 2

Kind of conflict
If statement
Method invocation

Chunk

Conflicting content
public abstract void setMaxNestedTriggerCalls(int maxNestedTriggerCalls); public abstract int getNestedTriggerCalls(); <<<<<<< HEAD ======= // TODO: This cannot be declared here, else we get a cyclic dependency in the build process //public abstract GreqlEvaluator getGreqlEvaluator(); >>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890 }

Conflicting content

	public abstract void setMaxNestedTriggerCalls(int maxNestedTriggerCalls);

	public abstract int getNestedTriggerCalls();
<<<<<<< HEAD
=======

	// TODO: This cannot be declared here, else we get a cyclic dependency in the build process
	//public abstract GreqlEvaluator getGreqlEvaluator();
>>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890

}

Solution content
public abstract void setMaxNestedTriggerCalls(int maxNestedTriggerCalls); public abstract int getNestedTriggerCalls(); // TODO: This cannot be declared here, else we get a cyclic dependency in the build process //public abstract GreqlEvaluator getGreqlEvaluator(); }

Solution content

	public abstract void setMaxNestedTriggerCalls(int maxNestedTriggerCalls);

	public abstract int getNestedTriggerCalls();

	// TODO: This cannot be declared here, else we get a cyclic dependency in the build process
	//public abstract GreqlEvaluator getGreqlEvaluator();

}

File
ECARuleManagerInterface.java

Developer's decision
Version 2

Kind of conflict
Comment

Chunk

Conflicting content
if (conditionExpression.contains("context")) { ======= if (this.conditionExpression.contains("context")) { >>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890 greqlEvaluator.setQuery("using context: " + conditionExpression); greqlEvaluator.setVariable("context", element); } else { AttributedElement element = event.getElement(); GreqlEvaluator greqlEvaluator = ((ECARuleManager) event.getGraph() .getECARuleManager()).getGreqlEvaluator(); <<<<<<< HEAD

Conflicting content

		if (conditionExpression.contains("context")) {
=======
		if (this.conditionExpression.contains("context")) {
>>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890
			greqlEvaluator.setQuery("using context: " + conditionExpression);
			greqlEvaluator.setVariable("context", element);
		} else {
		AttributedElement element = event.getElement();
		GreqlEvaluator greqlEvaluator = ((ECARuleManager) event.getGraph()
				.getECARuleManager()).getGreqlEvaluator();
<<<<<<< HEAD

Solution content
AttributedElement element = event.getElement(); GreqlEvaluator greqlEvaluator = ((ECARuleManager) event.getGraph() .getECARuleManager()).getGreqlEvaluator(); if (this.conditionExpression.contains("context")) { greqlEvaluator.setQuery("using context: " + conditionExpression); greqlEvaluator.setVariable("context", element); } else {

Solution content

		AttributedElement element = event.getElement();
		GreqlEvaluator greqlEvaluator = ((ECARuleManager) event.getGraph()
				.getECARuleManager()).getGreqlEvaluator();
		if (this.conditionExpression.contains("context")) {
			greqlEvaluator.setQuery("using context: " + conditionExpression);
			greqlEvaluator.setVariable("context", element);
		} else {

File
GreqlCondition.java

Developer's decision
Version 2

Kind of conflict
If statement

Chunk

Conflicting content
greqlEvaluator.setQuery(conditionExpression); } greqlEvaluator.startEvaluation(); <<<<<<< HEAD JValue result = greqlEvaluator.getEvaluationResult(); if (result.isBoolean()) { return result.toBoolean(); } else { System.err .println("Invalid Condition: " + conditionExpression); throw new ECAException("Invalid Condition: \"" + conditionExpression + "\" evaluates to JValueType " + result.getType() + " but the result has to be a boolean."); } ======= return (Boolean) greqlEvaluator.getResult(); >>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890 } // +++++++++++++++++++++++++++++++++++++++++++++++++

Conflicting content

			greqlEvaluator.setQuery(conditionExpression);
		}
		greqlEvaluator.startEvaluation();
<<<<<<< HEAD
		JValue result = greqlEvaluator.getEvaluationResult();
		if (result.isBoolean()) {
			return result.toBoolean();
		} else {
			System.err
					.println("Invalid Condition: " + conditionExpression);
			throw new ECAException("Invalid Condition: \""
					+ conditionExpression + "\" evaluates to JValueType "
					+ result.getType() + " but the result has to be a boolean.");
		}
=======
		return (Boolean) greqlEvaluator.getResult();
>>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890
	}

	// +++++++++++++++++++++++++++++++++++++++++++++++++

Solution content
} greqlEvaluator.startEvaluation(); return (Boolean) greqlEvaluator.getResult(); } // +++++++++++++++++++++++++++++++++++++++++++++++++

File
GreqlCondition.java

Developer's decision
Version 2

Kind of conflict
Cast expression
If statement
Method invocation
Return statement
Variable

Chunk

Conflicting content
public class GreqlParser extends ParserHelper { <<<<<<< HEAD static { Greql2Schema.instance().getGraphFactory().setGraphImplementationClass( Greql2.class, SerializableGreql2Impl.class); } ======= >>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890 private Map testedRules = new HashMap(); private List tokens = null; import de.uni_koblenz.jgralab.impl.InternalEdge;

Conflicting content

public class GreqlParser extends ParserHelper {
<<<<<<< HEAD

	static {
		Greql2Schema.instance().getGraphFactory().setGraphImplementationClass(
				Greql2.class, SerializableGreql2Impl.class);
	}

=======
>>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890
	private Map testedRules = new HashMap();

	private List tokens = null;
import de.uni_koblenz.jgralab.impl.InternalEdge;

Solution content
public class GreqlParser extends ParserHelper { private Map testedRules = new HashMap(); private List tokens = null;

File
GreqlParser.java

Developer's decision
Version 2

Kind of conflict
Static initializer

Chunk

Conflicting content
import de.uni_koblenz.jgralab.greql2.exception.DuplicateVariableException; import de.uni_koblenz.jgralab.greql2.exception.ParsingException; import de.uni_koblenz.jgralab.greql2.exception.UndefinedVariableException; <<<<<<< HEAD import de.uni_koblenz.jgralab.greql2.funlib.Greql2FunctionLibrary; ======= import de.uni_koblenz.jgralab.greql2.funlib.FunLib; >>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890 import de.uni_koblenz.jgralab.greql2.schema.Comprehension; import de.uni_koblenz.jgralab.greql2.schema.Declaration; import de.uni_koblenz.jgralab.greql2.schema.Definition;

Conflicting content

import de.uni_koblenz.jgralab.greql2.exception.DuplicateVariableException;
import de.uni_koblenz.jgralab.greql2.exception.ParsingException;
import de.uni_koblenz.jgralab.greql2.exception.UndefinedVariableException;
<<<<<<< HEAD
import de.uni_koblenz.jgralab.greql2.funlib.Greql2FunctionLibrary;
=======
import de.uni_koblenz.jgralab.greql2.funlib.FunLib;
>>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890
import de.uni_koblenz.jgralab.greql2.schema.Comprehension;
import de.uni_koblenz.jgralab.greql2.schema.Declaration;
import de.uni_koblenz.jgralab.greql2.schema.Definition;

Solution content
import de.uni_koblenz.jgralab.greql2.exception.DuplicateVariableException; import de.uni_koblenz.jgralab.greql2.exception.ParsingException; import de.uni_koblenz.jgralab.greql2.exception.UndefinedVariableException; import de.uni_koblenz.jgralab.greql2.funlib.FunLib; import de.uni_koblenz.jgralab.greql2.schema.Comprehension; import de.uni_koblenz.jgralab.greql2.schema.Declaration; import de.uni_koblenz.jgralab.greql2.schema.Definition;

Solution content

import de.uni_koblenz.jgralab.greql2.exception.DuplicateVariableException;
import de.uni_koblenz.jgralab.greql2.exception.ParsingException;
import de.uni_koblenz.jgralab.greql2.exception.UndefinedVariableException;
import de.uni_koblenz.jgralab.greql2.funlib.FunLib;
import de.uni_koblenz.jgralab.greql2.schema.Comprehension;
import de.uni_koblenz.jgralab.greql2.schema.Declaration;
import de.uni_koblenz.jgralab.greql2.schema.Definition;

File
ParserHelper.java

Developer's decision
Version 2

Kind of conflict
Import

Chunk

Conflicting content
&& (arch instanceof Edge)) { // Existing, preserved edge. However, maybe we might need to // update alpha and/or omega. <<<<<<< HEAD InternalEdge e = (InternalEdge) arch.toEdge().getNormalEdge(); ======= Edge e = ((Edge) arch).getNormalEdge(); >>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890 preservables.add(e); allModifiedElements.add(e); // setAlpha/Omega are no-ops, if nothing is to be set. So that's

Conflicting content

					&& (arch instanceof Edge)) {
				// Existing, preserved edge. However, maybe we might need to
				// update alpha and/or omega.
<<<<<<< HEAD
				InternalEdge e = (InternalEdge) arch.toEdge().getNormalEdge();
=======
				Edge e = ((Edge) arch).getNormalEdge();
>>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890
				preservables.add(e);
				allModifiedElements.add(e);
				// setAlpha/Omega are no-ops, if nothing is to be set. So that's

Solution content

					&& (arch instanceof Edge)) {
				// Existing, preserved edge. However, maybe we might need to
				// update alpha and/or omega.
				Edge e = ((Edge) arch).getNormalEdge();
				preservables.add(e);
				allModifiedElements.add(e);
				// setAlpha/Omega are no-ops, if nothing is to be set. So that's

File
MatchReplace.java

Developer's decision
Version 2

Kind of conflict
Cast expression
Method invocation
Variable

Chunk

Conflicting content

		InternalVertex oldAlpha = getIncidentVertex();

<<<<<<< HEAD
		if (!graph.isLoading() && graph.getECARuleManagerIfThere() != null) {
			graph.getECARuleManager().fireBeforeChangeAlphaOfEdgeEvents(this,
					oldAlpha, alphaBase);
=======
		if (!this.graph.isLoading()
				&& this.graph.getECARuleManagerIfThere() != null) {
			this.graph.getECARuleManagerIfThere()
					.fireBeforeChangeAlphaOfEdgeEvents(this, oldAlpha, alpha);
>>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890
		}

		if (alphaBase == oldAlpha) {

Solution content

		InternalVertex oldAlpha = getIncidentVertex();

		if (!graph.isLoading() && graph.getECARuleManagerIfThere() != null) {
			graph.getECARuleManager().fireBeforeChangeAlphaOfEdgeEvents(this,
					oldAlpha, alphaBase);
		}

		if (alphaBase == oldAlpha) {

File
EdgeBaseImpl.java

Developer's decision
Version 1

Kind of conflict
If statement
Method invocation

Chunk

Conflicting content

		InternalVertex oldOmgea = reversedEdge.getIncidentVertex();

<<<<<<< HEAD
		if (!graph.isLoading() && graph.getECARuleManagerIfThere() != null) {
			graph.getECARuleManager().fireBeforeChangeOmegaOfEdgeEvents(this,
					oldOmgea, omegaBase);
=======
		if (!this.graph.isLoading()
				&& this.graph.getECARuleManagerIfThere() != null) {
			this.graph.getECARuleManagerIfThere()
					.fireBeforeChangeOmegaOfEdgeEvents(this, oldOmgea, omega);
>>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890
		}

		if (omegaBase == oldOmgea) {

Solution content

		InternalVertex oldOmgea = reversedEdge.getIncidentVertex();

		if (!graph.isLoading() && graph.getECARuleManagerIfThere() != null) {
			graph.getECARuleManager().fireBeforeChangeOmegaOfEdgeEvents(this,
					oldOmgea, omegaBase);
		}

		if (omegaBase == oldOmgea) {

File
EdgeBaseImpl.java

Developer's decision
Version 1

Kind of conflict
If statement
Method invocation

Chunk

Conflicting content

	public void internalEdgeAdded(InternalEdge e) {
		notifyEdgeAdded(e);
<<<<<<< HEAD
		if (getECARuleManagerIfThere() != null) {
=======
		if (this.getECARuleManagerIfThere() != null) {
>>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890
			getECARuleManagerIfThere().fireAfterCreateEdgeEvents(e);
		}
	}

Solution content
public void internalEdgeAdded(InternalEdge e) { notifyEdgeAdded(e); if (getECARuleManagerIfThere() != null) { getECARuleManagerIfThere().fireAfterCreateEdgeEvents(e); } }

File
GraphBaseImpl.java

Developer's decision
Version 1

Kind of conflict
If statement

Chunk

Conflicting content

	public void internalVertexAdded(InternalVertex v) {
		notifyVertexAdded(v);
<<<<<<< HEAD
		if (getECARuleManagerIfThere() != null) {
=======
		if (this.getECARuleManagerIfThere() != null) {
>>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890
			getECARuleManager().fireAfterCreateVertexEvents(v);
		}
	}

Solution content
public void internalVertexAdded(InternalVertex v) { notifyVertexAdded(v); if (getECARuleManagerIfThere() != null) { getECARuleManager().fireAfterCreateVertexEvents(v); } }

File
GraphBaseImpl.java

Developer's decision
Version 1

Kind of conflict
If statement

Chunk

Conflicting content

		getECARuleManager().fireBeforeDeleteEdgeEvents(edge);

<<<<<<< HEAD
		InternalEdge e = (InternalEdge) edge.getNormalEdge();
		if (getECARuleManagerIfThere() != null) {
			getECARuleManagerIfThere().fireBeforeDeleteEdgeEvents(edge);
		}

		e = (InternalEdge) edge.getNormalEdge();
=======
		if (this.getECARuleManagerIfThere() != null) {
			getECARuleManagerIfThere().fireBeforeDeleteEdgeEvents(edge);
		}

		EdgeBaseImpl e = (EdgeBaseImpl) edge.getNormalEdge();
>>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890
		internalEdgeDeleted(e);

		InternalVertex alpha = e.getIncidentVertex();

Solution content

		getECARuleManager().fireBeforeDeleteEdgeEvents(edge);

		InternalEdge e = (InternalEdge) edge.getNormalEdge();
		if (getECARuleManagerIfThere() != null) {
			getECARuleManagerIfThere().fireBeforeDeleteEdgeEvents(edge);
		}

		e = (InternalEdge) edge.getNormalEdge();
		internalEdgeDeleted(e);

		InternalVertex alpha = e.getIncidentVertex();

File
GraphBaseImpl.java

Developer's decision
Version 1

Kind of conflict
Cast expression
If statement
Variable

Chunk

Conflicting content

		removeEdgeFromESeq(e);
		edgeListModified();

<<<<<<< HEAD
		if (getECARuleManagerIfThere() != null) {
=======
		if (this.getECARuleManagerIfThere() != null) {
>>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890
			getECARuleManagerIfThere()
					.fireAfterDeleteEdgeEvents(e.getM1Class());
		}

Solution content
removeEdgeFromESeq(e); edgeListModified(); if (getECARuleManagerIfThere() != null) { getECARuleManagerIfThere() .fireAfterDeleteEdgeEvents(e.getM1Class()); }

File
GraphBaseImpl.java

Developer's decision
Version 1

Kind of conflict
If statement

Chunk

Conflicting content

	 */
	private void internalDeleteVertex() {
		while (!getDeleteVertexList().isEmpty()) {
<<<<<<< HEAD
			InternalVertex v = getDeleteVertexList().remove(0);
			assert (v != null) && v.isValid() && vSeqContainsVertex(v);

			if (getECARuleManagerIfThere() != null) {
=======
			VertexBaseImpl v = getDeleteVertexList().remove(0);
			assert (v != null) && v.isValid() && containsVertex(v);

			if (this.getECARuleManagerIfThere() != null) {
>>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890
				getECARuleManagerIfThere().fireBeforeDeleteVertexEvents(v);
			}
			internalVertexDeleted(v);

Solution content

			InternalVertex v = getDeleteVertexList().remove(0);
		while (!getDeleteVertexList().isEmpty()) {
	 */
	private void internalDeleteVertex() {
			assert (v != null) && v.isValid() && vSeqContainsVertex(v);

			if (getECARuleManagerIfThere() != null) {
				getECARuleManagerIfThere().fireBeforeDeleteVertexEvents(v);
			}
			internalVertexDeleted(v);

File
GraphBaseImpl.java

Developer's decision
Version 1

Kind of conflict
Assert statement
If statement
Method invocation
Variable

Chunk

Conflicting content

			removeVertexFromVSeq(v);
			vertexListModified();

<<<<<<< HEAD
			if (getECARuleManagerIfThere() != null) {
=======
			if (this.getECARuleManagerIfThere() != null) {
>>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890
				getECARuleManagerIfThere().fireAfterDeleteVertexEvents(
						v.getM1Class());
			}

Solution content
removeVertexFromVSeq(v); vertexListModified(); if (getECARuleManagerIfThere() != null) { getECARuleManagerIfThere().fireAfterDeleteVertexEvents( v.getM1Class()); }

File
GraphBaseImpl.java

Developer's decision
Version 1

Kind of conflict
If statement

Chunk

Conflicting content

	 * Notifies all registered GraphStructureChangedListener that
	 * the given vertex v is about to be deleted. All invalid
	 * WeakReferences are deleted automatically from the internal
	 * listener list.
	 * 
	 * @param v
	 *            the vertex that is about to be deleted.
	 */
	protected void notifyVertexDeleted(Vertex v) {
		assert (v != null) && v.isValid() && containsVertex(v);
		List l = getListenerListForAutoRemove();
		if (l != null) {
			int n = l.size();
			for (int i = 0; i < n; ++i) {
				l.get(i).vertexDeleted(v);
>>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890
			}
		}
		int n = graphStructureChangedListeners.size();
		return listeners.size() == 0 ? null : listeners;
	}

<<<<<<< HEAD
	public void notifyVertexDeleted(Vertex v) {
		assert (v != null) && v.isValid() && vSeqContainsVertex(v);
		if (graphStructureChangedListenersWithAutoRemoval != null) {
			Iterator> iterator = getListenerListIteratorForAutoRemove();
			while (iterator.hasNext()) {
				GraphStructureChangedListener currentListener = iterator.next()
						.get();
				if (currentListener == null) {
					iterator.remove();
				} else {
					currentListener.vertexDeleted(v);
				}
=======
	/**

Solution content

	}

	public void notifyVertexDeleted(Vertex v) {
		assert (v != null) && v.isValid() && vSeqContainsVertex(v);
		if (graphStructureChangedListenersWithAutoRemoval != null) {
			Iterator> iterator = getListenerListIteratorForAutoRemove();
			while (iterator.hasNext()) {
				GraphStructureChangedListener currentListener = iterator.next()
						.get();
				if (currentListener == null) {
					iterator.remove();
				} else {
					currentListener.vertexDeleted(v);
				}
			}
			setAutoListenerListToNullIfEmpty();
		}
		int n = graphStructureChangedListeners.size();

File
GraphBaseImpl.java

Developer's decision
Manual

Kind of conflict
Assert statement
Comment
For statement
If statement
Method invocation
Method signature
Variable
While statement

Chunk

Conflicting content

			while (iterator.hasNext()) {
				GraphStructureChangedListener currentListener = iterator.next()
						.get();
				if (currentListener == null) {
					iterator.remove();
				} else {
					currentListener.vertexAdded(v);
				}
=======
	/**
	 * Notifies all registered GraphStructureChangedListener that
		}
	}
	 * the given vertex v has been created. All invalid
	 * WeakReferences are deleted automatically from the internal
	 * listener list.
	 * 
	 * @param v
	 *            the vertex that has been created.
	 */
	protected void notifyVertexAdded(Vertex v) {
		assert (v != null) && v.isValid() && containsVertex(v);
		List l = getListenerListForAutoRemove();
		if (l != null) {
			int n = l.size();
			for (int i = 0; i < n; ++i) {
				l.get(i).vertexAdded(v);
>>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890
			}
		}
		int n = graphStructureChangedListeners.size();

<<<<<<< HEAD
	public void notifyVertexAdded(Vertex v) {
		assert (v != null) && v.isValid() && vSeqContainsVertex(v);
		if (graphStructureChangedListenersWithAutoRemoval != null) {
			Iterator> iterator = getListenerListIteratorForAutoRemove();

Solution content

		}
	}

	public void notifyVertexAdded(Vertex v) {
		assert (v != null) && v.isValid() && vSeqContainsVertex(v);
		if (graphStructureChangedListenersWithAutoRemoval != null) {
			Iterator> iterator = getListenerListIteratorForAutoRemove();
			while (iterator.hasNext()) {
				GraphStructureChangedListener currentListener = iterator.next()
						.get();
				if (currentListener == null) {
					iterator.remove();
				} else {
					currentListener.vertexAdded(v);
				}
			}
			setAutoListenerListToNullIfEmpty();
		}
		int n = graphStructureChangedListeners.size();

File
GraphBaseImpl.java

Developer's decision
Manual

Kind of conflict
Assert statement
Comment
For statement
If statement
Method invocation
Method signature
Variable
While statement

Chunk

Conflicting content

		}
	}

<<<<<<< HEAD
	public void notifyEdgeDeleted(Edge e) {
		assert (e != null) && e.isValid() && e.isNormal()
				&& eSeqContainsEdge(e);
		if (graphStructureChangedListenersWithAutoRemoval != null) {
			Iterator> iterator = getListenerListIteratorForAutoRemove();
			while (iterator.hasNext()) {
				GraphStructureChangedListener currentListener = iterator.next()
						.get();
				if (currentListener == null) {
					iterator.remove();
				} else {
					currentListener.edgeDeleted(e);
				}
=======
	/**
	 * Notifies all registered GraphStructureChangedListener that
	 * the given edge e is about to be deleted. All invalid
	 * WeakReferences are deleted automatically from the internal
	 * listener list.
	 * 
	 * @param e
	 *            the edge that is about to be deleted.
	 */
	protected void notifyEdgeDeleted(Edge e) {
		assert (e != null) && e.isValid() && e.isNormal() && containsEdge(e);
		List l = getListenerListForAutoRemove();
		if (l != null) {
			int n = l.size();
			for (int i = 0; i < n; ++i) {
				l.get(i).edgeDeleted(e);
>>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890
			}
		}
		int n = graphStructureChangedListeners.size();

Solution content

		}
	}

	public void notifyEdgeDeleted(Edge e) {
		assert (e != null) && e.isValid() && e.isNormal()
				&& eSeqContainsEdge(e);
		if (graphStructureChangedListenersWithAutoRemoval != null) {
			Iterator> iterator = getListenerListIteratorForAutoRemove();
			while (iterator.hasNext()) {
				GraphStructureChangedListener currentListener = iterator.next()
						.get();
				if (currentListener == null) {
					iterator.remove();
				} else {
					currentListener.edgeDeleted(e);
				}
			}
			setAutoListenerListToNullIfEmpty();
		}
		int n = graphStructureChangedListeners.size();

File
GraphBaseImpl.java

Developer's decision
Manual

Kind of conflict
Assert statement
Comment
For statement
If statement
Method invocation
Method signature
Variable
While statement

Chunk

Conflicting content

		}
	}

<<<<<<< HEAD
	public void notifyEdgeAdded(Edge e) {
		assert (e != null) && e.isValid() && e.isNormal()
				&& eSeqContainsEdge(e);
		if (graphStructureChangedListenersWithAutoRemoval != null) {
			Iterator> iterator = getListenerListIteratorForAutoRemove();
			while (iterator.hasNext()) {
				GraphStructureChangedListener currentListener = iterator.next()
						.get();
				if (currentListener == null) {
					iterator.remove();
				} else {
					currentListener.edgeAdded(e);
				}
=======
	/**
	 * Notifies all registered GraphStructureChangedListener that
	 * the given edge e has been created. All invalid
	 * WeakReferences are deleted automatically from the internal
	 * listener list.
	 * 
	 * @param e
	 *            the edge that has been created.
	 */
	protected void notifyEdgeAdded(Edge e) {
		assert (e != null) && e.isValid() && e.isNormal() && containsEdge(e);
		List l = getListenerListForAutoRemove();
		if (l != null) {
			int n = l.size();
			for (int i = 0; i < n; ++i) {
				l.get(i).edgeAdded(e);
>>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890
			}
		}
		int n = graphStructureChangedListeners.size();

Solution content

		}
	}

	public void notifyEdgeAdded(Edge e) {
		assert (e != null) && e.isValid() && e.isNormal()
				&& eSeqContainsEdge(e);
		if (graphStructureChangedListenersWithAutoRemoval != null) {
			Iterator> iterator = getListenerListIteratorForAutoRemove();
			while (iterator.hasNext()) {
				GraphStructureChangedListener currentListener = iterator.next()
						.get();
				if (currentListener == null) {
					iterator.remove();
				} else {
					currentListener.edgeAdded(e);
				}
			}
			setAutoListenerListToNullIfEmpty();
		}
		int n = graphStructureChangedListeners.size();

File
GraphBaseImpl.java

Developer's decision
Manual

Kind of conflict
Assert statement
Comment
For statement
If statement
Method invocation
Method signature
Variable
While statement

Chunk

Conflicting content

			for (int i = 0; i < n; ++i) {
		if (graphStructureChangedListenersWithAutoRemoval != null) {
			Iterator> iterator = getListenerListIteratorForAutoRemove();
			while (iterator.hasNext()) {
				GraphStructureChangedListener currentListener = iterator.next()
						.get();
				if (currentListener == null) {
					iterator.remove();
				} else {
					currentListener.maxVertexCountIncreased(newValue);
				}
=======
	/**
	 * Notifies all registered GraphStructureChangedListener that
				l.get(i).maxVertexCountIncreased(newValue);
>>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890
			}
		}
		int n = graphStructureChangedListeners.size();
		}
	}

<<<<<<< HEAD
	public void notifyMaxVertexCountIncreased(int newValue) {
	 * the maximum vertex count has been increased to the given
	 * newValue. All invalid WeakReferences are
	 * deleted automatically from the internal listener list.
	 * 
	 * @param newValue
	 *            the new maximum vertex count.
	 */
	protected void notifyMaxVertexCountIncreased(int newValue) {
		ArrayList l = getListenerListForAutoRemove();
		if (l != null) {
			int n = l.size();

Solution content

					currentListener.maxVertexCountIncreased(newValue);
				}
			}
			setAutoListenerListToNullIfEmpty();
		}
		int n = graphStructureChangedListeners.size();
		}
	}

	public void notifyMaxVertexCountIncreased(int newValue) {
		if (graphStructureChangedListenersWithAutoRemoval != null) {
			Iterator> iterator = getListenerListIteratorForAutoRemove();
			while (iterator.hasNext()) {
				GraphStructureChangedListener currentListener = iterator.next()
						.get();
				if (currentListener == null) {
					iterator.remove();
				} else {

File
GraphBaseImpl.java

Developer's decision
Manual

Kind of conflict
Comment
For statement
If statement
Method invocation
Method signature
Variable
While statement

Chunk

Conflicting content

		}
	}

<<<<<<< HEAD
	public void notifyMaxEdgeCountIncreased(int newValue) {
		if (graphStructureChangedListenersWithAutoRemoval != null) {
			Iterator> iterator = getListenerListIteratorForAutoRemove();
			while (iterator.hasNext()) {
				GraphStructureChangedListener currentListener = iterator.next()
						.get();
				if (currentListener == null) {
					iterator.remove();
				} else {
					currentListener.maxEdgeCountIncreased(newValue);
				}
=======
	/**
	 * Notifies all registered GraphStructureChangedListener that
	 * the maximum edge count has been increased to the given
	 * newValue. All invalid WeakReferences are
	 * deleted automatically from the internal listener list.
	 * 
	 * @param newValue
	 *            the new maximum edge count.
	 */
	protected void notifyMaxEdgeCountIncreased(int newValue) {
		List l = getListenerListForAutoRemove();
		if (l != null) {
			int n = l.size();
			for (int i = 0; i < n; ++i) {
				l.get(i).maxEdgeCountIncreased(newValue);
>>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890
			}
		}
		int n = graphStructureChangedListeners.size();

Solution content

		}
	}

						.get();
	public void notifyMaxEdgeCountIncreased(int newValue) {
		if (graphStructureChangedListenersWithAutoRemoval != null) {
			Iterator> iterator = getListenerListIteratorForAutoRemove();
			while (iterator.hasNext()) {
				GraphStructureChangedListener currentListener = iterator.next()
				if (currentListener == null) {
					iterator.remove();
				} else {
					currentListener.maxEdgeCountIncreased(newValue);
				}
			}
			setAutoListenerListToNullIfEmpty();
		}
		int n = graphStructureChangedListeners.size();

File
GraphBaseImpl.java

Developer's decision
Manual

Kind of conflict
Comment
For statement
If statement
Method invocation
Method signature
Variable
While statement

Chunk

Conflicting content

	 */
	@Override
	public Edge getNextIncidence(EdgeClass anEdgeClass, boolean noSubclasses) {
		assert anEdgeClass != null;
		assert isValid();
		return getNextIncidence(anEdgeClass.getM1Class(), EdgeDirection.INOUT,
				noSubclasses);
=======
		return getNextIncidence(anEdgeClass.getM1Class(), EdgeDirection.INOUT);
>>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890
	}

	/*
	public Edge getNextIncidence(EdgeClass anEdgeClass) {
		assert anEdgeClass != null;
		assert isValid();
<<<<<<< HEAD
		return getNextIncidence(anEdgeClass.getM1Class(), EdgeDirection.INOUT,
				false);
	}

	/*
	 * (non-Javadoc)
	 * 
	 * @see
	 * de.uni_koblenz.jgralab.Edge#getNextEdgeOfClass(de.uni_koblenz.jgralab
	 * .schema.EdgeClass, boolean)

Solution content

	public Edge getNextIncidence(EdgeClass anEdgeClass) {
		assert anEdgeClass != null;
		assert isValid();
		return getNextIncidence(anEdgeClass.getM1Class(), EdgeDirection.INOUT,
				false);
	}

	/*
	 * (non-Javadoc)
	 * 
	 * @see
	 * de.uni_koblenz.jgralab.Edge#getNextEdgeOfClass(de.uni_koblenz.jgralab
	 * .schema.EdgeClass, boolean)
	 */
	@Override
	public Edge getNextIncidence(EdgeClass anEdgeClass, boolean noSubclasses) {
		assert anEdgeClass != null;
		assert isValid();
		return getNextIncidence(anEdgeClass.getM1Class(), EdgeDirection.INOUT,
				noSubclasses);
	}

	/*

File
IncidenceImpl.java

Developer's decision
Version 1

Kind of conflict
Annotation
Assert statement
Comment
Method invocation
Method signature
Return statement

Chunk

Conflicting content

			boolean noSubclasses) {
		return getNextIncidence(anEdgeClass.getM1Class(), orientation);
	}

<<<<<<< HEAD
	@Override
	public Edge getNextIncidence(Class anEdgeClass,
		return getNextIncidence(anEdgeClass, EdgeDirection.INOUT, noSubclasses);
	}

=======
>>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890
	/*
	 * (non-Javadoc)
	 *

Solution content
} @Override public Edge getNextIncidence(Class anEdgeClass, boolean noSubclasses) { return getNextIncidence(anEdgeClass, EdgeDirection.INOUT, noSubclasses); } /* * (non-Javadoc) *

File
IncidenceImpl.java

Developer's decision
Version 1

Kind of conflict
Annotation
Method declaration

Chunk

Conflicting content

		return normalEdge.getNextEdge();
	}

<<<<<<< HEAD
	@Override
	public InternalEdge getNextEdgeInESeq() {
		return normalEdge.getNextEdgeInESeq();
	}

	/*
	 * (non-Javadoc)
	 * 
	 * @see de.uni_koblenz.jgralab.Edge#getPrevEdgeInGraph()
	 */
=======
>>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890
	@Override
	public Edge getPrevEdge() {
		return normalEdge.getPrevEdge();

Solution content
return normalEdge.getNextEdge(); } @Override public InternalEdge getNextEdgeInESeq() { return normalEdge.getNextEdgeInESeq(); } @Override public Edge getPrevEdge() { return normalEdge.getPrevEdge();

File
ReversedEdgeBaseImpl.java

Developer's decision
Combination

Kind of conflict
Annotation
Comment
Method declaration

Chunk

Conflicting content

		return normalEdge.getPrevEdge();
	}

<<<<<<< HEAD
	@Override
	public InternalEdge getPrevEdgeInESeq() {
		return normalEdge.getPrevEdgeInESeq();
	}

	/*
	 * (non-Javadoc)
	 * 
	 * @see
	 * de.uni_koblenz.jgralab.Edge#getNextEdgeOfClassInGraph(de.uni_koblenz.
	 * jgralab.schema.EdgeClass)
	 */
=======
>>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890
	@Override
	public Edge getNextEdge(EdgeClass anEdgeClass) {
		return normalEdge.getNextEdge(anEdgeClass);

Solution content

		return normalEdge.getPrevEdge();
	}

	@Override
	public InternalEdge getPrevEdgeInESeq() {
		return normalEdge.getPrevEdgeInESeq();
	}

	@Override
	public Edge getNextEdge(EdgeClass anEdgeClass) {
		return normalEdge.getNextEdge(anEdgeClass);

File
ReversedEdgeBaseImpl.java

Developer's decision
Combination

Kind of conflict
Annotation
Comment
Method declaration

Chunk

Conflicting content

	// return "e " + getId() + ": "
	// + getAttributedElementClass().getQualifiedName();
	// }
=======
>>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890
}
	public void internalSetDefaultValue(Attribute attr) throws GraphIOException {
		attr.setDefaultTransactionValue(this);
	}
<<<<<<< HEAD

	// @Override
	// public String toString() {

Solution content
public void internalSetDefaultValue(Attribute attr) throws GraphIOException { attr.setDefaultTransactionValue(this); } }

File
EdgeImpl.java

Developer's decision
Version 2

Kind of conflict
Comment

Chunk

Conflicting content

import de.uni_koblenz.jgralab.GraphException;
import de.uni_koblenz.jgralab.GraphIOException;
import de.uni_koblenz.jgralab.GraphStructureChangedListener;
<<<<<<< HEAD
import de.uni_koblenz.jgralab.TraversalContext;
=======
import de.uni_koblenz.jgralab.JGraLab;
import de.uni_koblenz.jgralab.impl.FreeIndexList;
import de.uni_koblenz.jgralab.impl.IncidenceImpl;
>>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890
import de.uni_koblenz.jgralab.Vertex;

Solution content

import de.uni_koblenz.jgralab.GraphException;
import de.uni_koblenz.jgralab.GraphIOException;
import de.uni_koblenz.jgralab.GraphStructureChangedListener;
import de.uni_koblenz.jgralab.JGraLab;
import de.uni_koblenz.jgralab.TraversalContext;
import de.uni_koblenz.jgralab.Vertex;
import de.uni_koblenz.jgralab.impl.FreeIndexList;
import de.uni_koblenz.jgralab.impl.IncidenceImpl;

File
GraphImpl.java

Developer's decision
Concatenation

Kind of conflict
Import

Chunk

Conflicting content

	@Override
	public void setCurrentTransaction(Transaction transaction) {
<<<<<<< HEAD
		transactionManager.setTransactionForThread(transaction, Thread
				.currentThread());
=======
		if (logger != null) {
			logger.fine("tx id=" + transaction.getID());
		}
		transactionManager.setTransactionForThread(transaction,
				Thread.currentThread());
>>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890
	}

	@Override

Solution content

	@Override
	public void setCurrentTransaction(Transaction transaction) {
		if (logger != null) {
			logger.fine("tx id=" + transaction.getID());
		}
		transactionManager.setTransactionForThread(transaction,
				Thread.currentThread());
	}

	@Override

File
GraphImpl.java

Developer's decision
Version 2

Kind of conflict
If statement
Method invocation

Chunk

Conflicting content

	public VersionedReferenceImpl getVersionedPrevIncidence() {
		return prevIncidence;
	}
<<<<<<< HEAD

	// @Override
	// public String toString() {
	// return "-e" + normalEdge.getId() + ": "
	// + getAttributedElementClass().getQualifiedName();
	// }
=======
>>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890
}

Solution content
public VersionedReferenceImpl getVersionedPrevIncidence() { return prevIncidence; } }

File
ReversedEdgeImpl.java

Developer's decision
Version 2

Kind of conflict
Comment

Chunk

Conflicting content

			this.firstIncidence.setValidValue((IncidenceImpl) firstIncidence,
=======
			this.firstIncidence.setValidValue(firstIncidence,
>>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890
					graph.getCurrentTransaction());
		}
	}
				this.firstIncidence = new VersionedReferenceImpl(
						this);
			}
<<<<<<< HEAD

Solution content
this.firstIncidence = new VersionedReferenceImpl( this); } this.firstIncidence.setValidValue((IncidenceImpl) firstIncidence, graph.getCurrentTransaction()); } }

File
VertexImpl.java

Developer's decision
Version 1

Kind of conflict
Method invocation

Chunk

Conflicting content

				this.lastIncidence = new VersionedReferenceImpl(
						this);
			}
<<<<<<< HEAD
			this.lastIncidence.setValidValue((IncidenceImpl) lastIncidence,
=======
			this.lastIncidence.setValidValue(lastIncidence,
>>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890
					graph.getCurrentTransaction());
		}
	}

Solution content
} this.lastIncidence = new VersionedReferenceImpl( this); this.lastIncidence.setValidValue((IncidenceImpl) lastIncidence, graph.getCurrentTransaction()); } }

File
VertexImpl.java

Developer's decision
Version 1

Kind of conflict
Method invocation

Chunk

Conflicting content

	public void internalSetDefaultValue(Attribute attr) throws GraphIOException {
		attr.setDefaultTransactionValue(this);
	}
<<<<<<< HEAD

	// @Override
	// public String toString() {
	// return "v " + getId() + ": "
	// + getAttributedElementClass().getQualifiedName();
	// }
=======
>>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890
}

Solution content
public void internalSetDefaultValue(Attribute attr) throws GraphIOException { attr.setDefaultTransactionValue(this); } }

File
VertexImpl.java

Developer's decision
Version 2

Kind of conflict
Comment

Chunk

Conflicting content

		assertEquals(e3.getReversedEdge(),
				e2.getNextIncidence(ecs[1], EdgeDirection.IN));
>>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890
		// test of edge e3
		assertEquals(e4, e3.getReversedEdge().getNextIncidence(ecs[0]));
		assertNull(e3.getReversedEdge().getNextIncidence(ecs[1]));
		assertEquals(e3.getReversedEdge(), e1.getNextIncidence(ecs[1]));
		assertEquals(e2, e1.getNextIncidence(ecs[2]));
		// test of edge e2
<<<<<<< HEAD
		assertEquals(e3.getReversedEdge(), e2.getNextIncidence(ecs[0], false));
		assertEquals(e3.getReversedEdge(), e2.getNextIncidence(ecs[1], false));
		assertEquals(e5, e2.getNextIncidence(ecs[2], false));
		assertEquals(e4, e2.getNextIncidence(ecs[0], true));
		assertEquals(e3.getReversedEdge(), e2.getNextIncidence(ecs[1], true));
		assertEquals(e5, e2.getNextIncidence(ecs[2], true));
		assertEquals(e3.getReversedEdge(), e2.getNextIncidence(ecs[0],
				EdgeDirection.IN));
		assertEquals(e3.getReversedEdge(), e2.getNextIncidence(ecs[1],
				EdgeDirection.IN));
=======
		assertEquals(e3.getReversedEdge(), e2.getNextIncidence(ecs[0]));
		assertEquals(e3.getReversedEdge(), e2.getNextIncidence(ecs[1]));
		assertEquals(e5, e2.getNextIncidence(ecs[2]));
		assertEquals(e3.getReversedEdge(),
				e2.getNextIncidence(ecs[0], EdgeDirection.IN));

Solution content

		assertEquals(e3.getReversedEdge(), e1.getNextIncidence(ecs[1]));
		assertEquals(e2, e1.getNextIncidence(ecs[2]));
		// test of edge e2
		assertEquals(e3.getReversedEdge(), e2.getNextIncidence(ecs[0]));
		assertEquals(e3.getReversedEdge(), e2.getNextIncidence(ecs[1]));
		assertEquals(e5, e2.getNextIncidence(ecs[2]));
		assertEquals(e3.getReversedEdge(),
				e2.getNextIncidence(ecs[0], EdgeDirection.IN));
		assertEquals(e3.getReversedEdge(),
				e2.getNextIncidence(ecs[1], EdgeDirection.IN));
		// test of edge e3
		assertEquals(e4, e3.getReversedEdge().getNextIncidence(ecs[0]));
		assertNull(e3.getReversedEdge().getNextIncidence(ecs[1]));

File
EdgeTest.java

Developer's decision
Version 2

Kind of conflict
Method invocation

Chunk

Conflicting content

				assertEquals(linkfalse[k], e.getNextIncidence(ecs[0]));
				assertEquals(sublinkfalse[k], e.getNextIncidence(ecs[1]));
				assertEquals(linkbackfalse[k], e.getNextIncidence(ecs[2]));
>>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890
			}
			commit(g);
		}
			createReadOnlyTransaction(g);
			for (int k = 0; k < edges.length; k++) {
				Edge e = edges[k];
<<<<<<< HEAD
				assertEquals(linkfalse[k], e.getNextIncidence(ecs[0], false));
				assertEquals(sublinkfalse[k], e.getNextIncidence(ecs[1], false));
				assertEquals(linkbackfalse[k], e
						.getNextIncidence(ecs[2], false));
				assertEquals(linktrue[k], e.getNextIncidence(ecs[0], true));
				assertEquals(sublinktrue[k], e.getNextIncidence(ecs[1], true));
				assertEquals(linkbacktrue[k], e.getNextIncidence(ecs[2], true));
=======

Solution content

			createReadOnlyTransaction(g);
			for (int k = 0; k < edges.length; k++) {
				Edge e = edges[k];
				assertEquals(linkfalse[k], e.getNextIncidence(ecs[0]));
				assertEquals(sublinkfalse[k], e.getNextIncidence(ecs[1]));
				assertEquals(linkbackfalse[k], e.getNextIncidence(ecs[2]));
			}
			commit(g);
		}

File
EdgeTest.java

Developer's decision
Version 2

Kind of conflict
Method invocation

Chunk

Conflicting content

				e2.getNextIncidence(Link.class, EdgeDirection.IN));
		assertEquals(e3.getReversedEdge(),

		createReadOnlyTransaction(g);
		// test of edge e1
<<<<<<< HEAD
		assertEquals(e3.getReversedEdge(), e1.getNextIncidence(Link.class,
				false));
		assertEquals(e3.getReversedEdge(), e1.getNextIncidence(SubLink.class,
				false));
		assertEquals(e2, e1.getNextIncidence(LinkBack.class, false));
		assertEquals(e4, e1.getNextIncidence(Link.class, true));
		assertEquals(e3.getReversedEdge(), e1.getNextIncidence(SubLink.class,
				true));
		assertEquals(e2, e1.getNextIncidence(LinkBack.class, true));
		// test of edge e2
		assertEquals(e3.getReversedEdge(), e2.getNextIncidence(Link.class,
				false));
		assertEquals(e3.getReversedEdge(), e2.getNextIncidence(SubLink.class,
				false));
		assertEquals(e5, e2.getNextIncidence(LinkBack.class, false));
		assertEquals(e4, e2.getNextIncidence(Link.class, true));
		assertEquals(e3.getReversedEdge(), e2.getNextIncidence(SubLink.class,
				true));
		assertEquals(e5, e2.getNextIncidence(LinkBack.class, true));
		assertEquals(e3.getReversedEdge(), e2.getNextIncidence(Link.class,
				EdgeDirection.IN));
		assertEquals(e3.getReversedEdge(), e2.getNextIncidence(SubLink.class,
				EdgeDirection.IN));
		// test of edge e3
		assertEquals(e4, e3.getReversedEdge().getNextIncidence(Link.class,
				false));
		assertNull(e3.getReversedEdge().getNextIncidence(SubLink.class, false));
		assertEquals(e5, e3.getReversedEdge().getNextIncidence(LinkBack.class,
				false));
		assertEquals(e4, e3.getReversedEdge()
				.getNextIncidence(Link.class, true));
		assertNull(e3.getReversedEdge().getNextIncidence(SubLink.class, true));
		assertEquals(e5, e3.getReversedEdge().getNextIncidence(LinkBack.class,
				true));
		// test of edge e4
		assertEquals(e4.getReversedEdge(), e4.getNextIncidence(Link.class,
				false));
		assertNull(e4.getNextIncidence(SubLink.class, false));
		assertEquals(e5, e4.getNextIncidence(LinkBack.class, false));
		assertEquals(e4.getReversedEdge(), e4
				.getNextIncidence(Link.class, true));
		assertNull(e4.getNextIncidence(SubLink.class, true));
		assertEquals(e5, e4.getNextIncidence(LinkBack.class, true));
		// test of edge e4.getReversedEdge
		assertNull(e4.getReversedEdge().getNextIncidence(Link.class, false));
		assertNull(e4.getReversedEdge().getNextIncidence(SubLink.class, false));
		assertEquals(e5, e4.getReversedEdge().getNextIncidence(LinkBack.class,
				false));
		assertNull(e4.getReversedEdge().getNextIncidence(Link.class, true));
		assertNull(e4.getReversedEdge().getNextIncidence(SubLink.class, true));
		assertEquals(e5, e4.getReversedEdge().getNextIncidence(LinkBack.class,
				true));
=======
		assertEquals(e3.getReversedEdge(), e1.getNextIncidence(Link.class));
		assertEquals(e3.getReversedEdge(), e1.getNextIncidence(SubLink.class));
		assertEquals(e2, e1.getNextIncidence(LinkBack.class));
		// test of edge e2
		assertEquals(e3.getReversedEdge(), e2.getNextIncidence(Link.class));
		assertEquals(e3.getReversedEdge(), e2.getNextIncidence(SubLink.class));
		assertEquals(e5, e2.getNextIncidence(LinkBack.class));
		assertEquals(e3.getReversedEdge(),
				e2.getNextIncidence(SubLink.class, EdgeDirection.IN));
		// test of edge e3
		assertEquals(e4, e3.getReversedEdge().getNextIncidence(Link.class));
		assertNull(e3.getReversedEdge().getNextIncidence(SubLink.class));
		assertEquals(e5, e3.getReversedEdge().getNextIncidence(LinkBack.class));
		// test of edge e4
		assertEquals(e4.getReversedEdge(), e4.getNextIncidence(Link.class));
		assertNull(e4.getNextIncidence(SubLink.class));
		assertEquals(e5, e4.getNextIncidence(LinkBack.class));
		// test of edge e4.getReversedEdge
		assertNull(e4.getReversedEdge().getNextIncidence(Link.class));
		assertNull(e4.getReversedEdge().getNextIncidence(SubLink.class));
		assertEquals(e5, e4.getReversedEdge().getNextIncidence(LinkBack.class));
>>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890
		// test of edge e5
		assertNull(e5.getNextIncidence(Link.class));
		assertNull(e5.getNextIncidence(SubLink.class));

Solution content

		createReadOnlyTransaction(g);
		// test of edge e1
		assertEquals(e3.getReversedEdge(), e1.getNextIncidence(Link.class));
		assertEquals(e3.getReversedEdge(), e1.getNextIncidence(SubLink.class));
		assertEquals(e2, e1.getNextIncidence(LinkBack.class));
		// test of edge e2
		assertEquals(e3.getReversedEdge(), e2.getNextIncidence(Link.class));
		assertEquals(e3.getReversedEdge(), e2.getNextIncidence(SubLink.class));
		assertEquals(e5, e2.getNextIncidence(LinkBack.class));
		assertEquals(e3.getReversedEdge(),
				e2.getNextIncidence(Link.class, EdgeDirection.IN));
		assertEquals(e3.getReversedEdge(),
				e2.getNextIncidence(SubLink.class, EdgeDirection.IN));
		// test of edge e3
		assertEquals(e4, e3.getReversedEdge().getNextIncidence(Link.class));
		assertNull(e3.getReversedEdge().getNextIncidence(SubLink.class));
		assertEquals(e5, e3.getReversedEdge().getNextIncidence(LinkBack.class));
		// test of edge e4
		assertEquals(e4.getReversedEdge(), e4.getNextIncidence(Link.class));
		assertNull(e4.getNextIncidence(SubLink.class));
		assertEquals(e5, e4.getNextIncidence(LinkBack.class));
		// test of edge e4.getReversedEdge
		assertNull(e4.getReversedEdge().getNextIncidence(Link.class));
		assertNull(e4.getReversedEdge().getNextIncidence(SubLink.class));
		assertEquals(e5, e4.getReversedEdge().getNextIncidence(LinkBack.class));
		// test of edge e5
		assertNull(e5.getNextIncidence(Link.class));
		assertNull(e5.getNextIncidence(SubLink.class));

File
EdgeTest.java

Developer's decision
Version 2

Kind of conflict
Comment
Method invocation

Chunk

Conflicting content

						.getNextIncidence(Link.class, false));
			createReadOnlyTransaction(g);
			for (int k = 0; k < edges.length; k++) {
				Edge e = edges[k];
<<<<<<< HEAD
				assertEquals(linkfalse[k], e
				assertEquals(sublinkfalse[k], e.getNextIncidence(SubLink.class,
						false));
				assertEquals(linkbackfalse[k], e.getNextIncidence(
						LinkBack.class, false));
				assertEquals(linktrue[k], e.getNextIncidence(Link.class, true));
				assertEquals(sublinktrue[k], e.getNextIncidence(SubLink.class,
						true));
				assertEquals(linkbacktrue[k], e.getNextIncidence(
						LinkBack.class, true));
=======
				assertEquals(linkfalse[k], e.getNextIncidence(Link.class));
				assertEquals(sublinkfalse[k], e.getNextIncidence(SubLink.class));
				assertEquals(linkbackfalse[k],
						e.getNextIncidence(LinkBack.class));
>>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890
			}
			commit(g);
		}

Solution content

			createReadOnlyTransaction(g);
			for (int k = 0; k < edges.length; k++) {
				Edge e = edges[k];
				assertEquals(linkfalse[k], e.getNextIncidence(Link.class));
				assertEquals(sublinkfalse[k], e.getNextIncidence(SubLink.class));
				assertEquals(linkbackfalse[k],
						e.getNextIncidence(LinkBack.class));
			}
			commit(g);
		}

File
EdgeTest.java

Developer's decision
Version 2

Kind of conflict
Method invocation

Chunk

Conflicting content

		assertEquals(e4,
				e3.getReversedEdge()
						.getNextIncidence(ecs[0], EdgeDirection.OUT));

		createReadOnlyTransaction(g);
		// test of edge e1
<<<<<<< HEAD
		assertEquals(e3.getReversedEdge(), e1.getNextIncidence(ecs[0],
				EdgeDirection.INOUT, false));
		assertEquals(e3.getReversedEdge(), e1.getNextIncidence(ecs[1],
				EdgeDirection.INOUT, false));
		assertEquals(e2, e1
				.getNextIncidence(ecs[2], EdgeDirection.INOUT, false));
		assertEquals(e4, e1.getNextIncidence(ecs[0], EdgeDirection.OUT, false));
		assertNull(e1.getNextIncidence(ecs[1], EdgeDirection.OUT, false));
		assertEquals(e2, e1.getNextIncidence(ecs[2], EdgeDirection.OUT, false));
		assertEquals(e3.getReversedEdge(), e1.getNextIncidence(ecs[0],
				EdgeDirection.IN, false));
		assertEquals(e3.getReversedEdge(), e1.getNextIncidence(ecs[1],
				EdgeDirection.IN, false));
		assertNull(e1.getNextIncidence(ecs[2], EdgeDirection.IN, false));

		assertEquals(e4, e1.getNextIncidence(ecs[0], EdgeDirection.INOUT, true));
		assertEquals(e3.getReversedEdge(), e1.getNextIncidence(ecs[1],
				EdgeDirection.INOUT, true));
		assertEquals(e2, e1.getNextIncidence(ecs[2], EdgeDirection.INOUT, true));
		assertEquals(e4, e1.getNextIncidence(ecs[0], EdgeDirection.OUT, true));
		assertNull(e1.getNextIncidence(ecs[1], EdgeDirection.OUT, true));
		assertEquals(e2, e1.getNextIncidence(ecs[2], EdgeDirection.OUT, true));
		assertEquals(e4.getReversedEdge(), e1.getNextIncidence(ecs[0],
				EdgeDirection.IN, true));
		assertEquals(e3.getReversedEdge(), e1.getNextIncidence(ecs[1],
				EdgeDirection.IN, true));
		assertNull(e1.getNextIncidence(ecs[2], EdgeDirection.IN, true));

		// test of edge e2
		assertEquals(e3.getReversedEdge(), e2.getNextIncidence(ecs[0],
				EdgeDirection.INOUT, false));
		assertEquals(e3.getReversedEdge(), e2.getNextIncidence(ecs[1],
				EdgeDirection.INOUT, false));
		assertEquals(e5, e2
				.getNextIncidence(ecs[2], EdgeDirection.INOUT, false));
		assertEquals(e4, e2.getNextIncidence(ecs[0], EdgeDirection.OUT, false));
		assertNull(e2.getNextIncidence(ecs[1], EdgeDirection.OUT, false));
		assertEquals(e5, e2.getNextIncidence(ecs[2], EdgeDirection.OUT, false));
		assertEquals(e3.getReversedEdge(), e2.getNextIncidence(ecs[0],
				EdgeDirection.IN, false));
		assertEquals(e3.getReversedEdge(), e2.getNextIncidence(ecs[1],
				EdgeDirection.IN, false));
		assertNull(e2.getNextIncidence(ecs[2], EdgeDirection.IN, false));

		assertEquals(e4, e2.getNextIncidence(ecs[0], EdgeDirection.INOUT, true));
		assertEquals(e3.getReversedEdge(), e2.getNextIncidence(ecs[1],
				EdgeDirection.INOUT, true));
		assertEquals(e5, e2.getNextIncidence(ecs[2], EdgeDirection.INOUT, true));
		assertEquals(e4, e2.getNextIncidence(ecs[0], EdgeDirection.OUT, true));
		assertNull(e2.getNextIncidence(ecs[1], EdgeDirection.OUT, true));
		assertEquals(e5, e2.getNextIncidence(ecs[2], EdgeDirection.OUT, true));
		assertEquals(e4.getReversedEdge(), e2.getNextIncidence(ecs[0],
				EdgeDirection.IN, true));
		assertEquals(e3.getReversedEdge(), e2.getNextIncidence(ecs[1],
				EdgeDirection.IN, true));
		assertNull(e2.getNextIncidence(ecs[2], EdgeDirection.IN, true));

		// test of edge e3
		assertEquals(e4, e3.getReversedEdge().getNextIncidence(ecs[0],
				EdgeDirection.INOUT, false));
		assertNull(e3.getReversedEdge().getNextIncidence(ecs[1],
				EdgeDirection.INOUT, false));
		assertEquals(e5, e3.getReversedEdge().getNextIncidence(ecs[2],
				EdgeDirection.INOUT, false));
		assertEquals(
				e5,
				e3.getReversedEdge().getNextIncidence(ecs[2],
						EdgeDirection.INOUT));
		assertEquals(e4, e3.getReversedEdge().getNextIncidence(ecs[0],
				EdgeDirection.OUT, false));
		assertNull(e3.getReversedEdge().getNextIncidence(ecs[1],
				EdgeDirection.OUT, false));
		assertEquals(e5, e3.getReversedEdge().getNextIncidence(ecs[2],
				EdgeDirection.OUT, false));
		assertEquals(e4.getReversedEdge(), e3.getReversedEdge()
				.getNextIncidence(ecs[0], EdgeDirection.IN, false));
		assertNull(e3.getReversedEdge().getNextIncidence(ecs[1],
				EdgeDirection.IN, false));
		assertNull(e3.getReversedEdge().getNextIncidence(ecs[2],
				EdgeDirection.IN, false));

		assertEquals(e4, e3.getReversedEdge().getNextIncidence(ecs[0],
				EdgeDirection.INOUT, true));
		assertNull(e3.getReversedEdge().getNextIncidence(ecs[1],
				EdgeDirection.INOUT, true));
		assertEquals(e5, e3.getReversedEdge().getNextIncidence(ecs[2],
				EdgeDirection.INOUT, true));
		assertEquals(e4, e3.getReversedEdge().getNextIncidence(ecs[0],
				EdgeDirection.OUT, true));
		assertNull(e3.getReversedEdge().getNextIncidence(ecs[1],
				EdgeDirection.OUT, true));
		assertEquals(e5, e3.getReversedEdge().getNextIncidence(ecs[2],
				EdgeDirection.OUT, true));
=======
		assertEquals(e3.getReversedEdge(),
				e1.getNextIncidence(ecs[0], EdgeDirection.INOUT));
		assertEquals(e3.getReversedEdge(),
				e1.getNextIncidence(ecs[1], EdgeDirection.INOUT));
		assertEquals(e2, e1.getNextIncidence(ecs[2], EdgeDirection.INOUT));
		assertEquals(e4, e1.getNextIncidence(ecs[0], EdgeDirection.OUT));
		assertNull(e1.getNextIncidence(ecs[1], EdgeDirection.OUT));
		assertEquals(e2, e1.getNextIncidence(ecs[2], EdgeDirection.OUT));
		assertEquals(e3.getReversedEdge(),
				e1.getNextIncidence(ecs[0], EdgeDirection.IN));
		assertEquals(e3.getReversedEdge(),
				e1.getNextIncidence(ecs[1], EdgeDirection.IN));
		assertNull(e1.getNextIncidence(ecs[2], EdgeDirection.IN));

		// test of edge e2
		assertEquals(e3.getReversedEdge(),
				e2.getNextIncidence(ecs[0], EdgeDirection.INOUT));
		assertEquals(e3.getReversedEdge(),
				e2.getNextIncidence(ecs[1], EdgeDirection.INOUT));
		assertEquals(e5, e2.getNextIncidence(ecs[2], EdgeDirection.INOUT));
		assertEquals(e4, e2.getNextIncidence(ecs[0], EdgeDirection.OUT));
		assertNull(e2.getNextIncidence(ecs[1], EdgeDirection.OUT));
		assertEquals(e5, e2.getNextIncidence(ecs[2], EdgeDirection.OUT));
		assertEquals(e3.getReversedEdge(),
				e2.getNextIncidence(ecs[0], EdgeDirection.IN));
		assertEquals(e3.getReversedEdge(),
				e2.getNextIncidence(ecs[1], EdgeDirection.IN));
		assertNull(e2.getNextIncidence(ecs[2], EdgeDirection.IN));

		// test of edge e3
		assertEquals(
				e4,
				e3.getReversedEdge().getNextIncidence(ecs[0],
						EdgeDirection.INOUT));
		assertNull(e3.getReversedEdge().getNextIncidence(ecs[1],
				EdgeDirection.INOUT));
		assertNull(e3.getReversedEdge().getNextIncidence(ecs[1],
				EdgeDirection.OUT));
		assertEquals(e5,
				e3.getReversedEdge()
						.getNextIncidence(ecs[2], EdgeDirection.OUT));
>>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890
		assertEquals(e4.getReversedEdge(), e3.getReversedEdge()
				.getNextIncidence(ecs[0], EdgeDirection.IN));
		assertNull(e3.getReversedEdge().getNextIncidence(ecs[1],

Solution content

		assertEquals(e3.getReversedEdge(),
				e2.getNextIncidence(ecs[1], EdgeDirection.INOUT));

		createReadOnlyTransaction(g);
		// test of edge e1
		assertEquals(e3.getReversedEdge(),
				e1.getNextIncidence(ecs[0], EdgeDirection.INOUT));
		assertEquals(e3.getReversedEdge(),
				e1.getNextIncidence(ecs[1], EdgeDirection.INOUT));
		assertEquals(e2, e1.getNextIncidence(ecs[2], EdgeDirection.INOUT));
		assertEquals(e4, e1.getNextIncidence(ecs[0], EdgeDirection.OUT));
		assertNull(e1.getNextIncidence(ecs[1], EdgeDirection.OUT));
		assertEquals(e2, e1.getNextIncidence(ecs[2], EdgeDirection.OUT));
		assertEquals(e3.getReversedEdge(),
				e1.getNextIncidence(ecs[0], EdgeDirection.IN));
		assertEquals(e3.getReversedEdge(),
				e1.getNextIncidence(ecs[1], EdgeDirection.IN));
		assertNull(e1.getNextIncidence(ecs[2], EdgeDirection.IN));

		// test of edge e2
		assertEquals(e3.getReversedEdge(),
				e2.getNextIncidence(ecs[0], EdgeDirection.INOUT));
		assertEquals(e5, e2.getNextIncidence(ecs[2], EdgeDirection.INOUT));
		assertEquals(e4, e2.getNextIncidence(ecs[0], EdgeDirection.OUT));
		assertNull(e2.getNextIncidence(ecs[1], EdgeDirection.OUT));
		assertEquals(e5, e2.getNextIncidence(ecs[2], EdgeDirection.OUT));
		assertEquals(e3.getReversedEdge(),
				e2.getNextIncidence(ecs[0], EdgeDirection.IN));
		assertEquals(e3.getReversedEdge(),
				e2.getNextIncidence(ecs[1], EdgeDirection.IN));
		assertNull(e2.getNextIncidence(ecs[2], EdgeDirection.IN));

		// test of edge e3
		assertEquals(
				e4,
				e3.getReversedEdge().getNextIncidence(ecs[0],
						EdgeDirection.INOUT));
		assertNull(e3.getReversedEdge().getNextIncidence(ecs[1],
				EdgeDirection.INOUT));
		assertEquals(
				e5,
				e3.getReversedEdge().getNextIncidence(ecs[2],
						EdgeDirection.INOUT));
		assertEquals(e4,
				e3.getReversedEdge()
						.getNextIncidence(ecs[0], EdgeDirection.OUT));
		assertNull(e3.getReversedEdge().getNextIncidence(ecs[1],
				EdgeDirection.OUT));
		assertEquals(e5,
				e3.getReversedEdge()
						.getNextIncidence(ecs[2], EdgeDirection.OUT));
		assertEquals(e4.getReversedEdge(), e3.getReversedEdge()
				.getNextIncidence(ecs[0], EdgeDirection.IN));
		assertNull(e3.getReversedEdge().getNextIncidence(ecs[1],

File
EdgeTest.java

Developer's decision
Version 2

Kind of conflict
Comment
Method invocation

Chunk

Conflicting content

>>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890
				EdgeDirection.IN));

		// test of edge e4
<<<<<<< HEAD
		assertEquals(e4.getReversedEdge(), e4.getNextIncidence(ecs[0],
				EdgeDirection.INOUT, false));
		assertNull(e4.getNextIncidence(ecs[1], EdgeDirection.INOUT, false));
		assertEquals(e5, e4
				.getNextIncidence(ecs[2], EdgeDirection.INOUT, false));
		assertNull(e4.getNextIncidence(ecs[0], EdgeDirection.OUT, false));
		assertNull(e4.getNextIncidence(ecs[1], EdgeDirection.OUT, false));
		assertEquals(e5, e4.getNextIncidence(ecs[2], EdgeDirection.OUT, false));
		assertEquals(e4.getReversedEdge(), e4.getNextIncidence(ecs[0],
				EdgeDirection.IN, false));
		assertNull(e4.getNextIncidence(ecs[1], EdgeDirection.IN, false));
		assertNull(e4.getNextIncidence(ecs[2], EdgeDirection.IN, false));

		assertEquals(e4.getReversedEdge(), e4.getNextIncidence(ecs[0],
				EdgeDirection.INOUT, true));
		assertNull(e4.getNextIncidence(ecs[1], EdgeDirection.INOUT, true));
		assertEquals(e5, e4.getNextIncidence(ecs[2], EdgeDirection.INOUT, true));
		assertNull(e4.getNextIncidence(ecs[0], EdgeDirection.OUT, true));
		assertNull(e4.getNextIncidence(ecs[1], EdgeDirection.OUT, true));
		assertEquals(e5, e4.getNextIncidence(ecs[2], EdgeDirection.OUT, true));
		assertEquals(e4.getReversedEdge(), e4.getNextIncidence(ecs[0],
				EdgeDirection.IN, true));
		assertNull(e4.getNextIncidence(ecs[1], EdgeDirection.IN, true));
		assertNull(e4.getNextIncidence(ecs[2], EdgeDirection.IN, true));

		// test of edge e4.getReversedEdge
		assertNull(e4.getReversedEdge().getNextIncidence(ecs[0],
				EdgeDirection.INOUT, false));
		assertNull(e4.getReversedEdge().getNextIncidence(ecs[1],
				EdgeDirection.INOUT, false));
		assertEquals(e5, e4.getReversedEdge().getNextIncidence(ecs[2],
				EdgeDirection.INOUT, false));
		assertNull(e4.getReversedEdge().getNextIncidence(ecs[0],
				EdgeDirection.OUT, false));
		assertNull(e4.getReversedEdge().getNextIncidence(ecs[1],
				EdgeDirection.OUT, false));
		assertEquals(e5, e4.getReversedEdge().getNextIncidence(ecs[2],
				EdgeDirection.OUT, false));
		assertNull(e4.getReversedEdge().getNextIncidence(ecs[0],
				EdgeDirection.IN, false));
		assertNull(e4.getReversedEdge().getNextIncidence(ecs[1],
				EdgeDirection.IN, false));
		assertNull(e4.getReversedEdge().getNextIncidence(ecs[2],
				EdgeDirection.IN, false));

		assertNull(e4.getReversedEdge().getNextIncidence(ecs[0],
				EdgeDirection.INOUT, true));
		assertNull(e4.getReversedEdge().getNextIncidence(ecs[1],
				EdgeDirection.INOUT, true));
		assertEquals(e5, e4.getReversedEdge().getNextIncidence(ecs[2],
				EdgeDirection.INOUT, true));
=======
		assertEquals(e4.getReversedEdge(),
				e4.getNextIncidence(ecs[0], EdgeDirection.INOUT));
		assertNull(e4.getNextIncidence(ecs[1], EdgeDirection.INOUT));
		assertEquals(e5, e4.getNextIncidence(ecs[2], EdgeDirection.INOUT));
		assertNull(e4.getNextIncidence(ecs[0], EdgeDirection.OUT));
		assertNull(e4.getNextIncidence(ecs[1], EdgeDirection.OUT));
		assertEquals(e5, e4.getNextIncidence(ecs[2], EdgeDirection.OUT));
		assertEquals(e4.getReversedEdge(),
				e4.getNextIncidence(ecs[0], EdgeDirection.IN));
		assertNull(e4.getNextIncidence(ecs[1], EdgeDirection.IN));
		assertNull(e4.getNextIncidence(ecs[2], EdgeDirection.IN));

		// test of edge e4.getReversedEdge
		assertNull(e4.getReversedEdge().getNextIncidence(ecs[0],
				EdgeDirection.INOUT));
		assertNull(e4.getReversedEdge().getNextIncidence(ecs[1],
				EdgeDirection.INOUT));
		assertEquals(
				e5,
				e4.getReversedEdge().getNextIncidence(ecs[2],
						EdgeDirection.INOUT));
		assertNull(e4.getReversedEdge().getNextIncidence(ecs[0],
				EdgeDirection.OUT));
		assertNull(e4.getReversedEdge().getNextIncidence(ecs[1],

Solution content

				EdgeDirection.IN));

		// test of edge e4
		assertEquals(e4.getReversedEdge(),
				e4.getNextIncidence(ecs[0], EdgeDirection.INOUT));
		assertNull(e4.getNextIncidence(ecs[1], EdgeDirection.INOUT));
		assertEquals(e5, e4.getNextIncidence(ecs[2], EdgeDirection.INOUT));
		assertNull(e4.getNextIncidence(ecs[0], EdgeDirection.OUT));
		assertNull(e4.getNextIncidence(ecs[1], EdgeDirection.OUT));
		assertEquals(e5, e4.getNextIncidence(ecs[2], EdgeDirection.OUT));
		assertEquals(e4.getReversedEdge(),
				e4.getNextIncidence(ecs[0], EdgeDirection.IN));
		assertNull(e4.getNextIncidence(ecs[1], EdgeDirection.IN));
		assertNull(e4.getNextIncidence(ecs[2], EdgeDirection.IN));

		// test of edge e4.getReversedEdge
		assertNull(e4.getReversedEdge().getNextIncidence(ecs[0],
				EdgeDirection.INOUT));
		assertNull(e4.getReversedEdge().getNextIncidence(ecs[1],
				EdgeDirection.INOUT));
		assertEquals(
				e5,
				e4.getReversedEdge().getNextIncidence(ecs[2],
						EdgeDirection.INOUT));
		assertNull(e4.getReversedEdge().getNextIncidence(ecs[0],
				EdgeDirection.OUT));
		assertNull(e4.getReversedEdge().getNextIncidence(ecs[1],

File
EdgeTest.java

Developer's decision
Version 2

Kind of conflict
Comment
Method invocation

Chunk

Conflicting content

		assertNull(e4.getReversedEdge().getNextIncidence(ecs[0],
				EdgeDirection.OUT));
		assertNull(e4.getReversedEdge().getNextIncidence(ecs[1],
<<<<<<< HEAD
				EdgeDirection.OUT, true));
		assertEquals(e5, e4.getReversedEdge().getNextIncidence(ecs[2],
				EdgeDirection.OUT, true));
=======
				EdgeDirection.OUT));
		assertEquals(e5,
				e4.getReversedEdge()
						.getNextIncidence(ecs[2], EdgeDirection.OUT));
>>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890
		assertNull(e4.getReversedEdge().getNextIncidence(ecs[0],
				EdgeDirection.IN));
		assertNull(e4.getReversedEdge().getNextIncidence(ecs[1],

Solution content

		assertNull(e4.getReversedEdge().getNextIncidence(ecs[0],
				EdgeDirection.OUT));
		assertNull(e4.getReversedEdge().getNextIncidence(ecs[1],
				EdgeDirection.OUT));
		assertEquals(e5,
				e4.getReversedEdge()
						.getNextIncidence(ecs[2], EdgeDirection.OUT));
		assertNull(e4.getReversedEdge().getNextIncidence(ecs[0],
				EdgeDirection.IN));
		assertNull(e4.getReversedEdge().getNextIncidence(ecs[1],

File
EdgeTest.java

Developer's decision
Version 2

Kind of conflict
Method invocation

Chunk

Conflicting content

			for (int k = 0; k < edges.length; k++) {
				Edge e = edges[k];
<<<<<<< HEAD
			createReadOnlyTransaction(g);
				assertEquals(linkinoutfalse[k], e.getNextIncidence(ecs[0],
						EdgeDirection.INOUT, false));
				assertEquals(sublinkinout[k], e.getNextIncidence(ecs[1],
						EdgeDirection.INOUT, false));
				assertEquals(linkbackinout[k], e.getNextIncidence(ecs[2],
						EdgeDirection.INOUT, false));
				assertEquals(linkoutfalse[k], e.getNextIncidence(ecs[0],
						EdgeDirection.OUT, false));
				assertEquals(sublinkout[k], e.getNextIncidence(ecs[1],
						EdgeDirection.OUT, false));
				assertEquals(linkbackout[k], e.getNextIncidence(ecs[2],
						EdgeDirection.OUT, false));
				assertEquals(linkinfalse[k], e.getNextIncidence(ecs[0],
						EdgeDirection.IN, false));
				assertEquals(sublinkin[k], e.getNextIncidence(ecs[1],
						EdgeDirection.IN, false));
				assertEquals(linkbackin[k], e.getNextIncidence(ecs[2],
						EdgeDirection.IN, false));

				assertEquals(linkinouttrue[k], e.getNextIncidence(ecs[0],
						EdgeDirection.INOUT, true));
				assertEquals(sublinkinout[k], e.getNextIncidence(ecs[1],
						EdgeDirection.INOUT, true));
				assertEquals(linkbackinout[k], e.getNextIncidence(ecs[2],
						EdgeDirection.INOUT, true));
				assertEquals(linkouttrue[k], e.getNextIncidence(ecs[0],
						EdgeDirection.OUT, true));
				assertEquals(sublinkout[k], e.getNextIncidence(ecs[1],
						EdgeDirection.OUT, true));
				assertEquals(linkbackout[k], e.getNextIncidence(ecs[2],
						EdgeDirection.OUT, true));
				assertEquals(linkintrue[k], e.getNextIncidence(ecs[0],
						EdgeDirection.IN, true));
				assertEquals(sublinkin[k], e.getNextIncidence(ecs[1],
						EdgeDirection.IN, true));
				assertEquals(linkbackin[k], e.getNextIncidence(ecs[2],
						EdgeDirection.IN, true));
=======
				assertEquals(linkinoutfalse[k],
						e.getNextIncidence(ecs[0], EdgeDirection.INOUT));
				assertEquals(sublinkinout[k],
						e.getNextIncidence(ecs[1], EdgeDirection.INOUT));
				assertEquals(linkbackinout[k],
						e.getNextIncidence(ecs[2], EdgeDirection.INOUT));
				assertEquals(linkoutfalse[k],
						e.getNextIncidence(ecs[0], EdgeDirection.OUT));
				assertEquals(sublinkout[k],
						e.getNextIncidence(ecs[1], EdgeDirection.OUT));
				assertEquals(linkbackout[k],
						e.getNextIncidence(ecs[2], EdgeDirection.OUT));
				assertEquals(linkinfalse[k],
						e.getNextIncidence(ecs[0], EdgeDirection.IN));
				assertEquals(sublinkin[k],
						e.getNextIncidence(ecs[1], EdgeDirection.IN));
				assertEquals(linkbackin[k],
						e.getNextIncidence(ecs[2], EdgeDirection.IN));
>>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890
			}
			commit(g);
		}

Solution content

			createReadOnlyTransaction(g);
			for (int k = 0; k < edges.length; k++) {
				Edge e = edges[k];
				assertEquals(linkinoutfalse[k],
						e.getNextIncidence(ecs[0], EdgeDirection.INOUT));
				assertEquals(sublinkinout[k],
						e.getNextIncidence(ecs[1], EdgeDirection.INOUT));
				assertEquals(linkbackinout[k],
						e.getNextIncidence(ecs[2], EdgeDirection.INOUT));
				assertEquals(linkoutfalse[k],
						e.getNextIncidence(ecs[0], EdgeDirection.OUT));
				assertEquals(sublinkout[k],
						e.getNextIncidence(ecs[1], EdgeDirection.OUT));
				assertEquals(linkbackout[k],
						e.getNextIncidence(ecs[2], EdgeDirection.OUT));
				assertEquals(linkinfalse[k],
						e.getNextIncidence(ecs[0], EdgeDirection.IN));
				assertEquals(sublinkin[k],
						e.getNextIncidence(ecs[1], EdgeDirection.IN));
				assertEquals(linkbackin[k],
						e.getNextIncidence(ecs[2], EdgeDirection.IN));
			}
			commit(g);
		}

File
EdgeTest.java

Developer's decision
Version 2

Kind of conflict
Method invocation

Chunk

Conflicting content

				EdgeDirection.INOUT, false));

		createReadOnlyTransaction(g);
		// test of edge e1
<<<<<<< HEAD
		assertEquals(e3.getReversedEdge(), e1.getNextIncidence(Link.class,
				EdgeDirection.INOUT, false));
		assertEquals(e3.getReversedEdge(), e1.getNextIncidence(SubLink.class,
				EdgeDirection.INOUT, false));
		assertEquals(e2, e1.getNextIncidence(LinkBack.class,
		assertEquals(e4, e1.getNextIncidence(Link.class, EdgeDirection.OUT,
				false));
		assertNull(e1.getNextIncidence(SubLink.class, EdgeDirection.OUT, false));
		assertEquals(e2, e1.getNextIncidence(LinkBack.class, EdgeDirection.OUT,
				false));
		assertEquals(e3.getReversedEdge(), e1.getNextIncidence(Link.class,
				EdgeDirection.IN, false));
		assertEquals(e3.getReversedEdge(), e1.getNextIncidence(SubLink.class,
				EdgeDirection.IN, false));
		assertNull(e1.getNextIncidence(LinkBack.class, EdgeDirection.IN, false));

		assertEquals(e4, e1.getNextIncidence(Link.class, EdgeDirection.INOUT,
				true));
		assertEquals(e3.getReversedEdge(), e1.getNextIncidence(SubLink.class,
				EdgeDirection.INOUT, true));
		assertEquals(e2, e1.getNextIncidence(LinkBack.class,
				EdgeDirection.INOUT, true));
		assertEquals(e4, e1.getNextIncidence(Link.class, EdgeDirection.OUT,
				true));
		assertNull(e1.getNextIncidence(SubLink.class, EdgeDirection.OUT, true));
		assertEquals(e2, e1.getNextIncidence(LinkBack.class, EdgeDirection.OUT,
				true));
		assertEquals(e4.getReversedEdge(), e1.getNextIncidence(Link.class,
				EdgeDirection.IN, true));
		assertEquals(e3.getReversedEdge(), e1.getNextIncidence(SubLink.class,
				EdgeDirection.IN, true));
		assertNull(e1.getNextIncidence(LinkBack.class, EdgeDirection.IN, true));

		// test of edge e2
		assertEquals(e3.getReversedEdge(), e2.getNextIncidence(Link.class,
				EdgeDirection.INOUT, false));
		assertEquals(e3.getReversedEdge(), e2.getNextIncidence(SubLink.class,
				EdgeDirection.INOUT, false));
		assertEquals(e5, e2.getNextIncidence(LinkBack.class,
				EdgeDirection.INOUT, false));
		assertEquals(e4, e2.getNextIncidence(Link.class, EdgeDirection.OUT,
				false));
		assertNull(e2.getNextIncidence(SubLink.class, EdgeDirection.OUT, false));
		assertEquals(e5, e2.getNextIncidence(LinkBack.class, EdgeDirection.OUT,
				false));
		assertEquals(e3.getReversedEdge(), e2.getNextIncidence(Link.class,
				EdgeDirection.IN, false));
		assertEquals(e3.getReversedEdge(), e2.getNextIncidence(SubLink.class,
				EdgeDirection.IN, false));
		assertNull(e2.getNextIncidence(LinkBack.class, EdgeDirection.IN, false));

		assertEquals(e4, e2.getNextIncidence(Link.class, EdgeDirection.INOUT,
				true));
		assertEquals(e3.getReversedEdge(), e2.getNextIncidence(SubLink.class,
				EdgeDirection.INOUT, true));
		assertEquals(e5, e2.getNextIncidence(LinkBack.class,
				EdgeDirection.INOUT, true));
		assertEquals(e4, e2.getNextIncidence(Link.class, EdgeDirection.OUT,
				true));
		assertNull(e2.getNextIncidence(SubLink.class, EdgeDirection.OUT, true));
		assertEquals(e5, e2.getNextIncidence(LinkBack.class, EdgeDirection.OUT,
				true));
		assertEquals(e4.getReversedEdge(), e2.getNextIncidence(Link.class,
				EdgeDirection.IN, true));
		assertEquals(e3.getReversedEdge(), e2.getNextIncidence(SubLink.class,
				EdgeDirection.IN, true));
		assertNull(e2.getNextIncidence(LinkBack.class, EdgeDirection.IN, true));

		// test of edge e3
		assertEquals(e4, e3.getReversedEdge().getNextIncidence(Link.class,
				EdgeDirection.INOUT, false));
		assertNull(e3.getReversedEdge().getNextIncidence(SubLink.class,
				EdgeDirection.INOUT, false));
		assertEquals(e5, e3.getReversedEdge().getNextIncidence(LinkBack.class,
				EdgeDirection.INOUT, false));
		assertEquals(e4, e3.getReversedEdge().getNextIncidence(Link.class,
				EdgeDirection.OUT, false));
		assertNull(e3.getReversedEdge().getNextIncidence(SubLink.class,
				EdgeDirection.OUT, false));
		assertEquals(e5, e3.getReversedEdge().getNextIncidence(LinkBack.class,
				EdgeDirection.OUT, false));
		assertEquals(e4.getReversedEdge(), e3.getReversedEdge()
				.getNextIncidence(Link.class, EdgeDirection.IN, false));
		assertNull(e3.getReversedEdge().getNextIncidence(SubLink.class,
				EdgeDirection.IN, false));
		assertNull(e3.getReversedEdge().getNextIncidence(LinkBack.class,
				EdgeDirection.IN, false));

		assertEquals(e4, e3.getReversedEdge().getNextIncidence(Link.class,
				EdgeDirection.INOUT, true));
		assertNull(e3.getReversedEdge().getNextIncidence(SubLink.class,
				EdgeDirection.INOUT, true));
		assertEquals(e5, e3.getReversedEdge().getNextIncidence(LinkBack.class,
				EdgeDirection.INOUT, true));
		assertEquals(e4, e3.getReversedEdge().getNextIncidence(Link.class,
				EdgeDirection.OUT, true));
		assertNull(e3.getReversedEdge().getNextIncidence(SubLink.class,
				EdgeDirection.OUT, true));
		assertEquals(e5, e3.getReversedEdge().getNextIncidence(LinkBack.class,
				EdgeDirection.OUT, true));
=======
		assertEquals(e3.getReversedEdge(),
				e1.getNextIncidence(Link.class, EdgeDirection.INOUT));
		assertEquals(e3.getReversedEdge(),
				e1.getNextIncidence(SubLink.class, EdgeDirection.INOUT));
		assertEquals(e2,
				e1.getNextIncidence(LinkBack.class, EdgeDirection.INOUT));
		assertEquals(e4, e1.getNextIncidence(Link.class, EdgeDirection.OUT));
		assertNull(e1.getNextIncidence(SubLink.class, EdgeDirection.OUT));
		assertEquals(e2, e1.getNextIncidence(LinkBack.class, EdgeDirection.OUT));
		assertEquals(e3.getReversedEdge(),
				e1.getNextIncidence(Link.class, EdgeDirection.IN));
		assertEquals(e3.getReversedEdge(),
				e1.getNextIncidence(SubLink.class, EdgeDirection.IN));
		assertNull(e1.getNextIncidence(LinkBack.class, EdgeDirection.IN));

		// test of edge e2
		assertEquals(e3.getReversedEdge(),
				e2.getNextIncidence(Link.class, EdgeDirection.INOUT));
		assertEquals(e3.getReversedEdge(),
				e2.getNextIncidence(SubLink.class, EdgeDirection.INOUT));
		assertEquals(e5,
				e2.getNextIncidence(LinkBack.class, EdgeDirection.INOUT));
		assertEquals(e4, e2.getNextIncidence(Link.class, EdgeDirection.OUT));
		assertNull(e2.getNextIncidence(SubLink.class, EdgeDirection.OUT));
		assertEquals(e5, e2.getNextIncidence(LinkBack.class, EdgeDirection.OUT));
		assertEquals(e3.getReversedEdge(),
				e2.getNextIncidence(Link.class, EdgeDirection.IN));
		assertEquals(e3.getReversedEdge(),
				e2.getNextIncidence(SubLink.class, EdgeDirection.IN));
		assertNull(e2.getNextIncidence(LinkBack.class, EdgeDirection.IN));

		// test of edge e3
		assertEquals(
				e4,
				e3.getReversedEdge().getNextIncidence(Link.class,
						EdgeDirection.INOUT));
		assertNull(e3.getReversedEdge().getNextIncidence(SubLink.class,
				EdgeDirection.INOUT));
		assertEquals(
				e5,
				e3.getReversedEdge().getNextIncidence(LinkBack.class,
						EdgeDirection.INOUT));
		assertEquals(
				e4,
				e3.getReversedEdge().getNextIncidence(Link.class,
						EdgeDirection.OUT));
		assertNull(e3.getReversedEdge().getNextIncidence(SubLink.class,
				EdgeDirection.OUT));
		assertEquals(
				e5,
				e3.getReversedEdge().getNextIncidence(LinkBack.class,
						EdgeDirection.OUT));
>>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890
		assertEquals(e4.getReversedEdge(), e3.getReversedEdge()
				.getNextIncidence(Link.class, EdgeDirection.IN));
		assertNull(e3.getReversedEdge().getNextIncidence(SubLink.class,

Solution content

		createReadOnlyTransaction(g);
		// test of edge e1
		assertEquals(e3.getReversedEdge(),
				e1.getNextIncidence(Link.class, EdgeDirection.INOUT));
		assertEquals(e3.getReversedEdge(),
				e1.getNextIncidence(SubLink.class, EdgeDirection.INOUT));
		assertEquals(e2,
				e1.getNextIncidence(LinkBack.class, EdgeDirection.INOUT));
		assertEquals(e4, e1.getNextIncidence(Link.class, EdgeDirection.OUT));
		assertNull(e1.getNextIncidence(SubLink.class, EdgeDirection.OUT));
		assertEquals(e2, e1.getNextIncidence(LinkBack.class, EdgeDirection.OUT));
		assertEquals(e3.getReversedEdge(),
				e1.getNextIncidence(Link.class, EdgeDirection.IN));
		assertEquals(e3.getReversedEdge(),
				e1.getNextIncidence(SubLink.class, EdgeDirection.IN));
		assertNull(e1.getNextIncidence(LinkBack.class, EdgeDirection.IN));

		// test of edge e2
		assertEquals(e3.getReversedEdge(),
				e2.getNextIncidence(Link.class, EdgeDirection.INOUT));
		assertEquals(e3.getReversedEdge(),
				e2.getNextIncidence(SubLink.class, EdgeDirection.INOUT));
		assertEquals(e5,
				e2.getNextIncidence(LinkBack.class, EdgeDirection.INOUT));
		assertEquals(e4, e2.getNextIncidence(Link.class, EdgeDirection.OUT));
		assertNull(e2.getNextIncidence(SubLink.class, EdgeDirection.OUT));
		assertEquals(e5, e2.getNextIncidence(LinkBack.class, EdgeDirection.OUT));
		assertEquals(e3.getReversedEdge(),
				e2.getNextIncidence(Link.class, EdgeDirection.IN));
		assertEquals(e3.getReversedEdge(),
				e2.getNextIncidence(SubLink.class, EdgeDirection.IN));
		assertNull(e2.getNextIncidence(LinkBack.class, EdgeDirection.IN));

		// test of edge e3
		assertEquals(
				e4,
				e3.getReversedEdge().getNextIncidence(Link.class,
						EdgeDirection.INOUT));
		assertNull(e3.getReversedEdge().getNextIncidence(SubLink.class,
				EdgeDirection.INOUT));
		assertEquals(
				e5,
				e3.getReversedEdge().getNextIncidence(LinkBack.class,
						EdgeDirection.INOUT));
		assertEquals(
				e4,
				e3.getReversedEdge().getNextIncidence(Link.class,
						EdgeDirection.OUT));
		assertNull(e3.getReversedEdge().getNextIncidence(SubLink.class,
				EdgeDirection.OUT));
		assertEquals(
				e5,
				e3.getReversedEdge().getNextIncidence(LinkBack.class,
						EdgeDirection.OUT));
		assertEquals(e4.getReversedEdge(), e3.getReversedEdge()
				.getNextIncidence(Link.class, EdgeDirection.IN));
		assertNull(e3.getReversedEdge().getNextIncidence(SubLink.class,

File
EdgeTest.java

Developer's decision
Version 2

Kind of conflict
Comment
Method invocation

Chunk

Conflicting content

				EdgeDirection.IN));

		// test of edge e4
<<<<<<< HEAD
		assertEquals(e4.getReversedEdge(), e4.getNextIncidence(Link.class,
				EdgeDirection.INOUT, false));
		assertNull(e4.getNextIncidence(SubLink.class, EdgeDirection.INOUT,
				false));
		assertEquals(e5, e4.getNextIncidence(LinkBack.class,
				EdgeDirection.INOUT, false));
		assertNull(e4.getNextIncidence(Link.class, EdgeDirection.OUT, false));
		assertNull(e4.getNextIncidence(SubLink.class, EdgeDirection.OUT, false));
		assertEquals(e5, e4.getNextIncidence(LinkBack.class, EdgeDirection.OUT,
				false));
		assertEquals(e4.getReversedEdge(), e4.getNextIncidence(Link.class,
				EdgeDirection.IN, false));
		assertNull(e4.getNextIncidence(SubLink.class, EdgeDirection.IN, false));
		assertNull(e4.getNextIncidence(LinkBack.class, EdgeDirection.IN, false));

		assertEquals(e4.getReversedEdge(), e4.getNextIncidence(Link.class,
				EdgeDirection.INOUT, true));
		assertNull(e4
				.getNextIncidence(SubLink.class, EdgeDirection.INOUT, true));
		assertEquals(e5, e4.getNextIncidence(LinkBack.class,
				EdgeDirection.INOUT, true));
		assertNull(e4.getNextIncidence(Link.class, EdgeDirection.OUT, true));
		assertNull(e4.getNextIncidence(SubLink.class, EdgeDirection.OUT, true));
		assertEquals(e5, e4.getNextIncidence(LinkBack.class, EdgeDirection.OUT,
				true));
		assertEquals(e4.getReversedEdge(), e4.getNextIncidence(Link.class,
				EdgeDirection.IN, true));
		assertNull(e4.getNextIncidence(SubLink.class, EdgeDirection.IN, true));
		assertNull(e4.getNextIncidence(LinkBack.class, EdgeDirection.IN, true));

		// test of edge e4.getReversedEdge
		assertNull(e4.getReversedEdge().getNextIncidence(Link.class,
				EdgeDirection.INOUT, false));
		assertNull(e4.getReversedEdge().getNextIncidence(SubLink.class,
				EdgeDirection.INOUT, false));
		assertEquals(e5, e4.getReversedEdge().getNextIncidence(LinkBack.class,
				EdgeDirection.INOUT, false));
		assertNull(e4.getReversedEdge().getNextIncidence(Link.class,
				EdgeDirection.OUT, false));
		assertNull(e4.getReversedEdge().getNextIncidence(SubLink.class,
				EdgeDirection.OUT, false));
		assertEquals(e5, e4.getReversedEdge().getNextIncidence(LinkBack.class,
				EdgeDirection.OUT, false));
		assertNull(e4.getReversedEdge().getNextIncidence(Link.class,
				EdgeDirection.IN, false));
		assertNull(e4.getReversedEdge().getNextIncidence(SubLink.class,
				EdgeDirection.IN, false));
		assertNull(e4.getReversedEdge().getNextIncidence(LinkBack.class,
				EdgeDirection.IN, false));

		assertNull(e4.getReversedEdge().getNextIncidence(Link.class,
				EdgeDirection.INOUT, true));
		assertNull(e4.getReversedEdge().getNextIncidence(SubLink.class,
				EdgeDirection.INOUT, true));
		assertEquals(e5, e4.getReversedEdge().getNextIncidence(LinkBack.class,
				EdgeDirection.INOUT, true));
=======
		assertEquals(e4.getReversedEdge(),
				e4.getNextIncidence(Link.class, EdgeDirection.INOUT));
		assertNull(e4.getNextIncidence(SubLink.class, EdgeDirection.INOUT));
		assertEquals(e5,
				e4.getNextIncidence(LinkBack.class, EdgeDirection.INOUT));
		assertNull(e4.getNextIncidence(Link.class, EdgeDirection.OUT));
		assertNull(e4.getNextIncidence(SubLink.class, EdgeDirection.OUT));
		assertEquals(e5, e4.getNextIncidence(LinkBack.class, EdgeDirection.OUT));
		assertEquals(e4.getReversedEdge(),
				e4.getNextIncidence(Link.class, EdgeDirection.IN));
		assertNull(e4.getNextIncidence(SubLink.class, EdgeDirection.IN));
		assertNull(e4.getNextIncidence(LinkBack.class, EdgeDirection.IN));

		// test of edge e4.getReversedEdge
		assertNull(e4.getReversedEdge().getNextIncidence(Link.class,
				EdgeDirection.INOUT));
		assertNull(e4.getReversedEdge().getNextIncidence(SubLink.class,
				EdgeDirection.INOUT));
		assertEquals(
				e5,
				e4.getReversedEdge().getNextIncidence(LinkBack.class,
						EdgeDirection.INOUT));
>>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890
		assertNull(e4.getReversedEdge().getNextIncidence(Link.class,
				EdgeDirection.OUT));
		assertNull(e4.getReversedEdge().getNextIncidence(SubLink.class,

Solution content

				EdgeDirection.IN));

		// test of edge e4
		assertEquals(e4.getReversedEdge(),
				e4.getNextIncidence(Link.class, EdgeDirection.INOUT));
		assertNull(e4.getNextIncidence(SubLink.class, EdgeDirection.INOUT));
		assertEquals(e5,
				e4.getNextIncidence(LinkBack.class, EdgeDirection.INOUT));
		assertNull(e4.getNextIncidence(Link.class, EdgeDirection.OUT));
		assertNull(e4.getNextIncidence(SubLink.class, EdgeDirection.OUT));
		assertEquals(e5, e4.getNextIncidence(LinkBack.class, EdgeDirection.OUT));
		assertEquals(e4.getReversedEdge(),
				e4.getNextIncidence(Link.class, EdgeDirection.IN));
		assertNull(e4.getNextIncidence(SubLink.class, EdgeDirection.IN));
		assertNull(e4.getNextIncidence(LinkBack.class, EdgeDirection.IN));

		// test of edge e4.getReversedEdge
		assertNull(e4.getReversedEdge().getNextIncidence(Link.class,
				EdgeDirection.INOUT));
		assertNull(e4.getReversedEdge().getNextIncidence(SubLink.class,
				EdgeDirection.INOUT));
		assertEquals(
				e5,
				e4.getReversedEdge().getNextIncidence(LinkBack.class,
						EdgeDirection.INOUT));
		assertNull(e4.getReversedEdge().getNextIncidence(Link.class,
				EdgeDirection.OUT));
		assertNull(e4.getReversedEdge().getNextIncidence(SubLink.class,

File
EdgeTest.java

Developer's decision
Version 2

Kind of conflict
Comment
Method invocation

Chunk

Conflicting content

				EdgeDirection.IN));
		assertNull(e4.getReversedEdge().getNextIncidence(SubLink.class,
		assertNull(e4.getReversedEdge().getNextIncidence(Link.class,
				EdgeDirection.OUT));
		assertNull(e4.getReversedEdge().getNextIncidence(SubLink.class,
<<<<<<< HEAD
				EdgeDirection.OUT, true));
		assertEquals(e5, e4.getReversedEdge().getNextIncidence(LinkBack.class,
				EdgeDirection.OUT, true));
=======
				EdgeDirection.OUT));
		assertEquals(
				e5,
				e4.getReversedEdge().getNextIncidence(LinkBack.class,
						EdgeDirection.OUT));
>>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890
		assertNull(e4.getReversedEdge().getNextIncidence(Link.class,

Solution content

		assertNull(e4.getReversedEdge().getNextIncidence(Link.class,
				EdgeDirection.OUT));
		assertNull(e4.getReversedEdge().getNextIncidence(SubLink.class,
				EdgeDirection.OUT));
		assertEquals(
				e5,
				e4.getReversedEdge().getNextIncidence(LinkBack.class,
						EdgeDirection.OUT));
		assertNull(e4.getReversedEdge().getNextIncidence(Link.class,
				EdgeDirection.IN));
		assertNull(e4.getReversedEdge().getNextIncidence(SubLink.class,

File
EdgeTest.java

Developer's decision
Version 2

Kind of conflict
Method invocation

Chunk

Conflicting content

			createReadOnlyTransaction(g);
			for (int k = 0; k < edges.length; k++) {
				Edge e = edges[k];
<<<<<<< HEAD
				assertEquals(linkinoutfalse[k], e.getNextIncidence(Link.class,
						EdgeDirection.INOUT, false));
				assertEquals(sublinkinout[k], e.getNextIncidence(SubLink.class,
						EdgeDirection.INOUT, false));
				assertEquals(linkbackinout[k], e.getNextIncidence(
						LinkBack.class, EdgeDirection.INOUT, false));
				assertEquals(linkoutfalse[k], e.getNextIncidence(Link.class,
						EdgeDirection.OUT, false));
				assertEquals(sublinkout[k], e.getNextIncidence(SubLink.class,
						EdgeDirection.OUT, false));
				assertEquals(linkbackout[k], e.getNextIncidence(LinkBack.class,
						EdgeDirection.OUT, false));
				assertEquals(linkinfalse[k], e.getNextIncidence(Link.class,
						EdgeDirection.IN, false));
				assertEquals(sublinkin[k], e.getNextIncidence(SubLink.class,
						EdgeDirection.IN, false));
				assertEquals(linkbackin[k], e.getNextIncidence(LinkBack.class,
						EdgeDirection.IN, false));

				assertEquals(linkinouttrue[k], e.getNextIncidence(Link.class,
						EdgeDirection.INOUT, true));
				assertEquals(sublinkinout[k], e.getNextIncidence(SubLink.class,
						EdgeDirection.INOUT, true));
				assertEquals(linkbackinout[k], e.getNextIncidence(
						LinkBack.class, EdgeDirection.INOUT, true));
				assertEquals(linkouttrue[k], e.getNextIncidence(Link.class,
						EdgeDirection.OUT, true));
				assertEquals(sublinkout[k], e.getNextIncidence(SubLink.class,
						EdgeDirection.OUT, true));
				assertEquals(linkbackout[k], e.getNextIncidence(LinkBack.class,
						EdgeDirection.OUT, true));
				assertEquals(linkintrue[k], e.getNextIncidence(Link.class,
						EdgeDirection.IN, true));
				assertEquals(sublinkin[k], e.getNextIncidence(SubLink.class,
						EdgeDirection.IN, true));
				assertEquals(linkbackin[k], e.getNextIncidence(LinkBack.class,
						EdgeDirection.IN, true));
=======
				assertEquals(linkinoutfalse[k],
						e.getNextIncidence(Link.class, EdgeDirection.INOUT));
				assertEquals(sublinkinout[k],
						e.getNextIncidence(SubLink.class, EdgeDirection.INOUT));
				assertEquals(linkbackinout[k],
						e.getNextIncidence(LinkBack.class, EdgeDirection.INOUT));
				assertEquals(linkoutfalse[k],
						e.getNextIncidence(Link.class, EdgeDirection.OUT));
				assertEquals(sublinkout[k],
						e.getNextIncidence(SubLink.class, EdgeDirection.OUT));
				assertEquals(linkbackout[k],
						e.getNextIncidence(LinkBack.class, EdgeDirection.OUT));
				assertEquals(linkinfalse[k],
						e.getNextIncidence(Link.class, EdgeDirection.IN));
				assertEquals(sublinkin[k],
						e.getNextIncidence(SubLink.class, EdgeDirection.IN));
				assertEquals(linkbackin[k],
						e.getNextIncidence(LinkBack.class, EdgeDirection.IN));
>>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890
			}
			commit(g);
		}

Solution content

			createReadOnlyTransaction(g);
			for (int k = 0; k < edges.length; k++) {
				Edge e = edges[k];
				assertEquals(linkinoutfalse[k],
						e.getNextIncidence(Link.class, EdgeDirection.INOUT));
				assertEquals(sublinkinout[k],
						e.getNextIncidence(SubLink.class, EdgeDirection.INOUT));
				assertEquals(linkbackinout[k],
						e.getNextIncidence(LinkBack.class, EdgeDirection.INOUT));
				assertEquals(linkoutfalse[k],
						e.getNextIncidence(Link.class, EdgeDirection.OUT));
				assertEquals(sublinkout[k],
						e.getNextIncidence(SubLink.class, EdgeDirection.OUT));
				assertEquals(linkbackout[k],
						e.getNextIncidence(LinkBack.class, EdgeDirection.OUT));
				assertEquals(linkinfalse[k],
						e.getNextIncidence(Link.class, EdgeDirection.IN));
				assertEquals(sublinkin[k],
						e.getNextIncidence(SubLink.class, EdgeDirection.IN));
				assertEquals(linkbackin[k],
						e.getNextIncidence(LinkBack.class, EdgeDirection.IN));
			}
			commit(g);
		}

File
EdgeTest.java

Developer's decision
Version 2

Kind of conflict
Method invocation

Chunk

Conflicting content

		commit(g);

		createReadOnlyTransaction(g);
<<<<<<< HEAD
		assertEquals(e1.getReversedEdge(), e1.getNextLink());
		assertEquals(e3.getReversedEdge(), ((SubLink) e1.getReversedEdge())
				.getNextLink());
		assertEquals(null, ((Link) e3.getReversedEdge()).getNextLink());
=======
		assertEquals(e3, e1.getNextLink());
		assertEquals(e3, ((SubLink) e1.getReversedEdge()).getNextLink());
		assertEquals(e4, ((Link) e3.getReversedEdge()).getNextLink());
>>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890
		commit(g);
	}

Solution content

		commit(g);

		createReadOnlyTransaction(g);
		assertEquals(e3, e1.getNextLink());
		assertEquals(e3, ((SubLink) e1.getReversedEdge()).getNextLink());
		assertEquals(e4, ((Link) e3.getReversedEdge()).getNextLink());
		commit(g);
	}

File
EdgeTest.java

Developer's decision
Version 2

Kind of conflict
Method invocation

Chunk

Conflicting content

		assertEquals(e5, ((Link) e3.getReversedEdge())
				.getNextLink(EdgeDirection.INOUT));
		assertEquals(null, ((Link) e3.getReversedEdge())
				((Link) e3.getReversedEdge())
						.getNextLinkIncidence(EdgeDirection.IN));
		assertEquals(e5,
				.getNextLink(EdgeDirection.IN));
						.getNextLinkIncidence(EdgeDirection.OUT));
		assertEquals(e5,
		assertEquals(e5, ((Link) e3.getReversedEdge())
				((Link) e3.getReversedEdge())
				.getNextLink(EdgeDirection.OUT));
						.getNextLinkIncidence(EdgeDirection.INOUT));
		commit(g);

		createReadOnlyTransaction(g);
<<<<<<< HEAD
		assertEquals(e1.getReversedEdge(), e1.getNextLink(EdgeDirection.INOUT));
		assertEquals(e1.getReversedEdge(), e1.getNextLink(EdgeDirection.IN));
		assertEquals(e5, e1.getNextLink(EdgeDirection.OUT));
		assertEquals(e3.getReversedEdge(), ((SubLink) e1.getReversedEdge())
				.getNextLink(EdgeDirection.INOUT));
		assertEquals(e3.getReversedEdge(), ((SubLink) e1.getReversedEdge())
				.getNextLink(EdgeDirection.IN));
		assertEquals(e5, ((SubLink) e1.getReversedEdge())
				.getNextLink(EdgeDirection.OUT));
		assertEquals(null, e5.getNextLink(EdgeDirection.INOUT));
		assertEquals(null, e5.getNextLink(EdgeDirection.IN));
		assertEquals(null, e5.getNextLink(EdgeDirection.OUT));
=======
		assertEquals(e1.getReversedEdge(),
				e1.getNextLinkIncidence(EdgeDirection.INOUT));
		assertEquals(e1.getReversedEdge(),
				e1.getNextLinkIncidence(EdgeDirection.IN));
		assertEquals(e5, e1.getNextLinkIncidence(EdgeDirection.OUT));
		assertEquals(e3.getReversedEdge(),
				((SubLink) e1.getReversedEdge())
						.getNextLinkIncidence(EdgeDirection.INOUT));
		assertEquals(e3.getReversedEdge(),
				((SubLink) e1.getReversedEdge())
						.getNextLinkIncidence(EdgeDirection.IN));
		assertEquals(e5,
				((SubLink) e1.getReversedEdge())
		assertEquals(null,
				((Link) e3.getReversedEdge())
						.getNextLinkIncidence(EdgeDirection.OUT));
		assertEquals(null, e5.getNextLinkIncidence(EdgeDirection.INOUT));
		assertEquals(null, e5.getNextLinkIncidence(EdgeDirection.IN));
		assertEquals(null, e5.getNextLinkIncidence(EdgeDirection.OUT));
>>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890
		commit(g);
	}

Solution content

		commit(g);

		createReadOnlyTransaction(g);
		assertEquals(e1.getReversedEdge(),
				e1.getNextLinkIncidence(EdgeDirection.INOUT));
		assertEquals(e1.getReversedEdge(),
				e1.getNextLinkIncidence(EdgeDirection.IN));
		assertEquals(e5, e1.getNextLinkIncidence(EdgeDirection.OUT));
		assertEquals(e3.getReversedEdge(),
				((SubLink) e1.getReversedEdge())
						.getNextLinkIncidence(EdgeDirection.INOUT));
		assertEquals(e3.getReversedEdge(),
				((SubLink) e1.getReversedEdge())
						.getNextLinkIncidence(EdgeDirection.IN));
		assertEquals(e5,
				((SubLink) e1.getReversedEdge())
						.getNextLinkIncidence(EdgeDirection.OUT));
		assertEquals(e5,
				((Link) e3.getReversedEdge())
						.getNextLinkIncidence(EdgeDirection.INOUT));
		assertEquals(null,
				((Link) e3.getReversedEdge())
						.getNextLinkIncidence(EdgeDirection.IN));
		assertEquals(e5,
				((Link) e3.getReversedEdge())
						.getNextLinkIncidence(EdgeDirection.OUT));
		assertEquals(null, e5.getNextLinkIncidence(EdgeDirection.INOUT));
		assertEquals(null, e5.getNextLinkIncidence(EdgeDirection.IN));
		assertEquals(null, e5.getNextLinkIncidence(EdgeDirection.OUT));
		commit(g);
	}

File
EdgeTest.java

Developer's decision
Version 2

Kind of conflict
Method invocation

Chunk

Conflicting content

		commit(g);

		createReadOnlyTransaction(g);
<<<<<<< HEAD
		assertEquals(e1.getReversedEdge(), e1
				.getNextSubLink(EdgeDirection.INOUT));
		assertEquals(e1.getReversedEdge(), e1.getNextSubLink(EdgeDirection.IN));
		assertEquals(e5, e1.getNextLink(EdgeDirection.OUT));
		assertEquals(e5, ((SubLink) e1.getReversedEdge())
				.getNextSubLink(EdgeDirection.INOUT));
		assertEquals(e6.getReversedEdge(), ((SubLink) e1.getReversedEdge())
				.getNextSubLink(EdgeDirection.IN));
		assertEquals(e5, ((SubLink) e1.getReversedEdge())
				.getNextSubLink(EdgeDirection.OUT));
		assertEquals(e6.getReversedEdge(), e5
				.getNextSubLink(EdgeDirection.INOUT));
		assertEquals(e6.getReversedEdge(), e5.getNextSubLink(EdgeDirection.IN));
		assertEquals(null, e5.getNextSubLink(EdgeDirection.OUT));
		assertEquals(null, ((SubLink) e6.getReversedEdge())
				.getNextSubLink(EdgeDirection.INOUT));
		assertEquals(null, ((SubLink) e6.getReversedEdge())
				.getNextSubLink(EdgeDirection.IN));
		assertEquals(null, ((SubLink) e6.getReversedEdge())
				.getNextSubLink(EdgeDirection.OUT));
=======
		assertEquals(e1.getReversedEdge(),
				e1.getNextSubLinkIncidence(EdgeDirection.INOUT));
		assertEquals(e1.getReversedEdge(),
				e1.getNextSubLinkIncidence(EdgeDirection.IN));
		assertEquals(e5, e1.getNextLinkIncidence(EdgeDirection.OUT));
		assertEquals(e5,
				((SubLink) e1.getReversedEdge())
						.getNextSubLinkIncidence(EdgeDirection.INOUT));
		assertEquals(e6.getReversedEdge(),
				((SubLink) e1.getReversedEdge())
						.getNextSubLinkIncidence(EdgeDirection.IN));
		assertEquals(e5,
				((SubLink) e1.getReversedEdge())
						.getNextSubLinkIncidence(EdgeDirection.OUT));
		assertEquals(e6.getReversedEdge(),
				e5.getNextSubLinkIncidence(EdgeDirection.INOUT));
		assertEquals(e6.getReversedEdge(),
				e5.getNextSubLinkIncidence(EdgeDirection.IN));
		assertEquals(null, e5.getNextSubLinkIncidence(EdgeDirection.OUT));
		assertEquals(null,
				((SubLink) e6.getReversedEdge())
						.getNextSubLinkIncidence(EdgeDirection.INOUT));
		assertEquals(null,
				((SubLink) e6.getReversedEdge())
						.getNextSubLinkIncidence(EdgeDirection.IN));
		assertEquals(null,
				((SubLink) e6.getReversedEdge())
						.getNextSubLinkIncidence(EdgeDirection.OUT));
>>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890
		commit(g);
	}
}

Solution content

						.getNextSubLinkIncidence(EdgeDirection.IN));
		assertEquals(null,
				((SubLink) e6.getReversedEdge())
						.getNextSubLinkIncidence(EdgeDirection.OUT));
		commit(g);
	}
}
		commit(g);

		createReadOnlyTransaction(g);
		assertEquals(e1.getReversedEdge(),
				e1.getNextSubLinkIncidence(EdgeDirection.INOUT));
		assertEquals(e1.getReversedEdge(),
				e1.getNextSubLinkIncidence(EdgeDirection.IN));
		assertEquals(e5, e1.getNextLinkIncidence(EdgeDirection.OUT));
		assertEquals(e5,
				((SubLink) e1.getReversedEdge())
						.getNextSubLinkIncidence(EdgeDirection.INOUT));
		assertEquals(e6.getReversedEdge(),
				((SubLink) e1.getReversedEdge())
						.getNextSubLinkIncidence(EdgeDirection.IN));
		assertEquals(e5,
				((SubLink) e1.getReversedEdge())
						.getNextSubLinkIncidence(EdgeDirection.OUT));
		assertEquals(e6.getReversedEdge(),
				e5.getNextSubLinkIncidence(EdgeDirection.INOUT));
		assertEquals(e6.getReversedEdge(),
				e5.getNextSubLinkIncidence(EdgeDirection.IN));
		assertEquals(null, e5.getNextSubLinkIncidence(EdgeDirection.OUT));
		assertEquals(null,
				((SubLink) e6.getReversedEdge())
						.getNextSubLinkIncidence(EdgeDirection.INOUT));
		assertEquals(null,
				((SubLink) e6.getReversedEdge())

File
EdgeTest.java

Developer's decision
Version 2

Kind of conflict
Method invocation

Chunk

Conflicting content

	@Test
		long[] versions = new long[3];
	 * Test of the Interface Vertex
	 */

<<<<<<< HEAD
=======
	// tests of the method isIncidenceListModified(long incidenceListVersion);
	/**
	 * Tests if the incidenceList wasn't modified.
	 *
	 * @throws CommitFailedException
	 */
	public void isIncidenceListModifiedTest0() throws CommitFailedException {
		createTransaction(g);
		AbstractSuperNode asn = g.createSubNode();
		SuperNode sn = g.createSuperNode();
		DoubleSubNode dsn = g.createDoubleSubNode();
		commit(g);
		createReadOnlyTransaction(g);
		long asnIncidenceListVersion = asn.getIncidenceListVersion();
		long snIncidenceListVersion = sn.getIncidenceListVersion();
		long dsnIncidenceListVersion = dsn.getIncidenceListVersion();
		assertFalse(asn.isIncidenceListModified(asnIncidenceListVersion));
		assertFalse(sn.isIncidenceListModified(snIncidenceListVersion));
		assertFalse(dsn.isIncidenceListModified(dsnIncidenceListVersion));
		commit(g);
	}

	/**
			commit(g);
	public void isIncidenceListModifiedTest1() throws CommitFailedException {
		createTransaction(g);
		Vertex[] nodes = new Vertex[3];
	 * If you create and delete edges, only the incidenceLists of the involved
	 * nodes may have been modified.
	 *
	 * @throws CommitFailedException
	 */
	@Test
		nodes[0] = g.createSubNode();
		versions[0] = nodes[0].getIncidenceListVersion();
		nodes[1] = g.createDoubleSubNode();
		versions[1] = nodes[1].getIncidenceListVersion();
		nodes[2] = g.createSuperNode();
		versions[2] = nodes[2].getIncidenceListVersion();
		commit(g);
		for (int i = 0; i < ITERATIONS; i++) {
			int start = rand.nextInt(2);
			int end = rand.nextInt(2) + 1;
			// create a new edge
			createTransaction(g);
			Link sl = g.createLink((AbstractSuperNode) nodes[start],
					(SuperNode) nodes[end]);
			commit(g);
			createReadOnlyTransaction(g);
			assertTrue(nodes[start].isIncidenceListModified(versions[start]));
			assertTrue(nodes[end].isIncidenceListModified(versions[end]));
			if (start != end) {
				assertFalse(nodes[6 - (start + 1) - (end + 1) - 1]
						.isIncidenceListModified(versions[6 - (start + 1)
								- (end + 1) - 1]));
			} else {
				for (int j = 0; j < 3; j++) {
					if (j != start) {
						assertFalse(nodes[j]
								.isIncidenceListModified(versions[j]));
					}
				}
			}
			// update of versions
			versions[0] = nodes[0].getIncidenceListVersion();
			versions[1] = nodes[1].getIncidenceListVersion();
			versions[2] = nodes[2].getIncidenceListVersion();
			commit(g);

			// delete an edge
			createTransaction(g);
			g.deleteEdge(sl);
			commit(g);

			createReadOnlyTransaction(g);
			assertTrue(nodes[start].isIncidenceListModified(versions[start]));
			assertTrue(nodes[end].isIncidenceListModified(versions[end]));
			if (start != end) {
				assertFalse(nodes[6 - (start + 1) - (end + 1) - 1]
						.isIncidenceListModified(versions[6 - (start + 1)
								- (end + 1) - 1]));
			} else {
				for (int j = 0; j < 3; j++) {
					if (j != start) {
						assertFalse(nodes[j]
								.isIncidenceListModified(versions[j]));
					}
				}
			}
			// update of versions
			versions[0] = nodes[0].getIncidenceListVersion();
			versions[1] = nodes[1].getIncidenceListVersion();
			versions[2] = nodes[2].getIncidenceListVersion();
			commit(g);
		}
	}

	// tests of the method getIncidenceListVersion()
	/**
	 * If you create and delete edges, only the incidenceListVersions of the
	 * involved nodes may have been increased.
	 *
	 * @throws CommitFailedException
	 */
	@Test
	public void getIncidenceListVersionTest0() throws CommitFailedException {
		createTransaction(g);
		Vertex[] nodes = new Vertex[3];
		nodes[0] = g.createSubNode();
		nodes[1] = g.createDoubleSubNode();
		nodes[2] = g.createSuperNode();
		commit(g);
		long[] expectedVersions = new long[] { 0, 0, 0 };
		for (int i = 0; i < ITERATIONS; i++) {
			int start = rand.nextInt(2);
			int end = rand.nextInt(2) + 1;
			// create a new edge
			createTransaction(g);
			Link sl = g.createLink((AbstractSuperNode) nodes[start],
					(SuperNode) nodes[end]);
			expectedVersions[start]++;
			expectedVersions[end]++;
			commit(g);
			createReadOnlyTransaction(g);
			assertEquals(expectedVersions[0],
					nodes[0].getIncidenceListVersion());
			assertEquals(expectedVersions[1],
					nodes[1].getIncidenceListVersion());
			assertEquals(expectedVersions[2],
					nodes[2].getIncidenceListVersion());
			commit(g);
			// delete an edge
			createTransaction(g);
			g.deleteEdge(sl);
			expectedVersions[start]++;
			expectedVersions[end]++;
			createReadOnlyTransaction(g);
			assertEquals(expectedVersions[0],
					nodes[0].getIncidenceListVersion());
			assertEquals(expectedVersions[1],
					nodes[1].getIncidenceListVersion());
			assertEquals(expectedVersions[2],
					nodes[2].getIncidenceListVersion());
			commit(g);
		}
	}

	// tests of the method getDegree()

>>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890
	/**
	 * A vertex with no connected incidences has to have a degree of 0.
	 *

Solution content

		commit(g);
		createReadOnlyTransaction(g);
		assertFalse(asn.isIncidenceListModified(asnIncidenceListVersion));
		assertFalse(sn.isIncidenceListModified(snIncidenceListVersion));
		assertFalse(dsn.isIncidenceListModified(dsnIncidenceListVersion));
		long asnIncidenceListVersion = asn.getIncidenceListVersion();
		long snIncidenceListVersion = sn.getIncidenceListVersion();
		long dsnIncidenceListVersion = dsn.getIncidenceListVersion();
		commit(g);
	}

	/**
	 * Test of the Interface Vertex
	 */

	// tests of the method isIncidenceListModified(long incidenceListVersion);
	/**
	 * Tests if the incidenceList wasn't modified.
	 *
	 * @throws CommitFailedException
	 */
	@Test
	public void isIncidenceListModifiedTest0() throws CommitFailedException {
		createTransaction(g);
		AbstractSuperNode asn = g.createSubNode();
		SuperNode sn = g.createSuperNode();
		DoubleSubNode dsn = g.createDoubleSubNode();
	 * If you create and delete edges, only the incidenceLists of the involved
	 * nodes may have been modified.
	 *
	 * @throws CommitFailedException
	 */
	@Test
	public void isIncidenceListModifiedTest1() throws CommitFailedException {
		createTransaction(g);
		Vertex[] nodes = new Vertex[3];
		long[] versions = new long[3];
		nodes[0] = g.createSubNode();
		versions[0] = nodes[0].getIncidenceListVersion();
		nodes[1] = g.createDoubleSubNode();
		versions[1] = nodes[1].getIncidenceListVersion();
		nodes[2] = g.createSuperNode();
		versions[2] = nodes[2].getIncidenceListVersion();
		commit(g);
		for (int i = 0; i < ITERATIONS; i++) {
			int start = rand.nextInt(2);
			int end = rand.nextInt(2) + 1;
			// create a new edge
			createTransaction(g);
			Link sl = g.createLink((AbstractSuperNode) nodes[start],
					(SuperNode) nodes[end]);
			commit(g);
			createReadOnlyTransaction(g);
			assertTrue(nodes[start].isIncidenceListModified(versions[start]));
			assertTrue(nodes[end].isIncidenceListModified(versions[end]));
			if (start != end) {
				assertFalse(nodes[6 - (start + 1) - (end + 1) - 1]
						.isIncidenceListModified(versions[6 - (start + 1)
								- (end + 1) - 1]));
			} else {
				for (int j = 0; j < 3; j++) {
					if (j != start) {
						assertFalse(nodes[j]
								.isIncidenceListModified(versions[j]));
					}
				}
			}
			// update of versions
			versions[0] = nodes[0].getIncidenceListVersion();
			versions[1] = nodes[1].getIncidenceListVersion();
			versions[2] = nodes[2].getIncidenceListVersion();
			commit(g);

			// delete an edge
			createTransaction(g);
			g.deleteEdge(sl);
			commit(g);

			createReadOnlyTransaction(g);
			assertTrue(nodes[start].isIncidenceListModified(versions[start]));
			assertTrue(nodes[end].isIncidenceListModified(versions[end]));
			if (start != end) {
				assertFalse(nodes[6 - (start + 1) - (end + 1) - 1]
						.isIncidenceListModified(versions[6 - (start + 1)
								- (end + 1) - 1]));
			} else {
				for (int j = 0; j < 3; j++) {
					if (j != start) {
						assertFalse(nodes[j]
								.isIncidenceListModified(versions[j]));
					}
				}
			}
			// update of versions
			versions[0] = nodes[0].getIncidenceListVersion();
			versions[1] = nodes[1].getIncidenceListVersion();
			versions[2] = nodes[2].getIncidenceListVersion();
			commit(g);
		}
	}

	// tests of the method getIncidenceListVersion()
	/**
	 * If you create and delete edges, only the incidenceListVersions of the
	 * involved nodes may have been increased.
	 *
	 * @throws CommitFailedException
	 */
	@Test
	public void getIncidenceListVersionTest0() throws CommitFailedException {
		createTransaction(g);
		Vertex[] nodes = new Vertex[3];
		nodes[0] = g.createSubNode();
		nodes[1] = g.createDoubleSubNode();
		nodes[2] = g.createSuperNode();
		commit(g);
		long[] expectedVersions = new long[] { 0, 0, 0 };
		for (int i = 0; i < ITERATIONS; i++) {
			int start = rand.nextInt(2);
			int end = rand.nextInt(2) + 1;
			// create a new edge
			createTransaction(g);
			Link sl = g.createLink((AbstractSuperNode) nodes[start],
					(SuperNode) nodes[end]);
			expectedVersions[start]++;
			expectedVersions[end]++;
			commit(g);
			createReadOnlyTransaction(g);
			assertEquals(expectedVersions[0],
					nodes[0].getIncidenceListVersion());
			assertEquals(expectedVersions[1],
					nodes[1].getIncidenceListVersion());
			assertEquals(expectedVersions[2],
					nodes[2].getIncidenceListVersion());
			commit(g);
			// delete an edge
			createTransaction(g);
			g.deleteEdge(sl);
			expectedVersions[start]++;
			expectedVersions[end]++;
			commit(g);
			createReadOnlyTransaction(g);
			assertEquals(expectedVersions[0],
					nodes[0].getIncidenceListVersion());
			assertEquals(expectedVersions[1],
					nodes[1].getIncidenceListVersion());
			assertEquals(expectedVersions[2],
					nodes[2].getIncidenceListVersion());
			commit(g);
		}
	}

	// tests of the method getDegree()

	/**
	 * A vertex with no connected incidences has to have a degree of 0.
	 *

File
VertexTest.java

Developer's decision
Version 2

Kind of conflict
Annotation
Comment
Method declaration

Chunk

Conflicting content

	// tests of the method boolean isValidAlpha(Edge edge);

<<<<<<< HEAD
=======
	/**
	 * Checks some cases for true and false considering heredity.
	 *
	 * @throws CommitFailedException
	 */
	@Test
	public void isValidAlphaTest0() throws CommitFailedException {
		createTransaction(g);
		Vertex v0 = g.createSubNode();
		Vertex v1 = g.createSuperNode();
		Vertex v2 = g.createDoubleSubNode();
		Edge e0 = g.createLink((AbstractSuperNode) v2, (SuperNode) v2);
		Edge e1 = g.createSubLink((DoubleSubNode) v2, (SuperNode) v2);
		commit(g);
		createReadOnlyTransaction(g);
		assertTrue(v0.isValidAlpha(e0));
		assertFalse(v1.isValidAlpha(e0));
		assertTrue(v2.isValidAlpha(e0));
		assertFalse(v0.isValidAlpha(e1));
		assertFalse(v1.isValidAlpha(e1));
		assertTrue(v2.isValidAlpha(e1));
		commit(g);
	}

	// tests of the method boolean isValidOmega(Edge edge);

	/**
	 * Checks some cases for true and false.
	 *
	 * @throws CommitFailedException
	 */
	@Test
	public void isValidOmegaTest0() throws CommitFailedException {
		createTransaction(g);
		Vertex v0 = g.createSubNode();
		Vertex v1 = g.createSuperNode();
		commit(g);
		createReadOnlyTransaction(g);
		assertTrue(v0.isValid());
		assertTrue(v1.isValid());
		commit(g);
		createTransaction(g);
		v0.delete();
		commit(g);
		createReadOnlyTransaction(g);
		assertFalse(v0.isValid());
		assertTrue(v1.isValid());
		commit(g);
	}

	/*
	 * Test of the Interface GraphElement
	 */

>>>>>>> 4ea1f7d9c9cc2c9435a176db18e41b32b245e890
	// tests of the method Graph getGraph();
	/**
	 * Checks some cases for true and false.

Solution content

	// tests of the method boolean isValidAlpha(Edge edge);

	/**
	 * Checks some cases for true and false considering heredity.
	 *
	 * @throws CommitFailedException
	 */
	@Test
	public void isValidAlphaTest0() throws CommitFailedException {
		createTransaction(g);
		Vertex v0 = g.createSubNode();
		Vertex v1 = g.createSuperNode();
		Vertex v2 = g.createDoubleSubNode();
		Edge e0 = g.createLink((AbstractSuperNode) v2, (SuperNode) v2);
		Edge e1 = g.createSubLink((DoubleSubNode) v2, (SuperNode) v2);
		commit(g);
		createReadOnlyTransaction(g);
		assertTrue(v0.isValidAlpha(e0));
		assertFalse(v1.isValidAlpha(e0));
		assertTrue(v2.isValidAlpha(e0));
		assertFalse(v0.isValidAlpha(e1));
		assertFalse(v1.isValidAlpha(e1));
		assertTrue(v2.isValidAlpha(e1));
		commit(g);
	}

	// tests of the method boolean isValidOmega(Edge edge);

	/**
	 * Checks some cases for true and false.
	 *
	 * @throws CommitFailedException
	 */
	@Test
	public void isValidOmegaTest0() throws CommitFailedException {
		createTransaction(g);
		Vertex v0 = g.createSubNode();
		Vertex v1 = g.createSuperNode();
		commit(g);
		createReadOnlyTransaction(g);
		assertTrue(v0.isValid());
		assertTrue(v1.isValid());
		commit(g);
		createTransaction(g);
		v0.delete();
		commit(g);
		createReadOnlyTransaction(g);
		assertFalse(v0.isValid());
		assertTrue(v1.isValid());
		commit(g);
	}

	/*
	 * Test of the Interface GraphElement
	 */

	// tests of the method Graph getGraph();
	/**
	 * Checks some cases for true and false.

File
VertexTest.java

Developer's decision
Version 2

Kind of conflict
Annotation
Comment
Method declaration

Projects >> jgralab >>07337134fba547de8a5275744759c83da0e62431