A macroscopic change for differences on UML DirectedRelationship.

Like changes on UML associations, a macroscopic change must be created
for changes on DirectedRelationship elements.
Without this macroscopic change, the add of an incoming reference to 
the DirectionRelationship (Generalization for example) will add the 
DirectionRelationship itself but not the potential outgoing references 
from it (Generalization#general for example) which are integral part of
the related concept. So, the add of a graphical edge which represents a
UML generalization will involve an inconsistency in the business UML
model. That's why it is required to encapsulate all the differences 
related to a DirectionRelationship change in a macroscopic one. The 
requirement link will be automatically computed between this one and 
other ones.  

Bug: 406405
Change-Id: I6c624a913bcf993b666421ba8fae868e0b2ae753

45 files changed, 1352 insertions, 2829 deletions

diff --git a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/AbstractTest.java b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/AbstractTest.java
index 591ed5faf..317e8923d 100644
--- a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/AbstractTest.java
+++ b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/AbstractTest.java
@@ -243,6 +243,15 @@ public abstract class AbstractTest {
 		};
 	}
 	
+	protected static Predicate<Diff> discriminantInstanceOf(final EClass clazz) {
+		return new Predicate<Diff>() {
+			public boolean apply(Diff input) {
+				return input instanceof UMLDiff && clazz.isInstance(((UMLDiff)input).getDiscriminant());
+			}
+			
+		};
+	}
+	
 	protected static EObject getValue(Diff diff) {
 		if (diff instanceof DiagramDiff) {
 			return ((DiagramDiff)diff).getView();
diff --git a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/EdgeMergeTest.java b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/EdgeMergeTest.java
index f37b64b0a..5a2b3a1fe 100644
--- a/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/EdgeMergeTest.java
+++ b/plugins/org.eclipse.emf.compare.diagram.papyrus.tests/src/org/eclipse/emf/compare/diagram/papyrus/tests/merge/EdgeMergeTest.java
@@ -11,6 +11,7 @@
 package org.eclipse.emf.compare.diagram.papyrus.tests.merge;

 

 import static com.google.common.base.Predicates.and;

+import static com.google.common.base.Predicates.not;

 import static com.google.common.base.Predicates.instanceOf;

 import static org.eclipse.emf.compare.utils.EMFComparePredicates.ofKind;

 

@@ -27,9 +28,7 @@ import org.eclipse.emf.compare.diagram.papyrus.tests.AbstractTest;
 import org.eclipse.emf.compare.diagram.papyrus.tests.DiagramInputData;

 import org.eclipse.emf.compare.diagram.papyrus.tests.merge.data.EdgeMergeInputData;

 import org.eclipse.emf.compare.uml2.internal.AssociationChange;

-import org.eclipse.emf.compare.uml2.internal.DependencyChange;

-import org.eclipse.emf.compare.uml2.internal.InterfaceRealizationChange;

-import org.eclipse.emf.compare.uml2.internal.SubstitutionChange;

+import org.eclipse.emf.compare.uml2.internal.DirectedRelationshipChange;

 import org.eclipse.emf.ecore.resource.Resource;

 import org.eclipse.gmf.runtime.notation.NotationPackage;

 import org.eclipse.uml2.uml.UMLPackage;

@@ -111,11 +110,11 @@ public class EdgeMergeTest extends AbstractTest {
 	private static final int A6_DEPENDENCY_CHANGES_NB = 8 * A6_DEPENDENCY_CHANGE1_NB + 2 * A6_SUBSTITUTION_CHANGE1_NB + A6_IREAL_CHANGE1_NB;

 	private static final int A6_ASSO_CHANGE1_NB = 14;

 	private static final int A6_ASSO_CHANGES_NB = 2 * A6_ASSO_CHANGE1_NB;

-	private static final int A6_IMPORT_CHANGE1_NB = 2;

+	private static final int A6_IMPORT_CHANGE1_NB = 3;

 	private static final int A6_IMPORT_CHANGES_NB = 2 * A6_IMPORT_CHANGE1_NB;

-	private static final int A6_FLOW_CHANGE1_NB = 3;

+	private static final int A6_FLOW_CHANGE1_NB = 4;

 	private static final int A6_FLOW_CHANGES_NB = 2 * A6_FLOW_CHANGE1_NB;

-	private static final int A6_GENERAL_CHANGE1_NB = 2;

+	private static final int A6_GENERAL_CHANGE1_NB = 3;

 	private static final int A6_GENERAL_CHANGES_NB = 2 * A6_GENERAL_CHANGE1_NB;

 	private static final int A6_DIFFS_NB = A6_NODECHANGES_NB + A6_DEPENDENCY_EDGE_CHANGES_NB + A6_ASSO_EDGE_CHANGES_NB + A6_IMPORT_EDGE_CHANGES_NB + A6_FLOW_EDGE_CHANGES_NB + A6_GENERAL_EDGE_CHANGES_NB + A6_CLASSCHANGES_NB + A6_DEPENDENCY_CHANGES_NB + A6_ASSO_CHANGES_NB + A6_IMPORT_CHANGES_NB + A6_FLOW_CHANGES_NB + A6_GENERAL_CHANGES_NB;

 	

@@ -928,10 +927,10 @@ public class EdgeMergeTest extends AbstractTest {
 		Comparison comparison = buildComparison(left, right);

 

 		// ** DIFF CHECKING **

-		Predicate<Diff> substitutions = and(instanceOf(SubstitutionChange.class), ofKind(DifferenceKind.ADD));

-		Predicate<Diff> interfaceRealizations = and(instanceOf(InterfaceRealizationChange.class), ofKind(DifferenceKind.ADD));

+		Predicate<Diff> substitutions = and(instanceOf(DirectedRelationshipChange.class), discriminantInstanceOf(UMLPackage.Literals.SUBSTITUTION), ofKind(DifferenceKind.ADD));

+		Predicate<Diff> interfaceRealizations = and(instanceOf(DirectedRelationshipChange.class), discriminantInstanceOf(UMLPackage.Literals.INTERFACE_REALIZATION), ofKind(DifferenceKind.ADD));

 		Predicate<Diff> associations = and(instanceOf(AssociationChange.class), ofKind(DifferenceKind.ADD));

-		Predicate<Diff> dependencies = and(instanceOf(DependencyChange.class), ofKind(DifferenceKind.ADD));

+		Predicate<Diff> dependencies = and(instanceOf(DirectedRelationshipChange.class), discriminantInstanceOf(UMLPackage.Literals.DEPENDENCY), ofKind(DifferenceKind.ADD));

 		Predicate<Diff> nodes = and(instanceOf(NodeChange.class), ofKind(DifferenceKind.ADD));

 		Predicate<Diff> edges = and(instanceOf(EdgeChange.class), ofKind(DifferenceKind.ADD));

 		Predicate<Diff> edgeAbstraction = and(instanceOf(EdgeChange.class), ofKind(DifferenceKind.ADD), elementClassIs(UMLPackage.Literals.ABSTRACTION));

@@ -949,7 +948,7 @@ public class EdgeMergeTest extends AbstractTest {
 				new ExpectedStat(substitutions, 2), 

 				new ExpectedStat(interfaceRealizations, 1), 

 				new ExpectedStat(associations, 2), 

-				new ExpectedStat(dependencies, 8), // 2 abstractions + 2 dependencies + 2 realizations + 2 usages. Details below:

+				new ExpectedStat(and(dependencies, not(substitutions), not(interfaceRealizations)), 8), // 2 abstractions + 2 dependencies + 2 realizations + 2 usages. Details below:

 				new ExpectedStat(nodes, 2),

 				new ExpectedStat(edges, 19), // 13 + 2 imports + 2 generalizations + 2 information flows (no UMLDiff for them). Details below:

 				new ExpectedStat(edgeAbstraction, 2),

@@ -973,7 +972,7 @@ public class EdgeMergeTest extends AbstractTest {
 				new ExpectedStat(substitutions, 2), 

 				new ExpectedStat(interfaceRealizations, 1), 

 				new ExpectedStat(associations, 2),

-				new ExpectedStat(dependencies, 7), // ** -1

+				new ExpectedStat(and(dependencies, not(substitutions), not(interfaceRealizations)), 7), // ** -1

 				new ExpectedStat(nodes, 1), // ** -1

 				new ExpectedStat(edgeAbstraction, 1), // ** -1

 				new ExpectedStat(edgeAssociation, 2),

@@ -996,10 +995,10 @@ public class EdgeMergeTest extends AbstractTest {
 		Comparison comparison = buildComparison(left, right);

 

 		// ** DIFF CHECKING **

-		Predicate<Diff> substitutions = and(instanceOf(SubstitutionChange.class), ofKind(DifferenceKind.ADD));

-		Predicate<Diff> interfaceRealizations = and(instanceOf(InterfaceRealizationChange.class), ofKind(DifferenceKind.ADD));

+		Predicate<Diff> substitutions = and(instanceOf(DirectedRelationshipChange.class), discriminantInstanceOf(UMLPackage.Literals.SUBSTITUTION), ofKind(DifferenceKind.ADD));

+		Predicate<Diff> interfaceRealizations = and(instanceOf(DirectedRelationshipChange.class), discriminantInstanceOf(UMLPackage.Literals.INTERFACE_REALIZATION), ofKind(DifferenceKind.ADD));

 		Predicate<Diff> associations = and(instanceOf(AssociationChange.class), ofKind(DifferenceKind.ADD));

-		Predicate<Diff> dependencies = and(instanceOf(DependencyChange.class), ofKind(DifferenceKind.ADD));

+		Predicate<Diff> dependencies = and(instanceOf(DirectedRelationshipChange.class), discriminantInstanceOf(UMLPackage.Literals.DEPENDENCY), ofKind(DifferenceKind.ADD));

 		Predicate<Diff> nodes = and(instanceOf(NodeChange.class), ofKind(DifferenceKind.ADD));

 		Predicate<Diff> edges = and(instanceOf(EdgeChange.class), ofKind(DifferenceKind.ADD));

 		Predicate<Diff> edgeAbstraction = and(instanceOf(EdgeChange.class), ofKind(DifferenceKind.ADD), elementClassIs(UMLPackage.Literals.ABSTRACTION));

@@ -1017,9 +1016,9 @@ public class EdgeMergeTest extends AbstractTest {
 				new ExpectedStat(substitutions, 2), 

 				new ExpectedStat(interfaceRealizations, 1), 

 				new ExpectedStat(associations, 2), 

-				new ExpectedStat(dependencies, 8), // 2 abstractions + 2 dependencies + 2 realizations + 2 usages.

+				new ExpectedStat(and(dependencies, not(substitutions), not(interfaceRealizations)), 8), // 2 abstractions + 2 dependencies + 2 realizations + 2 usages.

 				new ExpectedStat(nodes, 2),

-				new ExpectedStat(edges, 19), // 13 + 2 imports + 2 generalizations + 2 information flows (no UMLDiff for them). Details below:

+				new ExpectedStat(edges, 19), // 13 + 2 imports + 2 generalizations + 2 information flows. Details below:

 				new ExpectedStat(edgeAbstraction, 2),

 				new ExpectedStat(edgeAssociation, 2),

 				new ExpectedStat(edgeDependency, 2),

@@ -1041,7 +1040,7 @@ public class EdgeMergeTest extends AbstractTest {
 				new ExpectedStat(substitutions, 2), 

 				new ExpectedStat(interfaceRealizations, 1), 

 				new ExpectedStat(associations, 1), // ** -1

-				new ExpectedStat(dependencies, 8),

+				new ExpectedStat(and(dependencies, not(substitutions), not(interfaceRealizations)), 8),

 				new ExpectedStat(nodes, 1), // ** -1

 				new ExpectedStat(edgeAbstraction, 2), 

 				new ExpectedStat(edgeAssociation, 1), // ** -1

@@ -1064,10 +1063,10 @@ public class EdgeMergeTest extends AbstractTest {
 		Comparison comparison = buildComparison(left, right);

 

 		// ** DIFF CHECKING **

-		Predicate<Diff> substitutions = and(instanceOf(SubstitutionChange.class), ofKind(DifferenceKind.ADD));

-		Predicate<Diff> interfaceRealizations = and(instanceOf(InterfaceRealizationChange.class), ofKind(DifferenceKind.ADD));

+		Predicate<Diff> substitutions = and(instanceOf(DirectedRelationshipChange.class), discriminantInstanceOf(UMLPackage.Literals.SUBSTITUTION), ofKind(DifferenceKind.ADD));

+		Predicate<Diff> interfaceRealizations = and(instanceOf(DirectedRelationshipChange.class), discriminantInstanceOf(UMLPackage.Literals.INTERFACE_REALIZATION), ofKind(DifferenceKind.ADD));

 		Predicate<Diff> associations = and(instanceOf(AssociationChange.class), ofKind(DifferenceKind.ADD));

-		Predicate<Diff> dependencies = and(instanceOf(DependencyChange.class), ofKind(DifferenceKind.ADD));

+		Predicate<Diff> dependencies = and(instanceOf(DirectedRelationshipChange.class), discriminantInstanceOf(UMLPackage.Literals.DEPENDENCY), ofKind(DifferenceKind.ADD));

 		Predicate<Diff> nodes = and(instanceOf(NodeChange.class), ofKind(DifferenceKind.ADD));

 		Predicate<Diff> edges = and(instanceOf(EdgeChange.class), ofKind(DifferenceKind.ADD));

 		Predicate<Diff> edgeAbstraction = and(instanceOf(EdgeChange.class), ofKind(DifferenceKind.ADD), elementClassIs(UMLPackage.Literals.ABSTRACTION));

@@ -1085,7 +1084,7 @@ public class EdgeMergeTest extends AbstractTest {
 				new ExpectedStat(substitutions, 2), 

 				new ExpectedStat(interfaceRealizations, 1), 

 				new ExpectedStat(associations, 2), 

-				new ExpectedStat(dependencies, 8), // 2 abstractions + 2 dependencies + 2 realizations + 2 usages.

+				new ExpectedStat(and(dependencies, not(substitutions), not(interfaceRealizations)), 8), // 2 abstractions + 2 dependencies + 2 realizations + 2 usages.

 				new ExpectedStat(nodes, 2),

 				new ExpectedStat(edges, 19), // 13 + 2 imports + 2 generalizations + 2 information flows (no UMLDiff for them). Details below:

 				new ExpectedStat(edgeAbstraction, 2),

@@ -1109,7 +1108,7 @@ public class EdgeMergeTest extends AbstractTest {
 				new ExpectedStat(substitutions, 2), 

 				new ExpectedStat(interfaceRealizations, 1), 

 				new ExpectedStat(associations, 2), 

-				new ExpectedStat(dependencies, 7), // ** -1

+				new ExpectedStat(and(dependencies, not(substitutions), not(interfaceRealizations)), 7), // ** -1

 				new ExpectedStat(nodes, 1), // ** -1

 				new ExpectedStat(edgeAbstraction, 2), 

 				new ExpectedStat(edgeAssociation, 2), 

@@ -1123,9 +1122,7 @@ public class EdgeMergeTest extends AbstractTest {
 				new ExpectedStat(edgeUsage, 2));

 	}

 	

-	@Test

-	@Ignore

-	// FIXME See Bug 406405

+	@Test
 	// Merge Left to Right <ADD Import Edge>

 	public void testA6d() throws IOException {

 		final Resource left = input.getA6EdgeChangeLeft();

@@ -1134,10 +1131,10 @@ public class EdgeMergeTest extends AbstractTest {
 		Comparison comparison = buildComparison(left, right);

 

 		// ** DIFF CHECKING **

-		Predicate<Diff> substitutions = and(instanceOf(SubstitutionChange.class), ofKind(DifferenceKind.ADD));

-		Predicate<Diff> interfaceRealizations = and(instanceOf(InterfaceRealizationChange.class), ofKind(DifferenceKind.ADD));

+		Predicate<Diff> substitutions = and(instanceOf(DirectedRelationshipChange.class), discriminantInstanceOf(UMLPackage.Literals.SUBSTITUTION), ofKind(DifferenceKind.ADD));

+		Predicate<Diff> interfaceRealizations = and(instanceOf(DirectedRelationshipChange.class), discriminantInstanceOf(UMLPackage.Literals.INTERFACE_REALIZATION), ofKind(DifferenceKind.ADD));

 		Predicate<Diff> associations = and(instanceOf(AssociationChange.class), ofKind(DifferenceKind.ADD));

-		Predicate<Diff> dependencies = and(instanceOf(DependencyChange.class), ofKind(DifferenceKind.ADD));

+		Predicate<Diff> dependencies = and(instanceOf(DirectedRelationshipChange.class), discriminantInstanceOf(UMLPackage.Literals.DEPENDENCY), ofKind(DifferenceKind.ADD));

 		Predicate<Diff> nodes = and(instanceOf(NodeChange.class), ofKind(DifferenceKind.ADD));

 		Predicate<Diff> edges = and(instanceOf(EdgeChange.class), ofKind(DifferenceKind.ADD));

 		Predicate<Diff> edgeAbstraction = and(instanceOf(EdgeChange.class), ofKind(DifferenceKind.ADD), elementClassIs(UMLPackage.Literals.ABSTRACTION));

@@ -1155,9 +1152,9 @@ public class EdgeMergeTest extends AbstractTest {
 				new ExpectedStat(substitutions, 2), 

 				new ExpectedStat(interfaceRealizations, 1), 

 				new ExpectedStat(associations, 2), 

-				new ExpectedStat(dependencies, 8), // 2 abstractions + 2 dependencies + 2 realizations + 2 usages.

+				new ExpectedStat(and(dependencies, not(substitutions), not(interfaceRealizations)), 8), // 2 abstractions + 2 dependencies + 2 realizations + 2 usages.

 				new ExpectedStat(nodes, 2),

-				new ExpectedStat(edges, 19), // 13 + 2 imports + 2 generalizations + 2 information flows (no UMLDiff for them). Details below:

+				new ExpectedStat(edges, 19), // 13 + 2 imports + 2 generalizations + 2 information flows. Details below:

 				new ExpectedStat(edgeAbstraction, 2),

 				new ExpectedStat(edgeAssociation, 2),

 				new ExpectedStat(edgeDependency, 2),

@@ -1181,7 +1178,7 @@ public class EdgeMergeTest extends AbstractTest {
 				new ExpectedStat(substitutions, 2), 

 				new ExpectedStat(interfaceRealizations, 1), 

 				new ExpectedStat(associations, 2), 

-				new ExpectedStat(dependencies, 8),

+				new ExpectedStat(and(dependencies, not(substitutions), not(interfaceRealizations)), 8),

 				new ExpectedStat(nodes, 1), // ** -1

 				new ExpectedStat(edgeAbstraction, 2), 

 				new ExpectedStat(edgeAssociation, 2), 

@@ -1195,9 +1192,7 @@ public class EdgeMergeTest extends AbstractTest {
 				new ExpectedStat(edgeUsage, 2));

 	}

 	

-	@Test

-	@Ignore

-	// FIXME See Bug 406405

+	@Test
 	// Merge Left to Right <ADD Generalization Edge>

 	public void testA6e() throws IOException {

 		final Resource left = input.getA6EdgeChangeLeft();

@@ -1206,10 +1201,10 @@ public class EdgeMergeTest extends AbstractTest {
 		Comparison comparison = buildComparison(left, right);

 

 		// ** DIFF CHECKING **

-		Predicate<Diff> substitutions = and(instanceOf(SubstitutionChange.class), ofKind(DifferenceKind.ADD));

-		Predicate<Diff> interfaceRealizations = and(instanceOf(InterfaceRealizationChange.class), ofKind(DifferenceKind.ADD));

+		Predicate<Diff> substitutions = and(instanceOf(DirectedRelationshipChange.class), discriminantInstanceOf(UMLPackage.Literals.SUBSTITUTION), ofKind(DifferenceKind.ADD));

+		Predicate<Diff> interfaceRealizations = and(instanceOf(DirectedRelationshipChange.class), discriminantInstanceOf(UMLPackage.Literals.INTERFACE_REALIZATION), ofKind(DifferenceKind.ADD));

 		Predicate<Diff> associations = and(instanceOf(AssociationChange.class), ofKind(DifferenceKind.ADD));

-		Predicate<Diff> dependencies = and(instanceOf(DependencyChange.class), ofKind(DifferenceKind.ADD));

+		Predicate<Diff> dependencies = and(instanceOf(DirectedRelationshipChange.class), discriminantInstanceOf(UMLPackage.Literals.DEPENDENCY), ofKind(DifferenceKind.ADD));

 		Predicate<Diff> nodes = and(instanceOf(NodeChange.class), ofKind(DifferenceKind.ADD));

 		Predicate<Diff> edges = and(instanceOf(EdgeChange.class), ofKind(DifferenceKind.ADD));

 		Predicate<Diff> edgeAbstraction = and(instanceOf(EdgeChange.class), ofKind(DifferenceKind.ADD), elementClassIs(UMLPackage.Literals.ABSTRACTION));

@@ -1227,7 +1222,7 @@ public class EdgeMergeTest extends AbstractTest {
 				new ExpectedStat(substitutions, 2), 

 				new ExpectedStat(interfaceRealizations, 1), 

 				new ExpectedStat(associations, 2), 

-				new ExpectedStat(dependencies, 8), // 2 abstractions + 2 dependencies + 2 realizations + 2 usages.

+				new ExpectedStat(and(dependencies, not(substitutions), not(interfaceRealizations)), 8), // 2 abstractions + 2 dependencies + 2 realizations + 2 usages.

 				new ExpectedStat(nodes, 2),

 				new ExpectedStat(edges, 19), // 13 + 2 imports + 2 generalizations + 2 information flows (no UMLDiff for them). Details below:

 				new ExpectedStat(edgeAbstraction, 2),

@@ -1253,7 +1248,7 @@ public class EdgeMergeTest extends AbstractTest {
 				new ExpectedStat(substitutions, 2), 

 				new ExpectedStat(interfaceRealizations, 1), 

 				new ExpectedStat(associations, 2), 

-				new ExpectedStat(dependencies, 8),

+				new ExpectedStat(and(dependencies, not(substitutions), not(interfaceRealizations)), 8),

 				new ExpectedStat(nodes, 1), // ** -1

 				new ExpectedStat(edgeAbstraction, 2), 

 				new ExpectedStat(edgeAssociation, 2), 

@@ -1267,9 +1262,7 @@ public class EdgeMergeTest extends AbstractTest {
 				new ExpectedStat(edgeUsage, 2));

 	}

 	

-	@Test

-	@Ignore

-	// FIXME See Bug 406405

+	@Test
 	// Merge Left to Right <ADD Flow Edge>

 	public void testA6f() throws IOException {

 		final Resource left = input.getA6EdgeChangeLeft();

@@ -1278,10 +1271,10 @@ public class EdgeMergeTest extends AbstractTest {
 		Comparison comparison = buildComparison(left, right);

 

 		// ** DIFF CHECKING **

-		Predicate<Diff> substitutions = and(instanceOf(SubstitutionChange.class), ofKind(DifferenceKind.ADD));

-		Predicate<Diff> interfaceRealizations = and(instanceOf(InterfaceRealizationChange.class), ofKind(DifferenceKind.ADD));

+		Predicate<Diff> substitutions = and(instanceOf(DirectedRelationshipChange.class), discriminantInstanceOf(UMLPackage.Literals.SUBSTITUTION), ofKind(DifferenceKind.ADD));

+		Predicate<Diff> interfaceRealizations = and(instanceOf(DirectedRelationshipChange.class), discriminantInstanceOf(UMLPackage.Literals.INTERFACE_REALIZATION), ofKind(DifferenceKind.ADD));

 		Predicate<Diff> associations = and(instanceOf(AssociationChange.class), ofKind(DifferenceKind.ADD));

-		Predicate<Diff> dependencies = and(instanceOf(DependencyChange.class), ofKind(DifferenceKind.ADD));

+		Predicate<Diff> dependencies = and(instanceOf(DirectedRelationshipChange.class), discriminantInstanceOf(UMLPackage.Literals.DEPENDENCY), ofKind(DifferenceKind.ADD));

 		Predicate<Diff> nodes = and(instanceOf(NodeChange.class), ofKind(DifferenceKind.ADD));

 		Predicate<Diff> edges = and(instanceOf(EdgeChange.class), ofKind(DifferenceKind.ADD));

 		Predicate<Diff> edgeAbstraction = and(instanceOf(EdgeChange.class), ofKind(DifferenceKind.ADD), elementClassIs(UMLPackage.Literals.ABSTRACTION));

@@ -1299,7 +1292,7 @@ public class EdgeMergeTest extends AbstractTest {
 				new ExpectedStat(substitutions, 2), 

 				new ExpectedStat(interfaceRealizations, 1), 

 				new ExpectedStat(associations, 2), 

-				new ExpectedStat(dependencies, 8), // 2 abstractions + 2 dependencies + 2 realizations + 2 usages.

+				new ExpectedStat(and(dependencies, not(substitutions), not(interfaceRealizations)), 8), // 2 abstractions + 2 dependencies + 2 realizations + 2 usages.

 				new ExpectedStat(nodes, 2),

 				new ExpectedStat(edges, 19), // 13 + 2 imports + 2 generalizations + 2 information flows (no UMLDiff for them). Details below:

 				new ExpectedStat(edgeAbstraction, 2),

@@ -1325,7 +1318,7 @@ public class EdgeMergeTest extends AbstractTest {
 				new ExpectedStat(substitutions, 2), 

 				new ExpectedStat(interfaceRealizations, 1), 

 				new ExpectedStat(associations, 2), 

-				new ExpectedStat(dependencies, 8),

+				new ExpectedStat(and(dependencies, not(substitutions), not(interfaceRealizations)), 8),

 				new ExpectedStat(nodes, 1), // ** -1

 				new ExpectedStat(edgeAbstraction, 2), 

 				new ExpectedStat(edgeAssociation, 2), 

@@ -1348,10 +1341,10 @@ public class EdgeMergeTest extends AbstractTest {
 		Comparison comparison = buildComparison(left, right);

 

 		// ** DIFF CHECKING **

-		Predicate<Diff> substitutions = and(instanceOf(SubstitutionChange.class), ofKind(DifferenceKind.ADD));

-		Predicate<Diff> interfaceRealizations = and(instanceOf(InterfaceRealizationChange.class), ofKind(DifferenceKind.ADD));

+		Predicate<Diff> substitutions = and(instanceOf(DirectedRelationshipChange.class), discriminantInstanceOf(UMLPackage.Literals.SUBSTITUTION), ofKind(DifferenceKind.ADD));

+		Predicate<Diff> interfaceRealizations = and(instanceOf(DirectedRelationshipChange.class), discriminantInstanceOf(UMLPackage.Literals.INTERFACE_REALIZATION), ofKind(DifferenceKind.ADD));

 		Predicate<Diff> associations = and(instanceOf(AssociationChange.class), ofKind(DifferenceKind.ADD));

-		Predicate<Diff> dependencies = and(instanceOf(DependencyChange.class), ofKind(DifferenceKind.ADD));

+		Predicate<Diff> dependencies = and(instanceOf(DirectedRelationshipChange.class), discriminantInstanceOf(UMLPackage.Literals.DEPENDENCY), ofKind(DifferenceKind.ADD));

 		Predicate<Diff> nodes = and(instanceOf(NodeChange.class), ofKind(DifferenceKind.ADD));

 		Predicate<Diff> edges = and(instanceOf(EdgeChange.class), ofKind(DifferenceKind.ADD));

 		Predicate<Diff> edgeAbstraction = and(instanceOf(EdgeChange.class), ofKind(DifferenceKind.ADD), elementClassIs(UMLPackage.Literals.ABSTRACTION));

@@ -1369,7 +1362,7 @@ public class EdgeMergeTest extends AbstractTest {
 				new ExpectedStat(substitutions, 2), 

 				new ExpectedStat(interfaceRealizations, 1), 

 				new ExpectedStat(associations, 2), 

-				new ExpectedStat(dependencies, 8), // 2 abstractions + 2 dependencies + 2 realizations + 2 usages.

+				new ExpectedStat(and(dependencies, not(substitutions), not(interfaceRealizations)), 8), // 2 abstractions + 2 dependencies + 2 realizations + 2 usages.

 				new ExpectedStat(nodes, 2),

 				new ExpectedStat(edges, 19), // 13 + 2 imports + 2 generalizations + 2 information flows (no UMLDiff for them). Details below:

 				new ExpectedStat(edgeAbstraction, 2),

@@ -1393,7 +1386,7 @@ public class EdgeMergeTest extends AbstractTest {
 				new ExpectedStat(substitutions, 2), 

 				new ExpectedStat(interfaceRealizations, 0), // ** -1

 				new ExpectedStat(associations, 2), 

-				new ExpectedStat(dependencies, 8),

+				new ExpectedStat(and(dependencies, not(substitutions), not(interfaceRealizations)), 8),

 				new ExpectedStat(nodes, 1), // ** -1

 				new ExpectedStat(edgeAbstraction, 2), 

 				new ExpectedStat(edgeAssociation, 2), 

@@ -1416,10 +1409,10 @@ public class EdgeMergeTest extends AbstractTest {
 		Comparison comparison = buildComparison(left, right);

 

 		// ** DIFF CHECKING **

-		Predicate<Diff> substitutions = and(instanceOf(SubstitutionChange.class), ofKind(DifferenceKind.ADD));

-		Predicate<Diff> interfaceRealizations = and(instanceOf(InterfaceRealizationChange.class), ofKind(DifferenceKind.ADD));

+		Predicate<Diff> substitutions = and(instanceOf(DirectedRelationshipChange.class), discriminantInstanceOf(UMLPackage.Literals.SUBSTITUTION), ofKind(DifferenceKind.ADD));

+		Predicate<Diff> interfaceRealizations = and(instanceOf(DirectedRelationshipChange.class), discriminantInstanceOf(UMLPackage.Literals.INTERFACE_REALIZATION), ofKind(DifferenceKind.ADD));

 		Predicate<Diff> associations = and(instanceOf(AssociationChange.class), ofKind(DifferenceKind.ADD));

-		Predicate<Diff> dependencies = and(instanceOf(DependencyChange.class), ofKind(DifferenceKind.ADD));

+		Predicate<Diff> dependencies = and(instanceOf(DirectedRelationshipChange.class), discriminantInstanceOf(UMLPackage.Literals.DEPENDENCY), ofKind(DifferenceKind.ADD));

 		Predicate<Diff> nodes = and(instanceOf(NodeChange.class), ofKind(DifferenceKind.ADD));

 		Predicate<Diff> edges = and(instanceOf(EdgeChange.class), ofKind(DifferenceKind.ADD));

 		Predicate<Diff> edgeAbstraction = and(instanceOf(EdgeChange.class), ofKind(DifferenceKind.ADD), elementClassIs(UMLPackage.Literals.ABSTRACTION));

@@ -1437,7 +1430,7 @@ public class EdgeMergeTest extends AbstractTest {
 				new ExpectedStat(substitutions, 2), 

 				new ExpectedStat(interfaceRealizations, 1), 

 				new ExpectedStat(associations, 2), 

-				new ExpectedStat(dependencies, 8), // 2 abstractions + 2 dependencies + 2 realizations + 2 usages.

+				new ExpectedStat(and(dependencies, not(substitutions), not(interfaceRealizations)), 8), // 2 abstractions + 2 dependencies + 2 realizations + 2 usages.

 				new ExpectedStat(nodes, 2),

 				new ExpectedStat(edges, 19), // 13 + 2 imports + 2 generalizations + 2 information flows (no UMLDiff for them). Details below:

 				new ExpectedStat(edgeAbstraction, 2),

@@ -1461,7 +1454,7 @@ public class EdgeMergeTest extends AbstractTest {
 				new ExpectedStat(substitutions, 2), 

 				new ExpectedStat(interfaceRealizations, 1),

 				new ExpectedStat(associations, 2), 

-				new ExpectedStat(dependencies, 7), // ** -1

+				new ExpectedStat(and(dependencies, not(substitutions), not(interfaceRealizations)), 7), // ** -1

 				new ExpectedStat(nodes, 1), // ** -1

 				new ExpectedStat(edgeAbstraction, 2), 

 				new ExpectedStat(edgeAssociation, 2), 

@@ -1484,10 +1477,10 @@ public class EdgeMergeTest extends AbstractTest {
 		Comparison comparison = buildComparison(left, right);

 

 		// ** DIFF CHECKING **

-		Predicate<Diff> substitutions = and(instanceOf(SubstitutionChange.class), ofKind(DifferenceKind.ADD));

-		Predicate<Diff> interfaceRealizations = and(instanceOf(InterfaceRealizationChange.class), ofKind(DifferenceKind.ADD));

+		Predicate<Diff> substitutions = and(instanceOf(DirectedRelationshipChange.class), discriminantInstanceOf(UMLPackage.Literals.SUBSTITUTION), ofKind(DifferenceKind.ADD));

+		Predicate<Diff> interfaceRealizations = and(instanceOf(DirectedRelationshipChange.class), discriminantInstanceOf(UMLPackage.Literals.INTERFACE_REALIZATION), ofKind(DifferenceKind.ADD));

 		Predicate<Diff> associations = and(instanceOf(AssociationChange.class), ofKind(DifferenceKind.ADD));

-		Predicate<Diff> dependencies = and(instanceOf(DependencyChange.class), ofKind(DifferenceKind.ADD));

+		Predicate<Diff> dependencies = and(instanceOf(DirectedRelationshipChange.class), discriminantInstanceOf(UMLPackage.Literals.DEPENDENCY), ofKind(DifferenceKind.ADD));

 		Predicate<Diff> nodes = and(instanceOf(NodeChange.class), ofKind(DifferenceKind.ADD));

 		Predicate<Diff> edges = and(instanceOf(EdgeChange.class), ofKind(DifferenceKind.ADD));

 		Predicate<Diff> edgeAbstraction = and(instanceOf(EdgeChange.class), ofKind(DifferenceKind.ADD), elementClassIs(UMLPackage.Literals.ABSTRACTION));

@@ -1505,7 +1498,7 @@ public class EdgeMergeTest extends AbstractTest {
 				new ExpectedStat(substitutions, 2), 

 				new ExpectedStat(interfaceRealizations, 1), 

 				new ExpectedStat(associations, 2), 

-				new ExpectedStat(dependencies, 8), // 2 abstractions + 2 dependencies + 2 realizations + 2 usages.

+				new ExpectedStat(and(dependencies, not(substitutions), not(interfaceRealizations)), 8), // 2 abstractions + 2 dependencies + 2 realizations + 2 usages.

 				new ExpectedStat(nodes, 2),

 				new ExpectedStat(edges, 19), // 13 + 2 imports + 2 generalizations + 2 information flows (no UMLDiff for them). Details below:

 				new ExpectedStat(edgeAbstraction, 2),

@@ -1529,7 +1522,7 @@ public class EdgeMergeTest extends AbstractTest {
 				new ExpectedStat(substitutions, 1), // ** -1

 				new ExpectedStat(interfaceRealizations, 1),

 				new ExpectedStat(associations, 2), 

-				new ExpectedStat(dependencies, 8), 

+				new ExpectedStat(and(dependencies, not(substitutions), not(interfaceRealizations)), 8), 

 				new ExpectedStat(nodes, 1), // ** -1

 				new ExpectedStat(edgeAbstraction, 2), 

 				new ExpectedStat(edgeAssociation, 2), 

@@ -1552,10 +1545,10 @@ public class EdgeMergeTest extends AbstractTest {
 		Comparison comparison = buildComparison(left, right);

 

 		// ** DIFF CHECKING **

-		Predicate<Diff> substitutions = and(instanceOf(SubstitutionChange.class), ofKind(DifferenceKind.ADD));

-		Predicate<Diff> interfaceRealizations = and(instanceOf(InterfaceRealizationChange.class), ofKind(DifferenceKind.ADD));

+		Predicate<Diff> substitutions = and(instanceOf(DirectedRelationshipChange.class), discriminantInstanceOf(UMLPackage.Literals.SUBSTITUTION), ofKind(DifferenceKind.ADD));

+		Predicate<Diff> interfaceRealizations = and(instanceOf(DirectedRelationshipChange.class), discriminantInstanceOf(UMLPackage.Literals.INTERFACE_REALIZATION), ofKind(DifferenceKind.ADD));

 		Predicate<Diff> associations = and(instanceOf(AssociationChange.class), ofKind(DifferenceKind.ADD));

-		Predicate<Diff> dependencies = and(instanceOf(DependencyChange.class), ofKind(DifferenceKind.ADD));

+		Predicate<Diff> dependencies = and(instanceOf(DirectedRelationshipChange.class), discriminantInstanceOf(UMLPackage.Literals.DEPENDENCY), ofKind(DifferenceKind.ADD));

 		Predicate<Diff> nodes = and(instanceOf(NodeChange.class), ofKind(DifferenceKind.ADD));

 		Predicate<Diff> edges = and(instanceOf(EdgeChange.class), ofKind(DifferenceKind.ADD));

 		Predicate<Diff> edgeAbstraction = and(instanceOf(EdgeChange.class), ofKind(DifferenceKind.ADD), elementClassIs(UMLPackage.Literals.ABSTRACTION));

@@ -1573,7 +1566,7 @@ public class EdgeMergeTest extends AbstractTest {
 				new ExpectedStat(substitutions, 2), 

 				new ExpectedStat(interfaceRealizations, 1), 

 				new ExpectedStat(associations, 2), 

-				new ExpectedStat(dependencies, 8), // 2 abstractions + 2 dependencies + 2 realizations + 2 usages.

+				new ExpectedStat(and(dependencies, not(substitutions), not(interfaceRealizations)), 8), // 2 abstractions + 2 dependencies + 2 realizations + 2 usages.

 				new ExpectedStat(nodes, 2),

 				new ExpectedStat(edges, 19), // 13 + 2 imports + 2 generalizations + 2 information flows (no UMLDiff for them). Details below:

 				new ExpectedStat(edgeAbstraction, 2),

@@ -1597,7 +1590,7 @@ public class EdgeMergeTest extends AbstractTest {
 				new ExpectedStat(substitutions, 2),

 				new ExpectedStat(interfaceRealizations, 1),

 				new ExpectedStat(associations, 2), 

-				new ExpectedStat(dependencies, 7), // ** -1

+				new ExpectedStat(and(dependencies, not(substitutions), not(interfaceRealizations)), 7), // ** -1

 				new ExpectedStat(nodes, 1), // ** -1

 				new ExpectedStat(edgeAbstraction, 2), 

 				new ExpectedStat(edgeAssociation, 2), 

diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/icons/full/obj16/DirectedRelationshipChange.gif b/plugins/org.eclipse.emf.compare.uml2.edit/icons/full/obj16/DirectedRelationshipChange.gif
new file mode 100644
index 000000000..134551bff
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.uml2.edit/icons/full/obj16/DirectedRelationshipChange.gif
diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/plugin.properties b/plugins/org.eclipse.emf.compare.uml2.edit/plugin.properties
index 9bf4daea9..4855cd48e 100644
--- a/plugins/org.eclipse.emf.compare.uml2.edit/plugin.properties
+++ b/plugins/org.eclipse.emf.compare.uml2.edit/plugin.properties
@@ -160,3 +160,4 @@ _UI_ProfileApplicationChange_profile_feature = Profile
 _UI_UMLDiff_discriminant_feature = Discriminant
 _UI_IncludeChange_type = Include Change
 _UI_UMLDiff_eReference_feature = EReference
+_UI_DirectedRelationshipChange_type = Directed Relationship Change
diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/DependencyChangeItemProvider.java b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/DependencyChangeItemProvider.java
deleted file mode 100644
index b7eab38d4..000000000
--- a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/DependencyChangeItemProvider.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/**

- * Copyright (c) 2012 Obeo.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *     Obeo - initial API and implementation

- */

-package org.eclipse.emf.compare.uml2.internal.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-

-import org.eclipse.emf.compare.DifferenceKind;

-

-import org.eclipse.emf.compare.uml2.internal.DependencyChange;

-

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemColorProvider;

-import org.eclipse.emf.edit.provider.IItemFontProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.emf.compare.uml2.internal.DependencyChange} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class DependencyChangeItemProvider

-	extends UMLDiffItemProvider

-	implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource,

-		IItemColorProvider,

-		IItemFontProvider {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public DependencyChangeItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This returns DependencyChange.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/DependencyChange")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		DifferenceKind labelValue = ((DependencyChange)object).getKind();

-		String label = labelValue == null ? null : labelValue.toString();

-		return label == null || label.length() == 0 ?

-			getString("_UI_DependencyChange_type") : //$NON-NLS-1$

-			getString("_UI_DependencyChange_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-}

diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/InterfaceRealizationChangeItemProvider.java b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/DirectedRelationshipChangeItemProvider.java
index 47e04b636..11cb736db 100644
--- a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/InterfaceRealizationChangeItemProvider.java
+++ b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/DirectedRelationshipChangeItemProvider.java
@@ -1,5 +1,5 @@
 /**

- * Copyright (c) 2012 Obeo.

+ * Copyright (c) 2012, 2013 Obeo.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -10,17 +10,13 @@
  */

 package org.eclipse.emf.compare.uml2.internal.provider;

 

-

 import java.util.Collection;

 import java.util.List;

 

 import org.eclipse.emf.common.notify.AdapterFactory;

 import org.eclipse.emf.common.notify.Notification;

-

 import org.eclipse.emf.compare.DifferenceKind;

-

-import org.eclipse.emf.compare.uml2.internal.InterfaceRealizationChange;

-

+import org.eclipse.emf.compare.uml2.internal.DirectedRelationshipChange;

 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

 import org.eclipse.emf.edit.provider.IItemColorProvider;

 import org.eclipse.emf.edit.provider.IItemFontProvider;

@@ -31,35 +27,27 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

 

 /**

- * This is the item provider adapter for a {@link org.eclipse.emf.compare.uml2.internal.InterfaceRealizationChange} object.

- * <!-- begin-user-doc -->

+ * This is the item provider adapter for a

+ * {@link org.eclipse.emf.compare.uml2.internal.DirectedRelationshipChange} object. <!-- begin-user-doc -->

  * <!-- end-user-doc -->

+ * 

  * @generated

  */

-public class InterfaceRealizationChangeItemProvider

-	extends UMLDiffItemProvider

-	implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource,

-		IItemColorProvider,

-		IItemFontProvider {

+public class DirectedRelationshipChangeItemProvider extends UMLDiffItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {

 	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc

+	 * -->

+	 * 

 	 * @generated

 	 */

-	public InterfaceRealizationChangeItemProvider(AdapterFactory adapterFactory) {

+	public DirectedRelationshipChangeItemProvider(AdapterFactory adapterFactory) {

 		super(adapterFactory);

 	}

 

 	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc

+	 * -->

+	 * 

 	 * @generated

 	 */

 	@Override

@@ -72,36 +60,33 @@ public class InterfaceRealizationChangeItemProvider
 	}

 

 	/**

-	 * This returns InterfaceRealizationChange.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * This returns DirectedRelationshipChange.gif. <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/InterfaceRealizationChange")); //$NON-NLS-1$

+		return overlayImage(object, getResourceLocator().getImage("full/obj16/DirectedRelationshipChange")); //$NON-NLS-1$

 	}

 

 	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public String getText(Object object) {

-		DifferenceKind labelValue = ((InterfaceRealizationChange)object).getKind();

+		DifferenceKind labelValue = ((DirectedRelationshipChange)object).getKind();

 		String label = labelValue == null ? null : labelValue.toString();

-		return label == null || label.length() == 0 ?

-			getString("_UI_InterfaceRealizationChange_type") : //$NON-NLS-1$

-			getString("_UI_InterfaceRealizationChange_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

+		return label == null || label.length() == 0 ? getString("_UI_DirectedRelationshipChange_type") : //$NON-NLS-1$

+				getString("_UI_DirectedRelationshipChange_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

 	}

 

 	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and

+	 * by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc

+	 * --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

@@ -111,10 +96,9 @@ public class InterfaceRealizationChangeItemProvider
 	}

 

 	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be

+	 * created under this object. <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/IncludeChangeItemProvider.java b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/IncludeChangeItemProvider.java
deleted file mode 100644
index 863c62280..000000000
--- a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/IncludeChangeItemProvider.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/**

- * Copyright (c) 2012 Obeo.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *     Obeo - initial API and implementation

- */

-package org.eclipse.emf.compare.uml2.internal.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-

-import org.eclipse.emf.compare.DifferenceKind;

-

-import org.eclipse.emf.compare.uml2.internal.IncludeChange;

-

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemColorProvider;

-import org.eclipse.emf.edit.provider.IItemFontProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.emf.compare.uml2.internal.IncludeChange} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class IncludeChangeItemProvider

-	extends UMLDiffItemProvider

-	implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource,

-		IItemColorProvider,

-		IItemFontProvider {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IncludeChangeItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This returns IncludeChange.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/IncludeChange")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		DifferenceKind labelValue = ((IncludeChange)object).getKind();

-		String label = labelValue == null ? null : labelValue.toString();

-		return label == null || label.length() == 0 ?

-			getString("_UI_IncludeChange_type") : //$NON-NLS-1$

-			getString("_UI_IncludeChange_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-}

diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/SubstitutionChangeItemProvider.java b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/SubstitutionChangeItemProvider.java
deleted file mode 100644
index 9c93d150b..000000000
--- a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/SubstitutionChangeItemProvider.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/**

- * Copyright (c) 2012 Obeo.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *     Obeo - initial API and implementation

- */

-package org.eclipse.emf.compare.uml2.internal.provider;

-

-

-import java.util.Collection;

-import java.util.List;

-

-import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.common.notify.Notification;

-

-import org.eclipse.emf.compare.DifferenceKind;

-

-import org.eclipse.emf.compare.uml2.internal.SubstitutionChange;

-

-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

-import org.eclipse.emf.edit.provider.IItemColorProvider;

-import org.eclipse.emf.edit.provider.IItemFontProvider;

-import org.eclipse.emf.edit.provider.IItemLabelProvider;

-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

-import org.eclipse.emf.edit.provider.IItemPropertySource;

-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

-

-/**

- * This is the item provider adapter for a {@link org.eclipse.emf.compare.uml2.internal.SubstitutionChange} object.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

- * @generated

- */

-public class SubstitutionChangeItemProvider

-	extends UMLDiffItemProvider

-	implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource,

-		IItemColorProvider,

-		IItemFontProvider {

-	/**

-	 * This constructs an instance from a factory and a notifier.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public SubstitutionChangeItemProvider(AdapterFactory adapterFactory) {

-		super(adapterFactory);

-	}

-

-	/**

-	 * This returns the property descriptors for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

-		if (itemPropertyDescriptors == null) {

-			super.getPropertyDescriptors(object);

-

-		}

-		return itemPropertyDescriptors;

-	}

-

-	/**

-	 * This returns SubstitutionChange.gif.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Object getImage(Object object) {

-		return overlayImage(object, getResourceLocator().getImage("full/obj16/SubstitutionChange")); //$NON-NLS-1$

-	}

-

-	/**

-	 * This returns the label text for the adapted class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public String getText(Object object) {

-		DifferenceKind labelValue = ((SubstitutionChange)object).getKind();

-		String label = labelValue == null ? null : labelValue.toString();

-		return label == null || label.length() == 0 ?

-			getString("_UI_SubstitutionChange_type") : //$NON-NLS-1$

-			getString("_UI_SubstitutionChange_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$

-	}

-

-	/**

-	 * This handles model notifications by calling {@link #updateChildren} to update any cached

-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public void notifyChanged(Notification notification) {

-		updateChildren(notification);

-		super.notifyChanged(notification);

-	}

-

-	/**

-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children

-	 * that can be created under this object.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

-		super.collectNewChildDescriptors(newChildDescriptors, object);

-	}

-

-}

diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/UMLCompareItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/UMLCompareItemProviderAdapterFactory.java
index ef26ed8c4..7a99d5450 100644
--- a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/UMLCompareItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/internal/provider/UMLCompareItemProviderAdapterFactory.java
@@ -1,5 +1,5 @@
 /**

- * Copyright (c) 2012 Obeo.

+ * Copyright (c) 2012, 2013 Obeo.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -16,9 +16,7 @@ import java.util.Collection;
 import org.eclipse.emf.common.notify.Adapter;

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.common.notify.Notifier;

-

 import org.eclipse.emf.compare.uml2.internal.util.UMLCompareAdapterFactory;

-

 import org.eclipse.emf.edit.provider.ChangeNotifier;

 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

 import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

@@ -34,43 +32,41 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

 

 /**

- * This is the factory that is used to provide the interfaces needed to support Viewers.

- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.

- * The adapters also support Eclipse property sheets.

- * Note that most of the adapters are shared among multiple instances.

- * <!-- begin-user-doc -->

- * <!-- end-user-doc -->

+ * This is the factory that is used to provide the interfaces needed to support Viewers. The adapters

+ * generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged

+ * fireNotifyChanged}. The adapters also support Eclipse property sheets. Note that most of the adapters are

+ * shared among multiple instances. <!-- begin-user-doc --> <!-- end-user-doc -->

+ * 

  * @generated

  */

 public class UMLCompareItemProviderAdapterFactory extends UMLCompareAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {

 	/**

-	 * This keeps track of the root adapter factory that delegates to this adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * This keeps track of the root adapter factory that delegates to this adapter factory. <!--

+	 * begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected ComposedAdapterFactory parentAdapterFactory;

 

 	/**

-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!-- begin-user-doc

+	 * --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected IChangeNotifier changeNotifier = new ChangeNotifier();

 

 	/**

-	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}. <!--

+	 * begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected Collection<Object> supportedTypes = new ArrayList<Object>();

 

 	/**

-	 * This constructs an instance.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * This constructs an instance. <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public UMLCompareItemProviderAdapterFactory() {

@@ -84,17 +80,18 @@ public class UMLCompareItemProviderAdapterFactory extends UMLCompareAdapterFacto
 	}

 

 	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.emf.compare.uml2.internal.AssociationChange} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * This keeps track of the one adapter used for all

+	 * {@link org.eclipse.emf.compare.uml2.internal.AssociationChange} instances. <!-- begin-user-doc --> <!--

+	 * end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected AssociationChangeItemProvider associationChangeItemProvider;

 

 	/**

-	 * This creates an adapter for a {@link org.eclipse.emf.compare.uml2.internal.AssociationChange}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * This creates an adapter for a {@link org.eclipse.emf.compare.uml2.internal.AssociationChange}. <!--

+	 * begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

@@ -107,86 +104,18 @@ public class UMLCompareItemProviderAdapterFactory extends UMLCompareAdapterFacto
 	}

 

 	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.emf.compare.uml2.internal.DependencyChange} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected DependencyChangeItemProvider dependencyChangeItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.emf.compare.uml2.internal.DependencyChange}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createDependencyChangeAdapter() {

-		if (dependencyChangeItemProvider == null) {

-			dependencyChangeItemProvider = new DependencyChangeItemProvider(this);

-		}

-

-		return dependencyChangeItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.emf.compare.uml2.internal.InterfaceRealizationChange} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected InterfaceRealizationChangeItemProvider interfaceRealizationChangeItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.emf.compare.uml2.internal.InterfaceRealizationChange}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createInterfaceRealizationChangeAdapter() {

-		if (interfaceRealizationChangeItemProvider == null) {

-			interfaceRealizationChangeItemProvider = new InterfaceRealizationChangeItemProvider(this);

-		}

-

-		return interfaceRealizationChangeItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.emf.compare.uml2.internal.SubstitutionChange} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected SubstitutionChangeItemProvider substitutionChangeItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.emf.compare.uml2.internal.SubstitutionChange}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createSubstitutionChangeAdapter() {

-		if (substitutionChangeItemProvider == null) {

-			substitutionChangeItemProvider = new SubstitutionChangeItemProvider(this);

-		}

-

-		return substitutionChangeItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.emf.compare.uml2.internal.ExtendChange} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * This keeps track of the one adapter used for all

+	 * {@link org.eclipse.emf.compare.uml2.internal.ExtendChange} instances. <!-- begin-user-doc --> <!--

+	 * end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected ExtendChangeItemProvider extendChangeItemProvider;

 

 	/**

-	 * This creates an adapter for a {@link org.eclipse.emf.compare.uml2.internal.ExtendChange}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * This creates an adapter for a {@link org.eclipse.emf.compare.uml2.internal.ExtendChange}. <!--

+	 * begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

@@ -199,40 +128,18 @@ public class UMLCompareItemProviderAdapterFactory extends UMLCompareAdapterFacto
 	}

 

 	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.emf.compare.uml2.internal.IncludeChange} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IncludeChangeItemProvider includeChangeItemProvider;

-

-	/**

-	 * This creates an adapter for a {@link org.eclipse.emf.compare.uml2.internal.IncludeChange}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	public Adapter createIncludeChangeAdapter() {

-		if (includeChangeItemProvider == null) {

-			includeChangeItemProvider = new IncludeChangeItemProvider(this);

-		}

-

-		return includeChangeItemProvider;

-	}

-

-	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.emf.compare.uml2.internal.GeneralizationSetChange} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * This keeps track of the one adapter used for all

+	 * {@link org.eclipse.emf.compare.uml2.internal.GeneralizationSetChange} instances. <!-- begin-user-doc

+	 * --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected GeneralizationSetChangeItemProvider generalizationSetChangeItemProvider;

 

 	/**

 	 * This creates an adapter for a {@link org.eclipse.emf.compare.uml2.internal.GeneralizationSetChange}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

@@ -245,17 +152,19 @@ public class UMLCompareItemProviderAdapterFactory extends UMLCompareAdapterFacto
 	}

 

 	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.emf.compare.uml2.internal.ExecutionSpecificationChange} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * This keeps track of the one adapter used for all

+	 * {@link org.eclipse.emf.compare.uml2.internal.ExecutionSpecificationChange} instances. <!--

+	 * begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected ExecutionSpecificationChangeItemProvider executionSpecificationChangeItemProvider;

 

 	/**

-	 * This creates an adapter for a {@link org.eclipse.emf.compare.uml2.internal.ExecutionSpecificationChange}.

-	 * <!-- begin-user-doc -->

+	 * This creates an adapter for a

+	 * {@link org.eclipse.emf.compare.uml2.internal.ExecutionSpecificationChange}. <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

@@ -268,17 +177,18 @@ public class UMLCompareItemProviderAdapterFactory extends UMLCompareAdapterFacto
 	}

 

 	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.emf.compare.uml2.internal.IntervalConstraintChange} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * This keeps track of the one adapter used for all

+	 * {@link org.eclipse.emf.compare.uml2.internal.IntervalConstraintChange} instances. <!-- begin-user-doc

+	 * --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected IntervalConstraintChangeItemProvider intervalConstraintChangeItemProvider;

 

 	/**

 	 * This creates an adapter for a {@link org.eclipse.emf.compare.uml2.internal.IntervalConstraintChange}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

@@ -291,17 +201,18 @@ public class UMLCompareItemProviderAdapterFactory extends UMLCompareAdapterFacto
 	}

 

 	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.emf.compare.uml2.internal.MessageChange} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * This keeps track of the one adapter used for all

+	 * {@link org.eclipse.emf.compare.uml2.internal.MessageChange} instances. <!-- begin-user-doc --> <!--

+	 * end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected MessageChangeItemProvider messageChangeItemProvider;

 

 	/**

-	 * This creates an adapter for a {@link org.eclipse.emf.compare.uml2.internal.MessageChange}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * This creates an adapter for a {@link org.eclipse.emf.compare.uml2.internal.MessageChange}. <!--

+	 * begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

@@ -314,17 +225,18 @@ public class UMLCompareItemProviderAdapterFactory extends UMLCompareAdapterFacto
 	}

 

 	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.emf.compare.uml2.internal.StereotypePropertyChange} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * This keeps track of the one adapter used for all

+	 * {@link org.eclipse.emf.compare.uml2.internal.StereotypePropertyChange} instances. <!-- begin-user-doc

+	 * --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected StereotypePropertyChangeItemProvider stereotypePropertyChangeItemProvider;

 

 	/**

 	 * This creates an adapter for a {@link org.eclipse.emf.compare.uml2.internal.StereotypePropertyChange}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

@@ -337,17 +249,18 @@ public class UMLCompareItemProviderAdapterFactory extends UMLCompareAdapterFacto
 	}

 

 	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.emf.compare.uml2.internal.StereotypeApplicationChange} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * This keeps track of the one adapter used for all

+	 * {@link org.eclipse.emf.compare.uml2.internal.StereotypeApplicationChange} instances. <!--

+	 * begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected StereotypeApplicationChangeItemProvider stereotypeApplicationChangeItemProvider;

 

 	/**

-	 * This creates an adapter for a {@link org.eclipse.emf.compare.uml2.internal.StereotypeApplicationChange}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * This creates an adapter for a {@link org.eclipse.emf.compare.uml2.internal.StereotypeApplicationChange}

+	 * . <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

@@ -360,17 +273,18 @@ public class UMLCompareItemProviderAdapterFactory extends UMLCompareAdapterFacto
 	}

 

 	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.emf.compare.uml2.internal.StereotypeReferenceChange} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * This keeps track of the one adapter used for all

+	 * {@link org.eclipse.emf.compare.uml2.internal.StereotypeReferenceChange} instances. <!-- begin-user-doc

+	 * --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected StereotypeReferenceChangeItemProvider stereotypeReferenceChangeItemProvider;

 

 	/**

 	 * This creates an adapter for a {@link org.eclipse.emf.compare.uml2.internal.StereotypeReferenceChange}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

@@ -383,17 +297,18 @@ public class UMLCompareItemProviderAdapterFactory extends UMLCompareAdapterFacto
 	}

 

 	/**

-	 * This keeps track of the one adapter used for all {@link org.eclipse.emf.compare.uml2.internal.ProfileApplicationChange} instances.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * This keeps track of the one adapter used for all

+	 * {@link org.eclipse.emf.compare.uml2.internal.ProfileApplicationChange} instances. <!-- begin-user-doc

+	 * --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected ProfileApplicationChangeItemProvider profileApplicationChangeItemProvider;

 

 	/**

 	 * This creates an adapter for a {@link org.eclipse.emf.compare.uml2.internal.ProfileApplicationChange}.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

@@ -406,9 +321,33 @@ public class UMLCompareItemProviderAdapterFactory extends UMLCompareAdapterFacto
 	}

 

 	/**

-	 * This returns the root adapter factory that contains this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * This keeps track of the one adapter used for all

+	 * {@link org.eclipse.emf.compare.uml2.internal.DirectedRelationshipChange} instances. <!-- begin-user-doc

+	 * --> <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	protected DirectedRelationshipChangeItemProvider directedRelationshipChangeItemProvider;

+

+	/**

+	 * This creates an adapter for a {@link org.eclipse.emf.compare.uml2.internal.DirectedRelationshipChange}.

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public Adapter createDirectedRelationshipChangeAdapter() {

+		if (directedRelationshipChangeItemProvider == null) {

+			directedRelationshipChangeItemProvider = new DirectedRelationshipChangeItemProvider(this);

+		}

+

+		return directedRelationshipChangeItemProvider;

+	}

+

+	/**

+	 * This returns the root adapter factory that contains this factory. <!-- begin-user-doc --> <!--

+	 * end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public ComposeableAdapterFactory getRootAdapterFactory() {

@@ -416,9 +355,9 @@ public class UMLCompareItemProviderAdapterFactory extends UMLCompareAdapterFacto
 	}

 

 	/**

-	 * This sets the composed adapter factory that contains this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * This sets the composed adapter factory that contains this factory. <!-- begin-user-doc --> <!--

+	 * end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {

@@ -426,8 +365,8 @@ public class UMLCompareItemProviderAdapterFactory extends UMLCompareAdapterFacto
 	}

 

 	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

@@ -436,9 +375,9 @@ public class UMLCompareItemProviderAdapterFactory extends UMLCompareAdapterFacto
 	}

 

 	/**

-	 * This implementation substitutes the factory itself as the key for the adapter.

-	 * <!-- begin-user-doc -->

+	 * This implementation substitutes the factory itself as the key for the adapter. <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

@@ -447,8 +386,8 @@ public class UMLCompareItemProviderAdapterFactory extends UMLCompareAdapterFacto
 	}

 

 	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

@@ -464,9 +403,8 @@ public class UMLCompareItemProviderAdapterFactory extends UMLCompareAdapterFacto
 	}

 

 	/**

-	 * This adds a listener.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * This adds a listener. <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void addListener(INotifyChangedListener notifyChangedListener) {

@@ -474,9 +412,8 @@ public class UMLCompareItemProviderAdapterFactory extends UMLCompareAdapterFacto
 	}

 

 	/**

-	 * This removes a listener.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * This removes a listener. <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void removeListener(INotifyChangedListener notifyChangedListener) {

@@ -484,9 +421,9 @@ public class UMLCompareItemProviderAdapterFactory extends UMLCompareAdapterFacto
 	}

 

 	/**

-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.

-	 * <!-- begin-user-doc -->

+	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}. <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void fireNotifyChanged(Notification notification) {

@@ -498,26 +435,45 @@ public class UMLCompareItemProviderAdapterFactory extends UMLCompareAdapterFacto
 	}

 

 	/**

-	 * This disposes all of the item providers created by this factory. 

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * This disposes all of the item providers created by this factory. <!-- begin-user-doc --> <!--

+	 * end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void dispose() {

-		if (associationChangeItemProvider != null) associationChangeItemProvider.dispose();

-		if (dependencyChangeItemProvider != null) dependencyChangeItemProvider.dispose();

-		if (interfaceRealizationChangeItemProvider != null) interfaceRealizationChangeItemProvider.dispose();

-		if (substitutionChangeItemProvider != null) substitutionChangeItemProvider.dispose();

-		if (extendChangeItemProvider != null) extendChangeItemProvider.dispose();

-		if (includeChangeItemProvider != null) includeChangeItemProvider.dispose();

-		if (generalizationSetChangeItemProvider != null) generalizationSetChangeItemProvider.dispose();

-		if (executionSpecificationChangeItemProvider != null) executionSpecificationChangeItemProvider.dispose();

-		if (intervalConstraintChangeItemProvider != null) intervalConstraintChangeItemProvider.dispose();

-		if (messageChangeItemProvider != null) messageChangeItemProvider.dispose();

-		if (stereotypePropertyChangeItemProvider != null) stereotypePropertyChangeItemProvider.dispose();

-		if (stereotypeApplicationChangeItemProvider != null) stereotypeApplicationChangeItemProvider.dispose();

-		if (stereotypeReferenceChangeItemProvider != null) stereotypeReferenceChangeItemProvider.dispose();

-		if (profileApplicationChangeItemProvider != null) profileApplicationChangeItemProvider.dispose();

+		if (associationChangeItemProvider != null) {

+			associationChangeItemProvider.dispose();

+		}

+		if (extendChangeItemProvider != null) {

+			extendChangeItemProvider.dispose();

+		}

+		if (generalizationSetChangeItemProvider != null) {

+			generalizationSetChangeItemProvider.dispose();

+		}

+		if (executionSpecificationChangeItemProvider != null) {

+			executionSpecificationChangeItemProvider.dispose();

+		}

+		if (intervalConstraintChangeItemProvider != null) {

+			intervalConstraintChangeItemProvider.dispose();

+		}

+		if (messageChangeItemProvider != null) {

+			messageChangeItemProvider.dispose();

+		}

+		if (stereotypePropertyChangeItemProvider != null) {

+			stereotypePropertyChangeItemProvider.dispose();

+		}

+		if (stereotypeApplicationChangeItemProvider != null) {

+			stereotypeApplicationChangeItemProvider.dispose();

+		}

+		if (stereotypeReferenceChangeItemProvider != null) {

+			stereotypeReferenceChangeItemProvider.dispose();

+		}

+		if (profileApplicationChangeItemProvider != null) {

+			profileApplicationChangeItemProvider.dispose();

+		}

+		if (directedRelationshipChangeItemProvider != null) {

+			directedRelationshipChangeItemProvider.dispose();

+		}

 	}

 

 }

diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src/org/eclipse/emf/compare/uml2/internal/provider/spec/UMLCompareAdapterFactorySpec.java b/plugins/org.eclipse.emf.compare.uml2.edit/src/org/eclipse/emf/compare/uml2/internal/provider/spec/UMLCompareAdapterFactorySpec.java
index 307df48ea..8190983dd 100644
--- a/plugins/org.eclipse.emf.compare.uml2.edit/src/org/eclipse/emf/compare/uml2/internal/provider/spec/UMLCompareAdapterFactorySpec.java
+++ b/plugins/org.eclipse.emf.compare.uml2.edit/src/org/eclipse/emf/compare/uml2/internal/provider/spec/UMLCompareAdapterFactorySpec.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2012 Obeo.

+ * Copyright (c) 2012, 2013 Obeo.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -23,18 +23,12 @@ public class UMLCompareAdapterFactorySpec extends UMLCompareItemProviderAdapterF
 

 	ForwardingUMLDiffItemProvider fAssociationChangeItemProvider;

 

-	ForwardingUMLDiffItemProvider fDependencyChangeItemProvider;

-

 	ForwardingUMLDiffItemProvider fExecutionSpecificationChangeItemProvider;

 

 	ForwardingUMLDiffItemProvider fExtendChangeItemProvider;

 

 	ForwardingUMLDiffItemProvider fGeneralizationSetChangeItemProvider;

 

-	ForwardingUMLDiffItemProvider fIncludeChangeItemProvider;

-

-	ForwardingUMLDiffItemProvider fInterfaceRealizationChangeItemProvider;

-

 	ForwardingUMLDiffItemProvider fIntervalConstraintChangeItemProvider;

 

 	ForwardingUMLDiffItemProvider fMessageChangeItemProvider;

@@ -47,7 +41,7 @@ public class UMLCompareAdapterFactorySpec extends UMLCompareItemProviderAdapterF
 

 	ForwardingUMLDiffItemProvider fStereotypeReferenceChangeItemProvider;

 

-	ForwardingUMLDiffItemProvider fSubstitutionChangeItemProvider;

+	ForwardingUMLDiffItemProvider fDirectedRelationshipChangeItemProvider;

 

 	public UMLCompareAdapterFactorySpec() {

 		super();

@@ -71,48 +65,6 @@ public class UMLCompareAdapterFactorySpec extends UMLCompareItemProviderAdapterF
 	/**

 	 * {@inheritDoc}

 	 * 

-	 * @see org.eclipse.emf.compare.uml2.provider.UMLCompareItemProviderAdapterFactory#createDependencyChangeAdapter()

-	 */

-	@Override

-	public Adapter createDependencyChangeAdapter() {

-		if (fDependencyChangeItemProvider == null) {

-			fDependencyChangeItemProvider = new ForwardingUMLDiffItemProvider((ItemProviderAdapter)super

-					.createDependencyChangeAdapter());

-		}

-		return fDependencyChangeItemProvider;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.emf.compare.uml2.provider.UMLCompareItemProviderAdapterFactory#createInterfaceRealizationChangeAdapter()

-	 */

-	@Override

-	public Adapter createInterfaceRealizationChangeAdapter() {

-		if (fInterfaceRealizationChangeItemProvider == null) {

-			fInterfaceRealizationChangeItemProvider = new ForwardingUMLDiffItemProvider(

-					(ItemProviderAdapter)super.createInterfaceRealizationChangeAdapter());

-		}

-		return fInterfaceRealizationChangeItemProvider;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.emf.compare.uml2.provider.UMLCompareItemProviderAdapterFactory#createSubstitutionChangeAdapter()

-	 */

-	@Override

-	public Adapter createSubstitutionChangeAdapter() {

-		if (fSubstitutionChangeItemProvider == null) {

-			fSubstitutionChangeItemProvider = new ForwardingUMLDiffItemProvider((ItemProviderAdapter)super

-					.createSubstitutionChangeAdapter());

-		}

-		return fSubstitutionChangeItemProvider;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

 	 * @see org.eclipse.emf.compare.uml2.provider.UMLCompareItemProviderAdapterFactory#createExtendChangeAdapter()

 	 */

 	@Override

@@ -238,15 +190,15 @@ public class UMLCompareAdapterFactorySpec extends UMLCompareItemProviderAdapterF
 	/**

 	 * {@inheritDoc}

 	 * 

-	 * @see org.eclipse.emf.compare.uml2.provider.UMLCompareItemProviderAdapterFactory#createIncludeChangeAdapter()

+	 * @see org.eclipse.emf.compare.uml2.internal.provider.UMLCompareItemProviderAdapterFactory#createDirectedRelationshipChangeAdapter()

 	 */

 	@Override

-	public Adapter createIncludeChangeAdapter() {

-		if (fIncludeChangeItemProvider == null) {

-			fIncludeChangeItemProvider = new ForwardingUMLDiffItemProvider((ItemProviderAdapter)super

-					.createIncludeChangeAdapter());

+	public Adapter createDirectedRelationshipChangeAdapter() {

+		if (fDirectedRelationshipChangeItemProvider == null) {

+			fDirectedRelationshipChangeItemProvider = new ForwardingUMLDiffItemProvider(

+					(ItemProviderAdapter)super.createDirectedRelationshipChangeAdapter());

 		}

-		return fIncludeChangeItemProvider;

+		return fDirectedRelationshipChangeItemProvider;

 	}

 

 }

diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/AbstractTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/AbstractTest.java
index 514d085b7..69d25997f 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/AbstractTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/AbstractTest.java
@@ -39,9 +39,11 @@ import org.eclipse.emf.compare.scope.DefaultComparisonScope;
 import org.eclipse.emf.compare.scope.IComparisonScope;
 import org.eclipse.emf.compare.tests.framework.AbstractInputData;
 import org.eclipse.emf.compare.tests.postprocess.data.TestPostProcessor;
+import org.eclipse.emf.compare.uml2.internal.UMLDiff;
 import org.eclipse.emf.compare.uml2.internal.merge.UMLMerger;
 import org.eclipse.emf.compare.uml2.internal.postprocessor.UMLPostProcessor;
 import org.eclipse.emf.compare.utils.ReferenceUtil;
+import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.resource.Resource;
@@ -144,6 +146,15 @@ public abstract class AbstractTest {
 		};
 	}
 
+	protected static Predicate<Diff> discriminantInstanceOf(final EClass clazz) {
+		return new Predicate<Diff>() {
+			public boolean apply(Diff input) {
+				return input instanceof UMLDiff && clazz.isInstance(((UMLDiff)input).getDiscriminant());
+			}
+
+		};
+	}
+
 	protected abstract AbstractInputData getInput();
 
 	protected void testMergeLeftToRight(Notifier left, Notifier right, Notifier origin) {
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddAbstractionTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddAbstractionTest.java
index b5f4c9771..d0eebaa76 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddAbstractionTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddAbstractionTest.java
@@ -21,7 +21,7 @@ import org.eclipse.emf.compare.Comparison;
 import org.eclipse.emf.compare.Diff;

 import org.eclipse.emf.compare.DifferenceKind;

 import org.eclipse.emf.compare.tests.framework.AbstractInputData;

-import org.eclipse.emf.compare.uml2.internal.DependencyChange;

+import org.eclipse.emf.compare.uml2.internal.DirectedRelationshipChange;

 import org.eclipse.emf.compare.uml2.tests.AbstractTest;

 import org.eclipse.emf.compare.uml2.tests.dependency.data.DependencyInputData;

 import org.eclipse.emf.ecore.resource.Resource;

@@ -124,14 +124,14 @@ public class AddAbstractionTest extends AbstractTest {
 		assertNotNull(addRefClass0InAbstraction);

 

 		// CHECK EXTENSION

-		assertSame(Integer.valueOf(1), count(differences, instanceOf(DependencyChange.class)));

+		assertSame(Integer.valueOf(1), count(differences, instanceOf(DirectedRelationshipChange.class)));

 		Diff addUMLDependency = null;

 		if (kind.equals(TestKind.ADD)) {

-			addUMLDependency = Iterators.find(differences.iterator(), and(instanceOf(DependencyChange.class),

-					ofKind(DifferenceKind.ADD)));

+			addUMLDependency = Iterators.find(differences.iterator(), and(

+					instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.ADD)));

 		} else {

-			addUMLDependency = Iterators.find(differences.iterator(), and(instanceOf(DependencyChange.class),

-					ofKind(DifferenceKind.DELETE)));

+			addUMLDependency = Iterators.find(differences.iterator(), and(

+					instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.DELETE)));

 		}

 		assertNotNull(addUMLDependency);

 		assertSame(Integer.valueOf(4), Integer.valueOf(addUMLDependency.getRefinedBy().size()));

diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddDependencyTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddDependencyTest.java
index b9580fe91..56ba3948e 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddDependencyTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddDependencyTest.java
@@ -21,7 +21,7 @@ import org.eclipse.emf.compare.Comparison;
 import org.eclipse.emf.compare.Diff;

 import org.eclipse.emf.compare.DifferenceKind;

 import org.eclipse.emf.compare.tests.framework.AbstractInputData;

-import org.eclipse.emf.compare.uml2.internal.DependencyChange;

+import org.eclipse.emf.compare.uml2.internal.DirectedRelationshipChange;

 import org.eclipse.emf.compare.uml2.tests.AbstractTest;

 import org.eclipse.emf.compare.uml2.tests.dependency.data.DependencyInputData;

 import org.eclipse.emf.ecore.resource.Resource;

@@ -123,14 +123,14 @@ public class AddDependencyTest extends AbstractTest {
 		assertNotNull(addRefClass1InDependency);

 

 		// CHECK EXTENSION

-		assertSame(Integer.valueOf(1), count(differences, instanceOf(DependencyChange.class)));

+		assertSame(Integer.valueOf(1), count(differences, instanceOf(DirectedRelationshipChange.class)));

 		Diff addUMLDependency = null;

 		if (kind.equals(TestKind.ADD)) {

-			addUMLDependency = Iterators.find(differences.iterator(), and(instanceOf(DependencyChange.class),

-					ofKind(DifferenceKind.ADD)));

+			addUMLDependency = Iterators.find(differences.iterator(), and(

+					instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.ADD)));

 		} else {

-			addUMLDependency = Iterators.find(differences.iterator(), and(instanceOf(DependencyChange.class),

-					ofKind(DifferenceKind.DELETE)));

+			addUMLDependency = Iterators.find(differences.iterator(), and(

+					instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.DELETE)));

 		}

 		assertNotNull(addUMLDependency);

 		assertSame(Integer.valueOf(4), Integer.valueOf(addUMLDependency.getRefinedBy().size()));

diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddInterfaceRealizationTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddInterfaceRealizationTest.java
index c00f08ce4..f5125f0d4 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddInterfaceRealizationTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddInterfaceRealizationTest.java
@@ -20,7 +20,7 @@ import org.eclipse.emf.compare.Comparison;
 import org.eclipse.emf.compare.Diff;

 import org.eclipse.emf.compare.DifferenceKind;

 import org.eclipse.emf.compare.tests.framework.AbstractInputData;

-import org.eclipse.emf.compare.uml2.internal.InterfaceRealizationChange;

+import org.eclipse.emf.compare.uml2.internal.DirectedRelationshipChange;

 import org.eclipse.emf.compare.uml2.tests.AbstractTest;

 import org.eclipse.emf.compare.uml2.tests.dependency.data.DependencyInputData;

 import org.eclipse.emf.ecore.resource.Resource;

@@ -135,14 +135,14 @@ public class AddInterfaceRealizationTest extends AbstractTest {
 		assertNotNull(addClientDependencyInClass0);

 

 		// CHECK EXTENSION

-		assertSame(Integer.valueOf(1), count(differences, instanceOf(InterfaceRealizationChange.class)));

+		assertSame(Integer.valueOf(1), count(differences, instanceOf(DirectedRelationshipChange.class)));

 		Diff addUMLDependency = null;

 		if (kind.equals(TestKind.ADD)) {

 			addUMLDependency = Iterators.find(differences.iterator(), and(

-					instanceOf(InterfaceRealizationChange.class), ofKind(DifferenceKind.ADD)));

+					instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.ADD)));

 		} else {

 			addUMLDependency = Iterators.find(differences.iterator(), and(

-					instanceOf(InterfaceRealizationChange.class), ofKind(DifferenceKind.DELETE)));

+					instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.DELETE)));

 		}

 		assertNotNull(addUMLDependency);

 		assertSame(Integer.valueOf(5), Integer.valueOf(addUMLDependency.getRefinedBy().size()));

diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddRealizationTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddRealizationTest.java
index 02cae718e..924b2b4ca 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddRealizationTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddRealizationTest.java
@@ -21,7 +21,7 @@ import org.eclipse.emf.compare.Comparison;
 import org.eclipse.emf.compare.Diff;

 import org.eclipse.emf.compare.DifferenceKind;

 import org.eclipse.emf.compare.tests.framework.AbstractInputData;

-import org.eclipse.emf.compare.uml2.internal.DependencyChange;

+import org.eclipse.emf.compare.uml2.internal.DirectedRelationshipChange;

 import org.eclipse.emf.compare.uml2.tests.AbstractTest;

 import org.eclipse.emf.compare.uml2.tests.dependency.data.DependencyInputData;

 import org.eclipse.emf.ecore.resource.Resource;

@@ -124,14 +124,14 @@ public class AddRealizationTest extends AbstractTest {
 		assertNotNull(addRefClass1InDependency);

 

 		// CHECK EXTENSION

-		assertSame(Integer.valueOf(1), count(differences, instanceOf(DependencyChange.class)));

+		assertSame(Integer.valueOf(1), count(differences, instanceOf(DirectedRelationshipChange.class)));

 		Diff addUMLDependency = null;

 		if (kind.equals(TestKind.ADD)) {

-			addUMLDependency = Iterators.find(differences.iterator(), and(instanceOf(DependencyChange.class),

-					ofKind(DifferenceKind.ADD)));

+			addUMLDependency = Iterators.find(differences.iterator(), and(

+					instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.ADD)));

 		} else {

-			addUMLDependency = Iterators.find(differences.iterator(), and(instanceOf(DependencyChange.class),

-					ofKind(DifferenceKind.DELETE)));

+			addUMLDependency = Iterators.find(differences.iterator(), and(

+					instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.DELETE)));

 		}

 		assertNotNull(addUMLDependency);

 		assertSame(Integer.valueOf(4), Integer.valueOf(addUMLDependency.getRefinedBy().size()));

diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddSubstitutionTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddSubstitutionTest.java
index ef78100d5..d4e6fa8ee 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddSubstitutionTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddSubstitutionTest.java
@@ -20,7 +20,7 @@ import org.eclipse.emf.compare.Comparison;
 import org.eclipse.emf.compare.Diff;

 import org.eclipse.emf.compare.DifferenceKind;

 import org.eclipse.emf.compare.tests.framework.AbstractInputData;

-import org.eclipse.emf.compare.uml2.internal.SubstitutionChange;

+import org.eclipse.emf.compare.uml2.internal.DirectedRelationshipChange;

 import org.eclipse.emf.compare.uml2.tests.AbstractTest;

 import org.eclipse.emf.compare.uml2.tests.dependency.data.DependencyInputData;

 import org.eclipse.emf.ecore.resource.Resource;

@@ -135,14 +135,14 @@ public class AddSubstitutionTest extends AbstractTest {
 		assertNotNull(addClientDependencyInClass0);

 

 		// CHECK EXTENSION

-		assertSame(Integer.valueOf(1), count(differences, instanceOf(SubstitutionChange.class)));

+		assertSame(Integer.valueOf(1), count(differences, instanceOf(DirectedRelationshipChange.class)));

 		Diff addUMLDependency = null;

 		if (kind.equals(TestKind.ADD)) {

 			addUMLDependency = Iterators.find(differences.iterator(), and(

-					instanceOf(SubstitutionChange.class), ofKind(DifferenceKind.ADD)));

+					instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.ADD)));

 		} else {

 			addUMLDependency = Iterators.find(differences.iterator(), and(

-					instanceOf(SubstitutionChange.class), ofKind(DifferenceKind.DELETE)));

+					instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.DELETE)));

 		}

 		assertNotNull(addUMLDependency);

 		assertSame(Integer.valueOf(5), Integer.valueOf(addUMLDependency.getRefinedBy().size()));

diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddUsageTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddUsageTest.java
index 09126bb13..f130220fe 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddUsageTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/AddUsageTest.java
@@ -21,7 +21,7 @@ import org.eclipse.emf.compare.Comparison;
 import org.eclipse.emf.compare.Diff;

 import org.eclipse.emf.compare.DifferenceKind;

 import org.eclipse.emf.compare.tests.framework.AbstractInputData;

-import org.eclipse.emf.compare.uml2.internal.DependencyChange;

+import org.eclipse.emf.compare.uml2.internal.DirectedRelationshipChange;

 import org.eclipse.emf.compare.uml2.tests.AbstractTest;

 import org.eclipse.emf.compare.uml2.tests.dependency.data.DependencyInputData;

 import org.eclipse.emf.ecore.resource.Resource;

@@ -122,14 +122,14 @@ public class AddUsageTest extends AbstractTest {
 		assertNotNull(addRefClass1InDependency);

 

 		// CHECK EXTENSION

-		assertSame(Integer.valueOf(1), count(differences, instanceOf(DependencyChange.class)));

+		assertSame(Integer.valueOf(1), count(differences, instanceOf(DirectedRelationshipChange.class)));

 		Diff addUMLDependency = null;

 		if (kind.equals(TestKind.ADD)) {

-			addUMLDependency = Iterators.find(differences.iterator(), and(instanceOf(DependencyChange.class),

-					ofKind(DifferenceKind.ADD)));

+			addUMLDependency = Iterators.find(differences.iterator(), and(

+					instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.ADD)));

 		} else {

-			addUMLDependency = Iterators.find(differences.iterator(), and(instanceOf(DependencyChange.class),

-					ofKind(DifferenceKind.DELETE)));

+			addUMLDependency = Iterators.find(differences.iterator(), and(

+					instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.DELETE)));

 		}

 		assertNotNull(addUMLDependency);

 		assertSame(Integer.valueOf(4), Integer.valueOf(addUMLDependency.getRefinedBy().size()));

diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/ChangeDependencyTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/ChangeDependencyTest.java
index a4d6b4917..39e58aba4 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/ChangeDependencyTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/ChangeDependencyTest.java
@@ -19,7 +19,7 @@ import org.eclipse.emf.compare.Comparison;
 import org.eclipse.emf.compare.Diff;

 import org.eclipse.emf.compare.DifferenceKind;

 import org.eclipse.emf.compare.tests.framework.AbstractInputData;

-import org.eclipse.emf.compare.uml2.internal.DependencyChange;

+import org.eclipse.emf.compare.uml2.internal.DirectedRelationshipChange;

 import org.eclipse.emf.compare.uml2.tests.AbstractTest;

 import org.eclipse.emf.compare.uml2.tests.dependency.data.DependencyInputData;

 import org.eclipse.emf.ecore.resource.Resource;

@@ -101,9 +101,9 @@ public class ChangeDependencyTest extends AbstractTest {
 

 		// CHECK EXTENSION

 		// No extension anymore

-		assertSame(Integer.valueOf(0), count(differences, instanceOf(DependencyChange.class)));

+		assertSame(Integer.valueOf(0), count(differences, instanceOf(DirectedRelationshipChange.class)));

 		Diff changeUMLDependency = Iterators.find(differences.iterator(), and(

-				instanceOf(DependencyChange.class), ofKind(DifferenceKind.CHANGE)), null);

+				instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.CHANGE)), null);

 		assertNull(changeUMLDependency);

 		// assertNotNull(changeUMLDependency);

 		// assertSame(Integer.valueOf(1), Integer.valueOf(changeUMLDependency.getRefinedBy().size()));

diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/ChangeUsageTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/ChangeUsageTest.java
index d77acb79a..875910398 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/ChangeUsageTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/dependency/ChangeUsageTest.java
@@ -19,7 +19,7 @@ import org.eclipse.emf.compare.Comparison;
 import org.eclipse.emf.compare.Diff;

 import org.eclipse.emf.compare.DifferenceKind;

 import org.eclipse.emf.compare.tests.framework.AbstractInputData;

-import org.eclipse.emf.compare.uml2.internal.DependencyChange;

+import org.eclipse.emf.compare.uml2.internal.DirectedRelationshipChange;

 import org.eclipse.emf.compare.uml2.tests.AbstractTest;

 import org.eclipse.emf.compare.uml2.tests.dependency.data.DependencyInputData;

 import org.eclipse.emf.ecore.resource.Resource;

@@ -101,9 +101,9 @@ public class ChangeUsageTest extends AbstractTest {
 

 		// CHECK EXTENSION

 		// no extension any more

-		assertSame(Integer.valueOf(0), count(differences, instanceOf(DependencyChange.class)));

+		assertSame(Integer.valueOf(0), count(differences, instanceOf(DirectedRelationshipChange.class)));

 		Diff changeUMLDependency = Iterators.find(differences.iterator(), and(

-				instanceOf(DependencyChange.class), ofKind(DifferenceKind.CHANGE)), null);

+				instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.CHANGE)), null);

 		assertNull(changeUMLDependency);

 		// assertNotNull(changeUMLDependency);

 		// assertSame(Integer.valueOf(1), Integer.valueOf(changeUMLDependency.getRefinedBy().size()));

diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/implications/ImplicationsInterfaceRealizationTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/implications/ImplicationsInterfaceRealizationTest.java
index ae93da81f..6a5e87128 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/implications/ImplicationsInterfaceRealizationTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/implications/ImplicationsInterfaceRealizationTest.java
@@ -1,5 +1,6 @@
 package org.eclipse.emf.compare.uml2.tests.implications;

 

+import static com.google.common.base.Predicates.and;

 import static com.google.common.base.Predicates.instanceOf;

 import static junit.framework.Assert.assertEquals;

 import static junit.framework.Assert.assertNull;

@@ -19,11 +20,11 @@ import org.eclipse.emf.common.util.BasicMonitor;
 import org.eclipse.emf.compare.Comparison;

 import org.eclipse.emf.compare.Diff;

 import org.eclipse.emf.compare.tests.framework.AbstractInputData;

-import org.eclipse.emf.compare.uml2.internal.InterfaceRealizationChange;

-import org.eclipse.emf.compare.uml2.internal.SubstitutionChange;

+import org.eclipse.emf.compare.uml2.internal.DirectedRelationshipChange;

 import org.eclipse.emf.compare.uml2.tests.AbstractTest;

 import org.eclipse.emf.compare.uml2.tests.implications.data.ImplicationsInputData;

 import org.eclipse.emf.ecore.resource.Resource;

+import org.eclipse.uml2.uml.UMLPackage;

 import org.junit.Test;

 

 @SuppressWarnings("nls")

@@ -106,10 +107,12 @@ public class ImplicationsInterfaceRealizationTest extends AbstractTest {
 				addSupplierInSubstitutionDescription, null);

 		diffs.addClientDependencyInClass02 = Iterators.find(differences.iterator(),

 				addClientDependencyInClass0Description2, null);

-		diffs.addUMLInterfaceRealization = Iterators.find(differences.iterator(),

-				instanceOf(InterfaceRealizationChange.class), null);

-		diffs.addUMLSubstitution = Iterators.find(differences.iterator(),

-				instanceOf(SubstitutionChange.class), null);

+		diffs.addUMLInterfaceRealization = Iterators.find(differences.iterator(), and(

+				instanceOf(DirectedRelationshipChange.class),

+				discriminantInstanceOf(UMLPackage.Literals.INTERFACE_REALIZATION)), null);

+		diffs.addUMLSubstitution = Iterators.find(differences.iterator(), and(

+				instanceOf(DirectedRelationshipChange.class),

+				discriminantInstanceOf(UMLPackage.Literals.SUBSTITUTION)), null);

 		return diffs;

 	}

 

@@ -162,10 +165,11 @@ public class ImplicationsInterfaceRealizationTest extends AbstractTest {
 	}

 

 	private void checkMergeAddClientInInterfaceRealization(Comparison comparison, DiffsOfInterest diffs) {

-		assertEquals(NB_DIFFS - 3, comparison.getDifferences().size());

+		assertEquals(NB_DIFFS - 4, comparison.getDifferences().size());

 		assertNull(diffs.addClientInInterfaceRealization);

 		assertNull(diffs.addInterfaceRealization);

 		assertNull(diffs.addClientDependencyInClass0);

+		assertNull(diffs.addUMLInterfaceRealization);

 	}

 

 	@Test

@@ -236,10 +240,11 @@ public class ImplicationsInterfaceRealizationTest extends AbstractTest {
 	}

 

 	private void checkMergeAddClientDependencyInClass0(Comparison comparison, DiffsOfInterest diffs) {

-		assertEquals(NB_DIFFS - 3, comparison.getDifferences().size());

+		assertEquals(NB_DIFFS - 4, comparison.getDifferences().size());

 		assertNull(diffs.addClientDependencyInClass0);

 		assertNull(diffs.addClientInInterfaceRealization);

 		assertNull(diffs.addInterfaceRealization);

+		assertNull(diffs.addUMLInterfaceRealization);

 	}

 

 	@Test

@@ -310,10 +315,11 @@ public class ImplicationsInterfaceRealizationTest extends AbstractTest {
 	}

 

 	private void checkMergeAddInterfaceRealization(Comparison comparison, DiffsOfInterest diffs) {

-		assertEquals(NB_DIFFS - 3, comparison.getDifferences().size());

+		assertEquals(NB_DIFFS - 4, comparison.getDifferences().size());

 		assertNull(diffs.addInterfaceRealization);

 		assertNull(diffs.addClientDependencyInClass0);

 		assertNull(diffs.addClientInInterfaceRealization);

+		assertNull(diffs.addUMLInterfaceRealization);

 	}

 

 	@Test

diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/include/AddIncludeTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/include/AddIncludeTest.java
index b05ff71fb..479c8c0e9 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/include/AddIncludeTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/include/AddIncludeTest.java
@@ -20,7 +20,7 @@ import org.eclipse.emf.compare.Comparison;
 import org.eclipse.emf.compare.Diff;

 import org.eclipse.emf.compare.DifferenceKind;

 import org.eclipse.emf.compare.tests.framework.AbstractInputData;

-import org.eclipse.emf.compare.uml2.internal.IncludeChange;

+import org.eclipse.emf.compare.uml2.internal.DirectedRelationshipChange;

 import org.eclipse.emf.compare.uml2.tests.AbstractTest;

 import org.eclipse.emf.compare.uml2.tests.include.data.IncludeInputData;

 import org.eclipse.emf.ecore.resource.Resource;

@@ -106,14 +106,14 @@ public class AddIncludeTest extends AbstractTest {
 		assertNotNull(addRefExtendedCaseInExtend);

 

 		// CHECK EXTENSION

-		assertSame(Integer.valueOf(1), count(differences, instanceOf(IncludeChange.class)));

+		assertSame(Integer.valueOf(1), count(differences, instanceOf(DirectedRelationshipChange.class)));

 		Diff addUMLExtend = null;

 		if (kind.equals(TestKind.ADD)) {

-			addUMLExtend = Iterators.find(differences.iterator(), and(instanceOf(IncludeChange.class),

-					ofKind(DifferenceKind.ADD)));

+			addUMLExtend = Iterators.find(differences.iterator(), and(

+					instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.ADD)));

 		} else {

-			addUMLExtend = Iterators.find(differences.iterator(), and(instanceOf(IncludeChange.class),

-					ofKind(DifferenceKind.DELETE)));

+			addUMLExtend = Iterators.find(differences.iterator(), and(

+					instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.DELETE)));

 		}

 		assertNotNull(addUMLExtend);

 		assertSame(Integer.valueOf(2), Integer.valueOf(addUMLExtend.getRefinedBy().size()));

diff --git a/plugins/org.eclipse.emf.compare.uml2/model/uml2compare.ecore b/plugins/org.eclipse.emf.compare.uml2/model/uml2compare.ecore
index 078cfcad7..6634ae1eb 100644
--- a/plugins/org.eclipse.emf.compare.uml2/model/uml2compare.ecore
+++ b/plugins/org.eclipse.emf.compare.uml2/model/uml2compare.ecore
@@ -1,28 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="uml2" nsURI="http://www.eclipse.org/emf/compare/uml2/2.0" nsPrefix="umlcompare">
-  <eClassifiers xsi:type="ecore:EClass" name="AssociationChange" eSuperTypes="#//UMLDiff"/>
-  <eClassifiers xsi:type="ecore:EClass" name="DependencyChange" eSuperTypes="#//UMLDiff"/>
-  <eClassifiers xsi:type="ecore:EClass" name="InterfaceRealizationChange" eSuperTypes="#//UMLDiff"/>
-  <eClassifiers xsi:type="ecore:EClass" name="SubstitutionChange" eSuperTypes="#//UMLDiff"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ExtendChange" eSuperTypes="#//UMLDiff"/>
-  <eClassifiers xsi:type="ecore:EClass" name="IncludeChange" eSuperTypes="#//UMLDiff"/>
-  <eClassifiers xsi:type="ecore:EClass" name="GeneralizationSetChange" eSuperTypes="#//UMLDiff"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ExecutionSpecificationChange" eSuperTypes="#//UMLDiff"/>
-  <eClassifiers xsi:type="ecore:EClass" name="IntervalConstraintChange" eSuperTypes="#//UMLDiff"/>
-  <eClassifiers xsi:type="ecore:EClass" name="MessageChange" eSuperTypes="#//UMLDiff"/>
-  <eClassifiers xsi:type="ecore:EClass" name="StereotypePropertyChange" eSuperTypes="#//UMLDiff">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="stereotype" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Stereotype"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="StereotypeApplicationChange" eSuperTypes="#//UMLDiff">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="stereotype" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Stereotype"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="StereotypeReferenceChange" eSuperTypes="#//UMLDiff"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ProfileApplicationChange" eSuperTypes="#//UMLDiff">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="profile" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Profile"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="UMLDiff" abstract="true" eSuperTypes="platform:/plugin/org.eclipse.emf.compare/model/compare.ecore#//Diff">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="discriminant" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eReference" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EReference"/>
-  </eClassifiers>
-</ecore:EPackage>
+<?xml version="1.0" encoding="UTF-8"?>

+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="uml2" nsURI="http://www.eclipse.org/emf/compare/uml2/2.0" nsPrefix="umlcompare">

+  <eClassifiers xsi:type="ecore:EClass" name="AssociationChange" eSuperTypes="#//UMLDiff"/>

+  <eClassifiers xsi:type="ecore:EClass" name="ExtendChange" eSuperTypes="#//UMLDiff"/>

+  <eClassifiers xsi:type="ecore:EClass" name="GeneralizationSetChange" eSuperTypes="#//UMLDiff"/>

+  <eClassifiers xsi:type="ecore:EClass" name="ExecutionSpecificationChange" eSuperTypes="#//UMLDiff"/>

+  <eClassifiers xsi:type="ecore:EClass" name="IntervalConstraintChange" eSuperTypes="#//UMLDiff"/>

+  <eClassifiers xsi:type="ecore:EClass" name="MessageChange" eSuperTypes="#//UMLDiff"/>

+  <eClassifiers xsi:type="ecore:EClass" name="StereotypePropertyChange" eSuperTypes="#//UMLDiff">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="stereotype" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Stereotype"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="StereotypeApplicationChange" eSuperTypes="#//UMLDiff">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="stereotype" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Stereotype"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="StereotypeReferenceChange" eSuperTypes="#//UMLDiff"/>

+  <eClassifiers xsi:type="ecore:EClass" name="ProfileApplicationChange" eSuperTypes="#//UMLDiff">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="profile" eType="ecore:EClass platform:/plugin/org.eclipse.uml2.uml/model/UML.ecore#//Profile"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="DirectedRelationshipChange" eSuperTypes="#//UMLDiff"/>

+  <eClassifiers xsi:type="ecore:EClass" name="UMLDiff" abstract="true" eSuperTypes="platform:/plugin/org.eclipse.emf.compare/model/compare.ecore#//Diff">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="discriminant" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="eReference" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EReference"/>

+  </eClassifiers>

+</ecore:EPackage>

diff --git a/plugins/org.eclipse.emf.compare.uml2/model/uml2compare.genmodel b/plugins/org.eclipse.emf.compare.uml2/model/uml2compare.genmodel
index 24de0b4be..95f759512 100644
--- a/plugins/org.eclipse.emf.compare.uml2/model/uml2compare.genmodel
+++ b/plugins/org.eclipse.emf.compare.uml2/model/uml2compare.genmodel
@@ -1,46 +1,43 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/uml2/2.2.0/GenModel"
-    copyrightText="Copyright (c) 2012 Obeo.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;    Obeo - initial API and implementation"
-    modelDirectory="/org.eclipse.emf.compare.uml2/src-gen" editDirectory="/org.eclipse.emf.compare.uml2.edit/src-gen"
-    modelPluginID="org.eclipse.emf.compare.uml2" modelName="Uml2" editPluginClass="org.eclipse.emf.compare.uml2.internal.provider.UMLCompareEditPlugin"
-    nonNLSMarkers="true" testSuiteClass="org.eclipse.emf.compare.uml2diff.tests.UML2DiffAllTests"
-    importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
-    colorProviders="true" fontProviders="true" runtimeVersion="2.5" usedGenPackages="platform:/plugin/org.eclipse.emf.compare/model/compare.genmodel#//compare platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml platform:/plugin/org.eclipse.uml2.types/model/Types.genmodel#//types">
-  <foreignModel>uml2compare.ecore</foreignModel>
-  <genPackages xsi:type="genmodel:GenPackage" prefix="UMLCompare" basePackage="org.eclipse.emf.compare"
-      disposableProviderFactory="true" interfacePackageSuffix="internal" metaDataPackageSuffix="internal"
-      classPackageSuffix="internal.impl" utilityPackageSuffix="internal.util" providerPackageSuffix="internal.provider"
-      presentationPackageSuffix="internal.presentation" testsPackageSuffix="internal.tests"
-      ecorePackage="uml2compare.ecore#/">
-    <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2compare.ecore#//AssociationChange"/>
-    <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2compare.ecore#//DependencyChange"/>
-    <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2compare.ecore#//InterfaceRealizationChange"/>
-    <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2compare.ecore#//SubstitutionChange"/>
-    <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2compare.ecore#//ExtendChange"/>
-    <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2compare.ecore#//IncludeChange"/>
-    <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2compare.ecore#//GeneralizationSetChange"/>
-    <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2compare.ecore#//ExecutionSpecificationChange"/>
-    <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2compare.ecore#//IntervalConstraintChange"/>
-    <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2compare.ecore#//MessageChange"/>
-    <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2compare.ecore#//StereotypePropertyChange">
-      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          propertySortChoices="true" ecoreFeature="ecore:EReference uml2compare.ecore#//StereotypePropertyChange/stereotype"/>
-    </genClasses>
-    <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2compare.ecore#//StereotypeApplicationChange">
-      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          propertySortChoices="true" ecoreFeature="ecore:EReference uml2compare.ecore#//StereotypeApplicationChange/stereotype"/>
-    </genClasses>
-    <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2compare.ecore#//StereotypeReferenceChange"/>
-    <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2compare.ecore#//ProfileApplicationChange">
-      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          propertySortChoices="true" ecoreFeature="ecore:EReference uml2compare.ecore#//ProfileApplicationChange/profile"/>
-    </genClasses>
-    <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="uml2compare.ecore#//UMLDiff">
-      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          propertySortChoices="true" ecoreFeature="ecore:EReference uml2compare.ecore#//UMLDiff/discriminant"/>
-      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          propertySortChoices="true" ecoreFeature="ecore:EReference uml2compare.ecore#//UMLDiff/eReference"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
+<?xml version="1.0" encoding="UTF-8"?>

+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/uml2/2.2.0/GenModel"

+    copyrightText="Copyright (c) 2012 Obeo.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;    Obeo - initial API and implementation"

+    modelDirectory="/org.eclipse.emf.compare.uml2/src-gen" editDirectory="/org.eclipse.emf.compare.uml2.edit/src-gen"

+    modelPluginID="org.eclipse.emf.compare.uml2" modelName="Uml2" editPluginClass="org.eclipse.emf.compare.uml2.internal.provider.UMLCompareEditPlugin"

+    nonNLSMarkers="true" testSuiteClass="org.eclipse.emf.compare.uml2diff.tests.UML2DiffAllTests"

+    importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"

+    colorProviders="true" fontProviders="true" runtimeVersion="2.5" usedGenPackages="platform:/plugin/org.eclipse.emf.compare/model/compare.genmodel#//compare platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml platform:/plugin/org.eclipse.uml2.types/model/Types.genmodel#//types">

+  <foreignModel>uml2compare.ecore</foreignModel>

+  <genPackages xsi:type="genmodel:GenPackage" prefix="UMLCompare" basePackage="org.eclipse.emf.compare"

+      disposableProviderFactory="true" interfacePackageSuffix="internal" metaDataPackageSuffix="internal"

+      classPackageSuffix="internal.impl" utilityPackageSuffix="internal.util" providerPackageSuffix="internal.provider"

+      presentationPackageSuffix="internal.presentation" testsPackageSuffix="internal.tests"

+      ecorePackage="uml2compare.ecore#/">

+    <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2compare.ecore#//AssociationChange"/>

+    <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2compare.ecore#//ExtendChange"/>

+    <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2compare.ecore#//GeneralizationSetChange"/>

+    <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2compare.ecore#//ExecutionSpecificationChange"/>

+    <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2compare.ecore#//IntervalConstraintChange"/>

+    <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2compare.ecore#//MessageChange"/>

+    <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2compare.ecore#//StereotypePropertyChange">

+      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

+          propertySortChoices="true" ecoreFeature="ecore:EReference uml2compare.ecore#//StereotypePropertyChange/stereotype"/>

+    </genClasses>

+    <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2compare.ecore#//StereotypeApplicationChange">

+      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

+          propertySortChoices="true" ecoreFeature="ecore:EReference uml2compare.ecore#//StereotypeApplicationChange/stereotype"/>

+    </genClasses>

+    <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2compare.ecore#//StereotypeReferenceChange"/>

+    <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2compare.ecore#//ProfileApplicationChange">

+      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

+          propertySortChoices="true" ecoreFeature="ecore:EReference uml2compare.ecore#//ProfileApplicationChange/profile"/>

+    </genClasses>

+    <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2compare.ecore#//DirectedRelationshipChange"/>

+    <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="uml2compare.ecore#//UMLDiff">

+      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

+          propertySortChoices="true" ecoreFeature="ecore:EReference uml2compare.ecore#//UMLDiff/discriminant"/>

+      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"

+          propertySortChoices="true" ecoreFeature="ecore:EReference uml2compare.ecore#//UMLDiff/eReference"/>

+    </genClasses>

+  </genPackages>

+</genmodel:GenModel>

diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/DependencyChange.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/DirectedRelationshipChange.java
index 7711f2f08..5265dfdeb 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/DependencyChange.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/DirectedRelationshipChange.java
@@ -13,13 +13,13 @@ package org.eclipse.emf.compare.uml2.internal;
 

 /**

  * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Dependency Change</b></em>'.

+ * A representation of the model object '<em><b>Directed Relationship Change</b></em>'.

  * <!-- end-user-doc -->

  *

  *

- * @see org.eclipse.emf.compare.uml2.internal.UMLComparePackage#getDependencyChange()

+ * @see org.eclipse.emf.compare.uml2.internal.UMLComparePackage#getDirectedRelationshipChange()

  * @model

  * @generated

  */

-public interface DependencyChange extends UMLDiff {

-} // DependencyChange

+public interface DirectedRelationshipChange extends UMLDiff {

+} // DirectedRelationshipChange

diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/IncludeChange.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/IncludeChange.java
deleted file mode 100644
index 298751486..000000000
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/IncludeChange.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**

- * Copyright (c) 2012 Obeo.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *     Obeo - initial API and implementation

- */

-package org.eclipse.emf.compare.uml2.internal;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Include Change</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.emf.compare.uml2.internal.UMLComparePackage#getIncludeChange()

- * @model

- * @generated

- */

-public interface IncludeChange extends UMLDiff {

-} // IncludeChange

diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/InterfaceRealizationChange.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/InterfaceRealizationChange.java
deleted file mode 100644
index 6e5dd4996..000000000
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/InterfaceRealizationChange.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**

- * Copyright (c) 2012 Obeo.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *     Obeo - initial API and implementation

- */

-package org.eclipse.emf.compare.uml2.internal;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Interface Realization Change</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.emf.compare.uml2.internal.UMLComparePackage#getInterfaceRealizationChange()

- * @model

- * @generated

- */

-public interface InterfaceRealizationChange extends UMLDiff {

-} // InterfaceRealizationChange

diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/SubstitutionChange.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/SubstitutionChange.java
deleted file mode 100644
index f42f6a68c..000000000
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/SubstitutionChange.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**

- * Copyright (c) 2012 Obeo.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *     Obeo - initial API and implementation

- */

-package org.eclipse.emf.compare.uml2.internal;

-

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Substitution Change</b></em>'.

- * <!-- end-user-doc -->

- *

- *

- * @see org.eclipse.emf.compare.uml2.internal.UMLComparePackage#getSubstitutionChange()

- * @model

- * @generated

- */

-public interface SubstitutionChange extends UMLDiff {

-} // SubstitutionChange

diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/UMLCompareFactory.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/UMLCompareFactory.java
index 2863bbe4d..ca5ebe371 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/UMLCompareFactory.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/UMLCompareFactory.java
@@ -39,33 +39,6 @@ public interface UMLCompareFactory extends EFactory {
 	AssociationChange createAssociationChange();

 

 	/**

-	 * Returns a new object of class '<em>Dependency Change</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Dependency Change</em>'.

-	 * @generated

-	 */

-	DependencyChange createDependencyChange();

-

-	/**

-	 * Returns a new object of class '<em>Interface Realization Change</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Interface Realization Change</em>'.

-	 * @generated

-	 */

-	InterfaceRealizationChange createInterfaceRealizationChange();

-

-	/**

-	 * Returns a new object of class '<em>Substitution Change</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Substitution Change</em>'.

-	 * @generated

-	 */

-	SubstitutionChange createSubstitutionChange();

-

-	/**

 	 * Returns a new object of class '<em>Extend Change</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

@@ -75,15 +48,6 @@ public interface UMLCompareFactory extends EFactory {
 	ExtendChange createExtendChange();

 

 	/**

-	 * Returns a new object of class '<em>Include Change</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @return a new object of class '<em>Include Change</em>'.

-	 * @generated

-	 */

-	IncludeChange createIncludeChange();

-

-	/**

 	 * Returns a new object of class '<em>Generalization Set Change</em>'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

@@ -156,6 +120,15 @@ public interface UMLCompareFactory extends EFactory {
 	ProfileApplicationChange createProfileApplicationChange();

 

 	/**

+	 * Returns a new object of class '<em>Directed Relationship Change</em>'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return a new object of class '<em>Directed Relationship Change</em>'.

+	 * @generated

+	 */

+	DirectedRelationshipChange createDirectedRelationshipChange();

+

+	/**

 	 * Returns the package supported by this factory.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/UMLComparePackage.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/UMLComparePackage.java
index 00f981506..33717ab15 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/UMLComparePackage.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/UMLComparePackage.java
@@ -72,7 +72,7 @@ public interface UMLComparePackage extends EPackage {
 	 * @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getUMLDiff()

 	 * @generated

 	 */

-	int UML_DIFF = 14;

+	int UML_DIFF = 11;

 

 	/**

 	 * The feature id for the '<em><b>Match</b></em>' container reference.

@@ -319,387 +319,6 @@ public interface UMLComparePackage extends EPackage {
 	int ASSOCIATION_CHANGE_FEATURE_COUNT = UML_DIFF_FEATURE_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.emf.compare.uml2.internal.impl.DependencyChangeImpl <em>Dependency Change</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.emf.compare.uml2.internal.impl.DependencyChangeImpl

-	 * @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getDependencyChange()

-	 * @generated

-	 */

-	int DEPENDENCY_CHANGE = 1;

-

-	/**

-	 * The feature id for the '<em><b>Match</b></em>' container reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int DEPENDENCY_CHANGE__MATCH = UML_DIFF__MATCH;

-

-	/**

-	 * The feature id for the '<em><b>Requires</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int DEPENDENCY_CHANGE__REQUIRES = UML_DIFF__REQUIRES;

-

-	/**

-	 * The feature id for the '<em><b>Required By</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int DEPENDENCY_CHANGE__REQUIRED_BY = UML_DIFF__REQUIRED_BY;

-

-	/**

-	 * The feature id for the '<em><b>Refines</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int DEPENDENCY_CHANGE__REFINES = UML_DIFF__REFINES;

-

-	/**

-	 * The feature id for the '<em><b>Refined By</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int DEPENDENCY_CHANGE__REFINED_BY = UML_DIFF__REFINED_BY;

-

-	/**

-	 * The feature id for the '<em><b>Kind</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int DEPENDENCY_CHANGE__KIND = UML_DIFF__KIND;

-

-	/**

-	 * The feature id for the '<em><b>Source</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int DEPENDENCY_CHANGE__SOURCE = UML_DIFF__SOURCE;

-

-	/**

-	 * The feature id for the '<em><b>State</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int DEPENDENCY_CHANGE__STATE = UML_DIFF__STATE;

-

-	/**

-	 * The feature id for the '<em><b>Equivalence</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int DEPENDENCY_CHANGE__EQUIVALENCE = UML_DIFF__EQUIVALENCE;

-

-	/**

-	 * The feature id for the '<em><b>Conflict</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int DEPENDENCY_CHANGE__CONFLICT = UML_DIFF__CONFLICT;

-

-	/**

-	 * The feature id for the '<em><b>Discriminant</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int DEPENDENCY_CHANGE__DISCRIMINANT = UML_DIFF__DISCRIMINANT;

-

-	/**

-	 * The feature id for the '<em><b>EReference</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int DEPENDENCY_CHANGE__EREFERENCE = UML_DIFF__EREFERENCE;

-

-	/**

-	 * The number of structural features of the '<em>Dependency Change</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int DEPENDENCY_CHANGE_FEATURE_COUNT = UML_DIFF_FEATURE_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.emf.compare.uml2.internal.impl.InterfaceRealizationChangeImpl <em>Interface Realization Change</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.emf.compare.uml2.internal.impl.InterfaceRealizationChangeImpl

-	 * @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getInterfaceRealizationChange()

-	 * @generated

-	 */

-	int INTERFACE_REALIZATION_CHANGE = 2;

-

-	/**

-	 * The feature id for the '<em><b>Match</b></em>' container reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INTERFACE_REALIZATION_CHANGE__MATCH = UML_DIFF__MATCH;

-

-	/**

-	 * The feature id for the '<em><b>Requires</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INTERFACE_REALIZATION_CHANGE__REQUIRES = UML_DIFF__REQUIRES;

-

-	/**

-	 * The feature id for the '<em><b>Required By</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INTERFACE_REALIZATION_CHANGE__REQUIRED_BY = UML_DIFF__REQUIRED_BY;

-

-	/**

-	 * The feature id for the '<em><b>Refines</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INTERFACE_REALIZATION_CHANGE__REFINES = UML_DIFF__REFINES;

-

-	/**

-	 * The feature id for the '<em><b>Refined By</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INTERFACE_REALIZATION_CHANGE__REFINED_BY = UML_DIFF__REFINED_BY;

-

-	/**

-	 * The feature id for the '<em><b>Kind</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INTERFACE_REALIZATION_CHANGE__KIND = UML_DIFF__KIND;

-

-	/**

-	 * The feature id for the '<em><b>Source</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INTERFACE_REALIZATION_CHANGE__SOURCE = UML_DIFF__SOURCE;

-

-	/**

-	 * The feature id for the '<em><b>State</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INTERFACE_REALIZATION_CHANGE__STATE = UML_DIFF__STATE;

-

-	/**

-	 * The feature id for the '<em><b>Equivalence</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INTERFACE_REALIZATION_CHANGE__EQUIVALENCE = UML_DIFF__EQUIVALENCE;

-

-	/**

-	 * The feature id for the '<em><b>Conflict</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INTERFACE_REALIZATION_CHANGE__CONFLICT = UML_DIFF__CONFLICT;

-

-	/**

-	 * The feature id for the '<em><b>Discriminant</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INTERFACE_REALIZATION_CHANGE__DISCRIMINANT = UML_DIFF__DISCRIMINANT;

-

-	/**

-	 * The feature id for the '<em><b>EReference</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INTERFACE_REALIZATION_CHANGE__EREFERENCE = UML_DIFF__EREFERENCE;

-

-	/**

-	 * The number of structural features of the '<em>Interface Realization Change</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INTERFACE_REALIZATION_CHANGE_FEATURE_COUNT = UML_DIFF_FEATURE_COUNT + 0;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.emf.compare.uml2.internal.impl.SubstitutionChangeImpl <em>Substitution Change</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.emf.compare.uml2.internal.impl.SubstitutionChangeImpl

-	 * @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getSubstitutionChange()

-	 * @generated

-	 */

-	int SUBSTITUTION_CHANGE = 3;

-

-	/**

-	 * The feature id for the '<em><b>Match</b></em>' container reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int SUBSTITUTION_CHANGE__MATCH = UML_DIFF__MATCH;

-

-	/**

-	 * The feature id for the '<em><b>Requires</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int SUBSTITUTION_CHANGE__REQUIRES = UML_DIFF__REQUIRES;

-

-	/**

-	 * The feature id for the '<em><b>Required By</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int SUBSTITUTION_CHANGE__REQUIRED_BY = UML_DIFF__REQUIRED_BY;

-

-	/**

-	 * The feature id for the '<em><b>Refines</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int SUBSTITUTION_CHANGE__REFINES = UML_DIFF__REFINES;

-

-	/**

-	 * The feature id for the '<em><b>Refined By</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int SUBSTITUTION_CHANGE__REFINED_BY = UML_DIFF__REFINED_BY;

-

-	/**

-	 * The feature id for the '<em><b>Kind</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int SUBSTITUTION_CHANGE__KIND = UML_DIFF__KIND;

-

-	/**

-	 * The feature id for the '<em><b>Source</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int SUBSTITUTION_CHANGE__SOURCE = UML_DIFF__SOURCE;

-

-	/**

-	 * The feature id for the '<em><b>State</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int SUBSTITUTION_CHANGE__STATE = UML_DIFF__STATE;

-

-	/**

-	 * The feature id for the '<em><b>Equivalence</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int SUBSTITUTION_CHANGE__EQUIVALENCE = UML_DIFF__EQUIVALENCE;

-

-	/**

-	 * The feature id for the '<em><b>Conflict</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int SUBSTITUTION_CHANGE__CONFLICT = UML_DIFF__CONFLICT;

-

-	/**

-	 * The feature id for the '<em><b>Discriminant</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int SUBSTITUTION_CHANGE__DISCRIMINANT = UML_DIFF__DISCRIMINANT;

-

-	/**

-	 * The feature id for the '<em><b>EReference</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int SUBSTITUTION_CHANGE__EREFERENCE = UML_DIFF__EREFERENCE;

-

-	/**

-	 * The number of structural features of the '<em>Substitution Change</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int SUBSTITUTION_CHANGE_FEATURE_COUNT = UML_DIFF_FEATURE_COUNT + 0;

-

-	/**

 	 * The meta object id for the '{@link org.eclipse.emf.compare.uml2.internal.impl.ExtendChangeImpl <em>Extend Change</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

@@ -707,7 +326,7 @@ public interface UMLComparePackage extends EPackage {
 	 * @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getExtendChange()

 	 * @generated

 	 */

-	int EXTEND_CHANGE = 4;

+	int EXTEND_CHANGE = 1;

 

 	/**

 	 * The feature id for the '<em><b>Match</b></em>' container reference.

@@ -827,133 +446,6 @@ public interface UMLComparePackage extends EPackage {
 	int EXTEND_CHANGE_FEATURE_COUNT = UML_DIFF_FEATURE_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.emf.compare.uml2.internal.impl.IncludeChangeImpl <em>Include Change</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @see org.eclipse.emf.compare.uml2.internal.impl.IncludeChangeImpl

-	 * @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getIncludeChange()

-	 * @generated

-	 */

-	int INCLUDE_CHANGE = 5;

-

-	/**

-	 * The feature id for the '<em><b>Match</b></em>' container reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INCLUDE_CHANGE__MATCH = UML_DIFF__MATCH;

-

-	/**

-	 * The feature id for the '<em><b>Requires</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INCLUDE_CHANGE__REQUIRES = UML_DIFF__REQUIRES;

-

-	/**

-	 * The feature id for the '<em><b>Required By</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INCLUDE_CHANGE__REQUIRED_BY = UML_DIFF__REQUIRED_BY;

-

-	/**

-	 * The feature id for the '<em><b>Refines</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INCLUDE_CHANGE__REFINES = UML_DIFF__REFINES;

-

-	/**

-	 * The feature id for the '<em><b>Refined By</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INCLUDE_CHANGE__REFINED_BY = UML_DIFF__REFINED_BY;

-

-	/**

-	 * The feature id for the '<em><b>Kind</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INCLUDE_CHANGE__KIND = UML_DIFF__KIND;

-

-	/**

-	 * The feature id for the '<em><b>Source</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INCLUDE_CHANGE__SOURCE = UML_DIFF__SOURCE;

-

-	/**

-	 * The feature id for the '<em><b>State</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INCLUDE_CHANGE__STATE = UML_DIFF__STATE;

-

-	/**

-	 * The feature id for the '<em><b>Equivalence</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INCLUDE_CHANGE__EQUIVALENCE = UML_DIFF__EQUIVALENCE;

-

-	/**

-	 * The feature id for the '<em><b>Conflict</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INCLUDE_CHANGE__CONFLICT = UML_DIFF__CONFLICT;

-

-	/**

-	 * The feature id for the '<em><b>Discriminant</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INCLUDE_CHANGE__DISCRIMINANT = UML_DIFF__DISCRIMINANT;

-

-	/**

-	 * The feature id for the '<em><b>EReference</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INCLUDE_CHANGE__EREFERENCE = UML_DIFF__EREFERENCE;

-

-	/**

-	 * The number of structural features of the '<em>Include Change</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 * @ordered

-	 */

-	int INCLUDE_CHANGE_FEATURE_COUNT = UML_DIFF_FEATURE_COUNT + 0;

-

-	/**

 	 * The meta object id for the '{@link org.eclipse.emf.compare.uml2.internal.impl.GeneralizationSetChangeImpl <em>Generalization Set Change</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

@@ -961,7 +453,7 @@ public interface UMLComparePackage extends EPackage {
 	 * @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getGeneralizationSetChange()

 	 * @generated

 	 */

-	int GENERALIZATION_SET_CHANGE = 6;

+	int GENERALIZATION_SET_CHANGE = 2;

 

 	/**

 	 * The feature id for the '<em><b>Match</b></em>' container reference.

@@ -1088,7 +580,7 @@ public interface UMLComparePackage extends EPackage {
 	 * @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getExecutionSpecificationChange()

 	 * @generated

 	 */

-	int EXECUTION_SPECIFICATION_CHANGE = 7;

+	int EXECUTION_SPECIFICATION_CHANGE = 3;

 

 	/**

 	 * The feature id for the '<em><b>Match</b></em>' container reference.

@@ -1215,7 +707,7 @@ public interface UMLComparePackage extends EPackage {
 	 * @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getIntervalConstraintChange()

 	 * @generated

 	 */

-	int INTERVAL_CONSTRAINT_CHANGE = 8;

+	int INTERVAL_CONSTRAINT_CHANGE = 4;

 

 	/**

 	 * The feature id for the '<em><b>Match</b></em>' container reference.

@@ -1342,7 +834,7 @@ public interface UMLComparePackage extends EPackage {
 	 * @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getMessageChange()

 	 * @generated

 	 */

-	int MESSAGE_CHANGE = 9;

+	int MESSAGE_CHANGE = 5;

 

 	/**

 	 * The feature id for the '<em><b>Match</b></em>' container reference.

@@ -1469,7 +961,7 @@ public interface UMLComparePackage extends EPackage {
 	 * @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getStereotypePropertyChange()

 	 * @generated

 	 */

-	int STEREOTYPE_PROPERTY_CHANGE = 10;

+	int STEREOTYPE_PROPERTY_CHANGE = 6;

 

 	/**

 	 * The feature id for the '<em><b>Match</b></em>' container reference.

@@ -1605,7 +1097,7 @@ public interface UMLComparePackage extends EPackage {
 	 * @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getStereotypeApplicationChange()

 	 * @generated

 	 */

-	int STEREOTYPE_APPLICATION_CHANGE = 11;

+	int STEREOTYPE_APPLICATION_CHANGE = 7;

 

 	/**

 	 * The feature id for the '<em><b>Match</b></em>' container reference.

@@ -1741,7 +1233,7 @@ public interface UMLComparePackage extends EPackage {
 	 * @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getStereotypeReferenceChange()

 	 * @generated

 	 */

-	int STEREOTYPE_REFERENCE_CHANGE = 12;

+	int STEREOTYPE_REFERENCE_CHANGE = 8;

 

 	/**

 	 * The feature id for the '<em><b>Match</b></em>' container reference.

@@ -1868,7 +1360,7 @@ public interface UMLComparePackage extends EPackage {
 	 * @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getProfileApplicationChange()

 	 * @generated

 	 */

-	int PROFILE_APPLICATION_CHANGE = 13;

+	int PROFILE_APPLICATION_CHANGE = 9;

 

 	/**

 	 * The feature id for the '<em><b>Match</b></em>' container reference.

@@ -1998,64 +1490,152 @@ public interface UMLComparePackage extends EPackage {
 

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.internal.AssociationChange <em>Association Change</em>}'.

+	 * The meta object id for the '{@link org.eclipse.emf.compare.uml2.internal.impl.DirectedRelationshipChangeImpl <em>Directed Relationship Change</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Association Change</em>'.

-	 * @see org.eclipse.emf.compare.uml2.internal.AssociationChange

+	 * @see org.eclipse.emf.compare.uml2.internal.impl.DirectedRelationshipChangeImpl

+	 * @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getDirectedRelationshipChange()

 	 * @generated

 	 */

-	EClass getAssociationChange();

+	int DIRECTED_RELATIONSHIP_CHANGE = 10;

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.internal.DependencyChange <em>Dependency Change</em>}'.

+	 * The feature id for the '<em><b>Match</b></em>' container reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Dependency Change</em>'.

-	 * @see org.eclipse.emf.compare.uml2.internal.DependencyChange

 	 * @generated

+	 * @ordered

 	 */

-	EClass getDependencyChange();

+	int DIRECTED_RELATIONSHIP_CHANGE__MATCH = UML_DIFF__MATCH;

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.internal.InterfaceRealizationChange <em>Interface Realization Change</em>}'.

+	 * The feature id for the '<em><b>Requires</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Interface Realization Change</em>'.

-	 * @see org.eclipse.emf.compare.uml2.internal.InterfaceRealizationChange

 	 * @generated

+	 * @ordered

 	 */

-	EClass getInterfaceRealizationChange();

+	int DIRECTED_RELATIONSHIP_CHANGE__REQUIRES = UML_DIFF__REQUIRES;

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.internal.SubstitutionChange <em>Substitution Change</em>}'.

+	 * The feature id for the '<em><b>Required By</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Substitution Change</em>'.

-	 * @see org.eclipse.emf.compare.uml2.internal.SubstitutionChange

 	 * @generated

+	 * @ordered

 	 */

-	EClass getSubstitutionChange();

+	int DIRECTED_RELATIONSHIP_CHANGE__REQUIRED_BY = UML_DIFF__REQUIRED_BY;

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.internal.ExtendChange <em>Extend Change</em>}'.

+	 * The feature id for the '<em><b>Refines</b></em>' reference list.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Extend Change</em>'.

-	 * @see org.eclipse.emf.compare.uml2.internal.ExtendChange

 	 * @generated

+	 * @ordered

 	 */

-	EClass getExtendChange();

+	int DIRECTED_RELATIONSHIP_CHANGE__REFINES = UML_DIFF__REFINES;

+

+	/**

+	 * The feature id for the '<em><b>Refined By</b></em>' reference list.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int DIRECTED_RELATIONSHIP_CHANGE__REFINED_BY = UML_DIFF__REFINED_BY;

+

+	/**

+	 * The feature id for the '<em><b>Kind</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int DIRECTED_RELATIONSHIP_CHANGE__KIND = UML_DIFF__KIND;

+

+	/**

+	 * The feature id for the '<em><b>Source</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int DIRECTED_RELATIONSHIP_CHANGE__SOURCE = UML_DIFF__SOURCE;

+

+	/**

+	 * The feature id for the '<em><b>State</b></em>' attribute.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int DIRECTED_RELATIONSHIP_CHANGE__STATE = UML_DIFF__STATE;

+

+	/**

+	 * The feature id for the '<em><b>Equivalence</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int DIRECTED_RELATIONSHIP_CHANGE__EQUIVALENCE = UML_DIFF__EQUIVALENCE;

+

+	/**

+	 * The feature id for the '<em><b>Conflict</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int DIRECTED_RELATIONSHIP_CHANGE__CONFLICT = UML_DIFF__CONFLICT;

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.internal.IncludeChange <em>Include Change</em>}'.

+	 * The feature id for the '<em><b>Discriminant</b></em>' reference.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @return the meta object for class '<em>Include Change</em>'.

-	 * @see org.eclipse.emf.compare.uml2.internal.IncludeChange

 	 * @generated

+	 * @ordered

 	 */

-	EClass getIncludeChange();

+	int DIRECTED_RELATIONSHIP_CHANGE__DISCRIMINANT = UML_DIFF__DISCRIMINANT;

+

+	/**

+	 * The feature id for the '<em><b>EReference</b></em>' reference.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int DIRECTED_RELATIONSHIP_CHANGE__EREFERENCE = UML_DIFF__EREFERENCE;

+

+	/**

+	 * The number of structural features of the '<em>Directed Relationship Change</em>' class.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @generated

+	 * @ordered

+	 */

+	int DIRECTED_RELATIONSHIP_CHANGE_FEATURE_COUNT = UML_DIFF_FEATURE_COUNT + 0;

+

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.internal.AssociationChange <em>Association Change</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>Association Change</em>'.

+	 * @see org.eclipse.emf.compare.uml2.internal.AssociationChange

+	 * @generated

+	 */

+	EClass getAssociationChange();

+

+	/**

+	 * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.internal.ExtendChange <em>Extend Change</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>Extend Change</em>'.

+	 * @see org.eclipse.emf.compare.uml2.internal.ExtendChange

+	 * @generated

+	 */

+	EClass getExtendChange();

 

 	/**

 	 * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.internal.GeneralizationSetChange <em>Generalization Set Change</em>}'.

@@ -2171,6 +1751,16 @@ public interface UMLComparePackage extends EPackage {
 	EReference getProfileApplicationChange_Profile();

 

 	/**

+	 * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.internal.DirectedRelationshipChange <em>Directed Relationship Change</em>}'.

+	 * <!-- begin-user-doc -->

+	 * <!-- end-user-doc -->

+	 * @return the meta object for class '<em>Directed Relationship Change</em>'.

+	 * @see org.eclipse.emf.compare.uml2.internal.DirectedRelationshipChange

+	 * @generated

+	 */

+	EClass getDirectedRelationshipChange();

+

+	/**

 	 * Returns the meta object for class '{@link org.eclipse.emf.compare.uml2.internal.UMLDiff <em>UML Diff</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

@@ -2235,36 +1825,6 @@ public interface UMLComparePackage extends EPackage {
 		EClass ASSOCIATION_CHANGE = eINSTANCE.getAssociationChange();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.internal.impl.DependencyChangeImpl <em>Dependency Change</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.emf.compare.uml2.internal.impl.DependencyChangeImpl

-		 * @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getDependencyChange()

-		 * @generated

-		 */

-		EClass DEPENDENCY_CHANGE = eINSTANCE.getDependencyChange();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.internal.impl.InterfaceRealizationChangeImpl <em>Interface Realization Change</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.emf.compare.uml2.internal.impl.InterfaceRealizationChangeImpl

-		 * @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getInterfaceRealizationChange()

-		 * @generated

-		 */

-		EClass INTERFACE_REALIZATION_CHANGE = eINSTANCE.getInterfaceRealizationChange();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.internal.impl.SubstitutionChangeImpl <em>Substitution Change</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.emf.compare.uml2.internal.impl.SubstitutionChangeImpl

-		 * @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getSubstitutionChange()

-		 * @generated

-		 */

-		EClass SUBSTITUTION_CHANGE = eINSTANCE.getSubstitutionChange();

-

-		/**

 		 * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.internal.impl.ExtendChangeImpl <em>Extend Change</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

@@ -2275,16 +1835,6 @@ public interface UMLComparePackage extends EPackage {
 		EClass EXTEND_CHANGE = eINSTANCE.getExtendChange();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.internal.impl.IncludeChangeImpl <em>Include Change</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * @see org.eclipse.emf.compare.uml2.internal.impl.IncludeChangeImpl

-		 * @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getIncludeChange()

-		 * @generated

-		 */

-		EClass INCLUDE_CHANGE = eINSTANCE.getIncludeChange();

-

-		/**

 		 * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.internal.impl.GeneralizationSetChangeImpl <em>Generalization Set Change</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

@@ -2389,6 +1939,16 @@ public interface UMLComparePackage extends EPackage {
 		EReference PROFILE_APPLICATION_CHANGE__PROFILE = eINSTANCE.getProfileApplicationChange_Profile();

 

 		/**

+		 * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.internal.impl.DirectedRelationshipChangeImpl <em>Directed Relationship Change</em>}' class.

+		 * <!-- begin-user-doc -->

+		 * <!-- end-user-doc -->

+		 * @see org.eclipse.emf.compare.uml2.internal.impl.DirectedRelationshipChangeImpl

+		 * @see org.eclipse.emf.compare.uml2.internal.impl.UMLComparePackageImpl#getDirectedRelationshipChange()

+		 * @generated

+		 */

+		EClass DIRECTED_RELATIONSHIP_CHANGE = eINSTANCE.getDirectedRelationshipChange();

+

+		/**

 		 * The meta object literal for the '{@link org.eclipse.emf.compare.uml2.internal.impl.UMLDiffImpl <em>UML Diff</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/DependencyChangeImpl.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/DependencyChangeImpl.java
deleted file mode 100644
index 00053a776..000000000
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/DependencyChangeImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**

- * Copyright (c) 2012 Obeo.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *     Obeo - initial API and implementation

- */

-package org.eclipse.emf.compare.uml2.internal.impl;

-

-import org.eclipse.emf.compare.uml2.internal.DependencyChange;

-import org.eclipse.emf.compare.uml2.internal.UMLComparePackage;

-

-import org.eclipse.emf.ecore.EClass;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Dependency Change</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * </p>

- *

- * @generated

- */

-public class DependencyChangeImpl extends UMLDiffImpl implements DependencyChange {

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected DependencyChangeImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return UMLComparePackage.Literals.DEPENDENCY_CHANGE;

-	}

-

-} //DependencyChangeImpl

diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/DirectedRelationshipChangeImpl.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/DirectedRelationshipChangeImpl.java
new file mode 100644
index 000000000..f8f6382c1
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/DirectedRelationshipChangeImpl.java
@@ -0,0 +1,45 @@
+/**

+ * Copyright (c) 2012, 2013 Obeo.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *     Obeo - initial API and implementation

+ */

+package org.eclipse.emf.compare.uml2.internal.impl;

+

+import org.eclipse.emf.compare.uml2.internal.DirectedRelationshipChange;

+import org.eclipse.emf.compare.uml2.internal.UMLComparePackage;

+import org.eclipse.emf.ecore.EClass;

+

+/**

+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Directed Relationship Change</b></em>

+ * '. <!-- end-user-doc -->

+ * <p>

+ * </p>

+ * 

+ * @generated

+ */

+public class DirectedRelationshipChangeImpl extends UMLDiffImpl implements DirectedRelationshipChange {

+	/**

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	protected DirectedRelationshipChangeImpl() {

+		super();

+	}

+

+	/**

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return UMLComparePackage.Literals.DIRECTED_RELATIONSHIP_CHANGE;

+	}

+

+} // DirectedRelationshipChangeImpl

diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/IncludeChangeImpl.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/IncludeChangeImpl.java
deleted file mode 100644
index fb6067f69..000000000
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/IncludeChangeImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**

- * Copyright (c) 2012 Obeo.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *     Obeo - initial API and implementation

- */

-package org.eclipse.emf.compare.uml2.internal.impl;

-

-import org.eclipse.emf.compare.uml2.internal.IncludeChange;

-import org.eclipse.emf.compare.uml2.internal.UMLComparePackage;

-

-import org.eclipse.emf.ecore.EClass;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Include Change</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * </p>

- *

- * @generated

- */

-public class IncludeChangeImpl extends UMLDiffImpl implements IncludeChange {

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected IncludeChangeImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return UMLComparePackage.Literals.INCLUDE_CHANGE;

-	}

-

-} //IncludeChangeImpl

diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/InterfaceRealizationChangeImpl.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/InterfaceRealizationChangeImpl.java
deleted file mode 100644
index a58375310..000000000
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/InterfaceRealizationChangeImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**

- * Copyright (c) 2012 Obeo.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *     Obeo - initial API and implementation

- */

-package org.eclipse.emf.compare.uml2.internal.impl;

-

-import org.eclipse.emf.compare.uml2.internal.InterfaceRealizationChange;

-import org.eclipse.emf.compare.uml2.internal.UMLComparePackage;

-

-import org.eclipse.emf.ecore.EClass;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Interface Realization Change</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * </p>

- *

- * @generated

- */

-public class InterfaceRealizationChangeImpl extends UMLDiffImpl implements InterfaceRealizationChange {

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected InterfaceRealizationChangeImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return UMLComparePackage.Literals.INTERFACE_REALIZATION_CHANGE;

-	}

-

-} //InterfaceRealizationChangeImpl

diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/SubstitutionChangeImpl.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/SubstitutionChangeImpl.java
deleted file mode 100644
index 0c6b1d3d9..000000000
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/SubstitutionChangeImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**

- * Copyright (c) 2012 Obeo.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *     Obeo - initial API and implementation

- */

-package org.eclipse.emf.compare.uml2.internal.impl;

-

-import org.eclipse.emf.compare.uml2.internal.SubstitutionChange;

-import org.eclipse.emf.compare.uml2.internal.UMLComparePackage;

-

-import org.eclipse.emf.ecore.EClass;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Substitution Change</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * </p>

- *

- * @generated

- */

-public class SubstitutionChangeImpl extends UMLDiffImpl implements SubstitutionChange {

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	protected SubstitutionChangeImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return UMLComparePackage.Literals.SUBSTITUTION_CHANGE;

-	}

-

-} //SubstitutionChangeImpl

diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/UMLCompareFactoryImpl.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/UMLCompareFactoryImpl.java
index 3ff5742ce..3b37810b8 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/UMLCompareFactoryImpl.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/UMLCompareFactoryImpl.java
@@ -1,5 +1,5 @@
 /**

- * Copyright (c) 2012 Obeo.

+ * Copyright (c) 2012, 2013 Obeo.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -10,46 +10,52 @@
  */

 package org.eclipse.emf.compare.uml2.internal.impl;

 

-import org.eclipse.emf.compare.uml2.internal.*;

-

+import org.eclipse.emf.compare.uml2.internal.AssociationChange;

+import org.eclipse.emf.compare.uml2.internal.DirectedRelationshipChange;

+import org.eclipse.emf.compare.uml2.internal.ExecutionSpecificationChange;

+import org.eclipse.emf.compare.uml2.internal.ExtendChange;

+import org.eclipse.emf.compare.uml2.internal.GeneralizationSetChange;

+import org.eclipse.emf.compare.uml2.internal.IntervalConstraintChange;

+import org.eclipse.emf.compare.uml2.internal.MessageChange;

+import org.eclipse.emf.compare.uml2.internal.ProfileApplicationChange;

+import org.eclipse.emf.compare.uml2.internal.StereotypeApplicationChange;

+import org.eclipse.emf.compare.uml2.internal.StereotypePropertyChange;

+import org.eclipse.emf.compare.uml2.internal.StereotypeReferenceChange;

+import org.eclipse.emf.compare.uml2.internal.UMLCompareFactory;

+import org.eclipse.emf.compare.uml2.internal.UMLComparePackage;

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EPackage;

-

 import org.eclipse.emf.ecore.impl.EFactoryImpl;

-

 import org.eclipse.emf.ecore.plugin.EcorePlugin;

 

 /**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Factory</b>.

- * <!-- end-user-doc -->

+ * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->

+ * 

  * @generated

  */

 public class UMLCompareFactoryImpl extends EFactoryImpl implements UMLCompareFactory {

 	/**

-	 * Creates the default factory implementation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * Creates the default factory implementation. <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public static UMLCompareFactory init() {

 		try {

-			UMLCompareFactory theUMLCompareFactory = (UMLCompareFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/emf/compare/uml2/2.0"); //$NON-NLS-1$ 

+			UMLCompareFactory theUMLCompareFactory = (UMLCompareFactory)EPackage.Registry.INSTANCE

+					.getEFactory("http://www.eclipse.org/emf/compare/uml2/2.0"); //$NON-NLS-1$ 

 			if (theUMLCompareFactory != null) {

 				return theUMLCompareFactory;

 			}

-		}

-		catch (Exception exception) {

+		} catch (Exception exception) {

 			EcorePlugin.INSTANCE.log(exception);

 		}

 		return new UMLCompareFactoryImpl();

 	}

 

 	/**

-	 * Creates an instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * Creates an instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public UMLCompareFactoryImpl() {

@@ -57,35 +63,44 @@ public class UMLCompareFactoryImpl extends EFactoryImpl implements UMLCompareFac
 	}

 

 	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	@Override

 	public EObject create(EClass eClass) {

 		switch (eClass.getClassifierID()) {

-			case UMLComparePackage.ASSOCIATION_CHANGE: return createAssociationChange();

-			case UMLComparePackage.DEPENDENCY_CHANGE: return createDependencyChange();

-			case UMLComparePackage.INTERFACE_REALIZATION_CHANGE: return createInterfaceRealizationChange();

-			case UMLComparePackage.SUBSTITUTION_CHANGE: return createSubstitutionChange();

-			case UMLComparePackage.EXTEND_CHANGE: return createExtendChange();

-			case UMLComparePackage.INCLUDE_CHANGE: return createIncludeChange();

-			case UMLComparePackage.GENERALIZATION_SET_CHANGE: return createGeneralizationSetChange();

-			case UMLComparePackage.EXECUTION_SPECIFICATION_CHANGE: return createExecutionSpecificationChange();

-			case UMLComparePackage.INTERVAL_CONSTRAINT_CHANGE: return createIntervalConstraintChange();

-			case UMLComparePackage.MESSAGE_CHANGE: return createMessageChange();

-			case UMLComparePackage.STEREOTYPE_PROPERTY_CHANGE: return createStereotypePropertyChange();

-			case UMLComparePackage.STEREOTYPE_APPLICATION_CHANGE: return createStereotypeApplicationChange();

-			case UMLComparePackage.STEREOTYPE_REFERENCE_CHANGE: return createStereotypeReferenceChange();

-			case UMLComparePackage.PROFILE_APPLICATION_CHANGE: return createProfileApplicationChange();

+			case UMLComparePackage.ASSOCIATION_CHANGE:

+				return createAssociationChange();

+			case UMLComparePackage.EXTEND_CHANGE:

+				return createExtendChange();

+			case UMLComparePackage.GENERALIZATION_SET_CHANGE:

+				return createGeneralizationSetChange();

+			case UMLComparePackage.EXECUTION_SPECIFICATION_CHANGE:

+				return createExecutionSpecificationChange();

+			case UMLComparePackage.INTERVAL_CONSTRAINT_CHANGE:

+				return createIntervalConstraintChange();

+			case UMLComparePackage.MESSAGE_CHANGE:

+				return createMessageChange();

+			case UMLComparePackage.STEREOTYPE_PROPERTY_CHANGE:

+				return createStereotypePropertyChange();

+			case UMLComparePackage.STEREOTYPE_APPLICATION_CHANGE:

+				return createStereotypeApplicationChange();

+			case UMLComparePackage.STEREOTYPE_REFERENCE_CHANGE:

+				return createStereotypeReferenceChange();

+			case UMLComparePackage.PROFILE_APPLICATION_CHANGE:

+				return createProfileApplicationChange();

+			case UMLComparePackage.DIRECTED_RELATIONSHIP_CHANGE:

+				return createDirectedRelationshipChange();

 			default:

-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

+				throw new IllegalArgumentException(

+						"The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

 		}

 	}

 

 	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public AssociationChange createAssociationChange() {

@@ -94,38 +109,8 @@ public class UMLCompareFactoryImpl extends EFactoryImpl implements UMLCompareFac
 	}

 

 	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public DependencyChange createDependencyChange() {

-		DependencyChangeImpl dependencyChange = new DependencyChangeImpl();

-		return dependencyChange;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public InterfaceRealizationChange createInterfaceRealizationChange() {

-		InterfaceRealizationChangeImpl interfaceRealizationChange = new InterfaceRealizationChangeImpl();

-		return interfaceRealizationChange;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public SubstitutionChange createSubstitutionChange() {

-		SubstitutionChangeImpl substitutionChange = new SubstitutionChangeImpl();

-		return substitutionChange;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public ExtendChange createExtendChange() {

@@ -134,18 +119,8 @@ public class UMLCompareFactoryImpl extends EFactoryImpl implements UMLCompareFac
 	}

 

 	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public IncludeChange createIncludeChange() {

-		IncludeChangeImpl includeChange = new IncludeChangeImpl();

-		return includeChange;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public GeneralizationSetChange createGeneralizationSetChange() {

@@ -154,8 +129,8 @@ public class UMLCompareFactoryImpl extends EFactoryImpl implements UMLCompareFac
 	}

 

 	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public ExecutionSpecificationChange createExecutionSpecificationChange() {

@@ -164,8 +139,8 @@ public class UMLCompareFactoryImpl extends EFactoryImpl implements UMLCompareFac
 	}

 

 	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public IntervalConstraintChange createIntervalConstraintChange() {

@@ -174,8 +149,8 @@ public class UMLCompareFactoryImpl extends EFactoryImpl implements UMLCompareFac
 	}

 

 	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public MessageChange createMessageChange() {

@@ -184,8 +159,8 @@ public class UMLCompareFactoryImpl extends EFactoryImpl implements UMLCompareFac
 	}

 

 	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public StereotypePropertyChange createStereotypePropertyChange() {

@@ -194,8 +169,8 @@ public class UMLCompareFactoryImpl extends EFactoryImpl implements UMLCompareFac
 	}

 

 	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public StereotypeApplicationChange createStereotypeApplicationChange() {

@@ -204,8 +179,8 @@ public class UMLCompareFactoryImpl extends EFactoryImpl implements UMLCompareFac
 	}

 

 	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public StereotypeReferenceChange createStereotypeReferenceChange() {

@@ -214,8 +189,8 @@ public class UMLCompareFactoryImpl extends EFactoryImpl implements UMLCompareFac
 	}

 

 	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public ProfileApplicationChange createProfileApplicationChange() {

@@ -224,8 +199,18 @@ public class UMLCompareFactoryImpl extends EFactoryImpl implements UMLCompareFac
 	}

 

 	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public DirectedRelationshipChange createDirectedRelationshipChange() {

+		DirectedRelationshipChangeImpl directedRelationshipChange = new DirectedRelationshipChangeImpl();

+		return directedRelationshipChange;

+	}

+

+	/**

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public UMLComparePackage getUMLComparePackage() {

@@ -233,8 +218,8 @@ public class UMLCompareFactoryImpl extends EFactoryImpl implements UMLCompareFac
 	}

 

 	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @deprecated

 	 * @generated

 	 */

@@ -243,4 +228,4 @@ public class UMLCompareFactoryImpl extends EFactoryImpl implements UMLCompareFac
 		return UMLComparePackage.eINSTANCE;

 	}

 

-} //UMLCompareFactoryImpl

+} // UMLCompareFactoryImpl

diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/UMLComparePackageImpl.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/UMLComparePackageImpl.java
index 7f4fcb5fa..66dd168ea 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/UMLComparePackageImpl.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/impl/UMLComparePackageImpl.java
@@ -1,5 +1,5 @@
 /**

- * Copyright (c) 2012 Obeo.

+ * Copyright (c) 2012, 2013 Obeo.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -11,156 +11,125 @@
 package org.eclipse.emf.compare.uml2.internal.impl;

 

 import org.eclipse.emf.compare.ComparePackage;

-

 import org.eclipse.emf.compare.uml2.internal.AssociationChange;

-import org.eclipse.emf.compare.uml2.internal.DependencyChange;

+import org.eclipse.emf.compare.uml2.internal.DirectedRelationshipChange;

 import org.eclipse.emf.compare.uml2.internal.ExecutionSpecificationChange;

 import org.eclipse.emf.compare.uml2.internal.ExtendChange;

 import org.eclipse.emf.compare.uml2.internal.GeneralizationSetChange;

-import org.eclipse.emf.compare.uml2.internal.IncludeChange;

-import org.eclipse.emf.compare.uml2.internal.InterfaceRealizationChange;

 import org.eclipse.emf.compare.uml2.internal.IntervalConstraintChange;

 import org.eclipse.emf.compare.uml2.internal.MessageChange;

 import org.eclipse.emf.compare.uml2.internal.ProfileApplicationChange;

 import org.eclipse.emf.compare.uml2.internal.StereotypeApplicationChange;

 import org.eclipse.emf.compare.uml2.internal.StereotypePropertyChange;

 import org.eclipse.emf.compare.uml2.internal.StereotypeReferenceChange;

-import org.eclipse.emf.compare.uml2.internal.SubstitutionChange;

 import org.eclipse.emf.compare.uml2.internal.UMLCompareFactory;

 import org.eclipse.emf.compare.uml2.internal.UMLComparePackage;

 import org.eclipse.emf.compare.uml2.internal.UMLDiff;

-

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EPackage;

 import org.eclipse.emf.ecore.EReference;

 import org.eclipse.emf.ecore.EcorePackage;

-

 import org.eclipse.emf.ecore.impl.EPackageImpl;

-

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Package</b>.

- * <!-- end-user-doc -->

+ * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->

+ * 

  * @generated

  */

 public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePackage {

 	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass associationChangeEClass = null;

 

 	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass dependencyChangeEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass interfaceRealizationChangeEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass substitutionChangeEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass extendChangeEClass = null;

 

 	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	private EClass includeChangeEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass generalizationSetChangeEClass = null;

 

 	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass executionSpecificationChangeEClass = null;

 

 	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass intervalConstraintChangeEClass = null;

 

 	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass messageChangeEClass = null;

 

 	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass stereotypePropertyChangeEClass = null;

 

 	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass stereotypeApplicationChangeEClass = null;

 

 	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass stereotypeReferenceChangeEClass = null;

 

 	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass profileApplicationChangeEClass = null;

 

 	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	private EClass directedRelationshipChangeEClass = null;

+

+	/**

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private EClass umlDiffEClass = null;

 

 	/**

 	 * Creates an instance of the model <b>Package</b>, registered with

-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

-	 * package URI value.

-	 * <p>Note: the correct way to create the package is via the static

-	 * factory method {@link #init init()}, which also performs

-	 * initialization of the package, or returns the registered package,

-	 * if one already exists.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package package URI value.

+	 * <p>

+	 * Note: the correct way to create the package is via the static factory method {@link #init init()},

+	 * which also performs initialization of the package, or returns the registered package, if one already

+	 * exists. <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @see org.eclipse.emf.ecore.EPackage.Registry

 	 * @see org.eclipse.emf.compare.uml2.internal.UMLComparePackage#eNS_URI

 	 * @see #init()

@@ -171,29 +140,34 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac
 	}

 

 	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private static boolean isInited = false;

 

 	/**

-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it

+	 * depends.

+	 * <p>

+	 * This method is used to initialize {@link UMLComparePackage#eINSTANCE} when that field is accessed.

+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the

+	 * package. <!-- begin-user-doc --> <!-- end-user-doc -->

 	 * 

-	 * <p>This method is used to initialize {@link UMLComparePackage#eINSTANCE} when that field is accessed.

-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

 	 * @see #eNS_URI

 	 * @see #createPackageContents()

 	 * @see #initializePackageContents()

 	 * @generated

 	 */

 	public static UMLComparePackage init() {

-		if (isInited) return (UMLComparePackage)EPackage.Registry.INSTANCE.getEPackage(UMLComparePackage.eNS_URI);

+		if (isInited) {

+			return (UMLComparePackage)EPackage.Registry.INSTANCE.getEPackage(UMLComparePackage.eNS_URI);

+		}

 

 		// Obtain or create and register package

-		UMLComparePackageImpl theUMLComparePackage = (UMLComparePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof UMLComparePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new UMLComparePackageImpl());

+		UMLComparePackageImpl theUMLComparePackage = (UMLComparePackageImpl)(EPackage.Registry.INSTANCE

+				.get(eNS_URI) instanceof UMLComparePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)

+				: new UMLComparePackageImpl());

 

 		isInited = true;

 

@@ -210,15 +184,14 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac
 		// Mark meta-data to indicate it can't be changed

 		theUMLComparePackage.freeze();

 

-  

 		// Update the registry and return the package

 		EPackage.Registry.INSTANCE.put(UMLComparePackage.eNS_URI, theUMLComparePackage);

 		return theUMLComparePackage;

 	}

 

 	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getAssociationChange() {

@@ -226,35 +199,8 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac
 	}

 

 	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EClass getDependencyChange() {

-		return dependencyChangeEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EClass getInterfaceRealizationChange() {

-		return interfaceRealizationChangeEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EClass getSubstitutionChange() {

-		return substitutionChangeEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getExtendChange() {

@@ -262,17 +208,8 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac
 	}

 

 	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @generated

-	 */

-	public EClass getIncludeChange() {

-		return includeChangeEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getGeneralizationSetChange() {

@@ -280,8 +217,8 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac
 	}

 

 	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getExecutionSpecificationChange() {

@@ -289,8 +226,8 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac
 	}

 

 	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getIntervalConstraintChange() {

@@ -298,8 +235,8 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac
 	}

 

 	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getMessageChange() {

@@ -307,8 +244,8 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac
 	}

 

 	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getStereotypePropertyChange() {

@@ -316,8 +253,8 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac
 	}

 

 	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getStereotypePropertyChange_Stereotype() {

@@ -325,8 +262,8 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac
 	}

 

 	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getStereotypeApplicationChange() {

@@ -334,8 +271,8 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac
 	}

 

 	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getStereotypeApplicationChange_Stereotype() {

@@ -343,8 +280,8 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac
 	}

 

 	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getStereotypeReferenceChange() {

@@ -352,8 +289,8 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac
 	}

 

 	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getProfileApplicationChange() {

@@ -361,8 +298,8 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac
 	}

 

 	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getProfileApplicationChange_Profile() {

@@ -370,8 +307,17 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac
 	}

 

 	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	public EClass getDirectedRelationshipChange() {

+		return directedRelationshipChangeEClass;

+	}

+

+	/**

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EClass getUMLDiff() {

@@ -379,8 +325,8 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac
 	}

 

 	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getUMLDiff_Discriminant() {

@@ -388,8 +334,8 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac
 	}

 

 	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public EReference getUMLDiff_EReference() {

@@ -397,8 +343,8 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac
 	}

 

 	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public UMLCompareFactory getUMLCompareFactory() {

@@ -406,36 +352,29 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac
 	}

 

 	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private boolean isCreated = false;

 

 	/**

-	 * Creates the meta-model objects for the package.  This method is

-	 * guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * Creates the meta-model objects for the package. This method is guarded to have no affect on any

+	 * invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void createPackageContents() {

-		if (isCreated) return;

+		if (isCreated) {

+			return;

+		}

 		isCreated = true;

 

 		// Create classes and their features

 		associationChangeEClass = createEClass(ASSOCIATION_CHANGE);

 

-		dependencyChangeEClass = createEClass(DEPENDENCY_CHANGE);

-

-		interfaceRealizationChangeEClass = createEClass(INTERFACE_REALIZATION_CHANGE);

-

-		substitutionChangeEClass = createEClass(SUBSTITUTION_CHANGE);

-

 		extendChangeEClass = createEClass(EXTEND_CHANGE);

 

-		includeChangeEClass = createEClass(INCLUDE_CHANGE);

-

 		generalizationSetChangeEClass = createEClass(GENERALIZATION_SET_CHANGE);

 

 		executionSpecificationChangeEClass = createEClass(EXECUTION_SPECIFICATION_CHANGE);

@@ -455,27 +394,30 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac
 		profileApplicationChangeEClass = createEClass(PROFILE_APPLICATION_CHANGE);

 		createEReference(profileApplicationChangeEClass, PROFILE_APPLICATION_CHANGE__PROFILE);

 

+		directedRelationshipChangeEClass = createEClass(DIRECTED_RELATIONSHIP_CHANGE);

+

 		umlDiffEClass = createEClass(UML_DIFF);

 		createEReference(umlDiffEClass, UML_DIFF__DISCRIMINANT);

 		createEReference(umlDiffEClass, UML_DIFF__EREFERENCE);

 	}

 

 	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	private boolean isInitialized = false;

 

 	/**

-	 * Complete the initialization of the package and its meta-model.  This

-	 * method is guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * Complete the initialization of the package and its meta-model. This method is guarded to have no affect

+	 * on any invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public void initializePackageContents() {

-		if (isInitialized) return;

+		if (isInitialized) {

+			return;

+		}

 		isInitialized = true;

 

 		// Initialize package

@@ -485,8 +427,10 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac
 

 		// Obtain other dependent packages

 		UMLPackage theUMLPackage = (UMLPackage)EPackage.Registry.INSTANCE.getEPackage(UMLPackage.eNS_URI);

-		ComparePackage theComparePackage = (ComparePackage)EPackage.Registry.INSTANCE.getEPackage(ComparePackage.eNS_URI);

-		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);

+		ComparePackage theComparePackage = (ComparePackage)EPackage.Registry.INSTANCE

+				.getEPackage(ComparePackage.eNS_URI);

+		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE

+				.getEPackage(EcorePackage.eNS_URI);

 

 		// Create type parameters

 

@@ -494,11 +438,7 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac
 

 		// Add supertypes to classes

 		associationChangeEClass.getESuperTypes().add(this.getUMLDiff());

-		dependencyChangeEClass.getESuperTypes().add(this.getUMLDiff());

-		interfaceRealizationChangeEClass.getESuperTypes().add(this.getUMLDiff());

-		substitutionChangeEClass.getESuperTypes().add(this.getUMLDiff());

 		extendChangeEClass.getESuperTypes().add(this.getUMLDiff());

-		includeChangeEClass.getESuperTypes().add(this.getUMLDiff());

 		generalizationSetChangeEClass.getESuperTypes().add(this.getUMLDiff());

 		executionSpecificationChangeEClass.getESuperTypes().add(this.getUMLDiff());

 		intervalConstraintChangeEClass.getESuperTypes().add(this.getUMLDiff());

@@ -507,46 +447,73 @@ public class UMLComparePackageImpl extends EPackageImpl implements UMLComparePac
 		stereotypeApplicationChangeEClass.getESuperTypes().add(this.getUMLDiff());

 		stereotypeReferenceChangeEClass.getESuperTypes().add(this.getUMLDiff());

 		profileApplicationChangeEClass.getESuperTypes().add(this.getUMLDiff());

+		directedRelationshipChangeEClass.getESuperTypes().add(this.getUMLDiff());

 		umlDiffEClass.getESuperTypes().add(theComparePackage.getDiff());

 

 		// Initialize classes and features; add operations and parameters

-		initEClass(associationChangeEClass, AssociationChange.class, "AssociationChange", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-

-		initEClass(dependencyChangeEClass, DependencyChange.class, "DependencyChange", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-

-		initEClass(interfaceRealizationChangeEClass, InterfaceRealizationChange.class, "InterfaceRealizationChange", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-

-		initEClass(substitutionChangeEClass, SubstitutionChange.class, "SubstitutionChange", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-

-		initEClass(extendChangeEClass, ExtendChange.class, "ExtendChange", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-

-		initEClass(includeChangeEClass, IncludeChange.class, "IncludeChange", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-

-		initEClass(generalizationSetChangeEClass, GeneralizationSetChange.class, "GeneralizationSetChange", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-

-		initEClass(executionSpecificationChangeEClass, ExecutionSpecificationChange.class, "ExecutionSpecificationChange", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-

-		initEClass(intervalConstraintChangeEClass, IntervalConstraintChange.class, "IntervalConstraintChange", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-

-		initEClass(messageChangeEClass, MessageChange.class, "MessageChange", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-

-		initEClass(stereotypePropertyChangeEClass, StereotypePropertyChange.class, "StereotypePropertyChange", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEReference(getStereotypePropertyChange_Stereotype(), theUMLPackage.getStereotype(), null, "stereotype", null, 0, 1, StereotypePropertyChange.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(stereotypeApplicationChangeEClass, StereotypeApplicationChange.class, "StereotypeApplicationChange", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEReference(getStereotypeApplicationChange_Stereotype(), theUMLPackage.getStereotype(), null, "stereotype", null, 0, 1, StereotypeApplicationChange.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(stereotypeReferenceChangeEClass, StereotypeReferenceChange.class, "StereotypeReferenceChange", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-

-		initEClass(profileApplicationChangeEClass, ProfileApplicationChange.class, "ProfileApplicationChange", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEReference(getProfileApplicationChange_Profile(), theUMLPackage.getProfile(), null, "profile", null, 0, 1, ProfileApplicationChange.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(umlDiffEClass, UMLDiff.class, "UMLDiff", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEReference(getUMLDiff_Discriminant(), theEcorePackage.getEObject(), null, "discriminant", null, 0, 1, UMLDiff.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(getUMLDiff_EReference(), theEcorePackage.getEReference(), null, "eReference", null, 0, 1, UMLDiff.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

+		initEClass(associationChangeEClass, AssociationChange.class,

+				"AssociationChange", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

+

+		initEClass(extendChangeEClass, ExtendChange.class,

+				"ExtendChange", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

+

+		initEClass(generalizationSetChangeEClass, GeneralizationSetChange.class,

+				"GeneralizationSetChange", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

+

+		initEClass(executionSpecificationChangeEClass, ExecutionSpecificationChange.class,

+				"ExecutionSpecificationChange", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

+

+		initEClass(intervalConstraintChangeEClass, IntervalConstraintChange.class,

+				"IntervalConstraintChange", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

+

+		initEClass(messageChangeEClass, MessageChange.class,

+				"MessageChange", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

+

+		initEClass(stereotypePropertyChangeEClass, StereotypePropertyChange.class,

+				"StereotypePropertyChange", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

+		initEReference(

+				getStereotypePropertyChange_Stereotype(),

+				theUMLPackage.getStereotype(),

+				null,

+				"stereotype", null, 0, 1, StereotypePropertyChange.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

+

+		initEClass(stereotypeApplicationChangeEClass, StereotypeApplicationChange.class,

+				"StereotypeApplicationChange", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

+		initEReference(

+				getStereotypeApplicationChange_Stereotype(),

+				theUMLPackage.getStereotype(),

+				null,

+				"stereotype", null, 0, 1, StereotypeApplicationChange.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

+

+		initEClass(stereotypeReferenceChangeEClass, StereotypeReferenceChange.class,

+				"StereotypeReferenceChange", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

+

+		initEClass(profileApplicationChangeEClass, ProfileApplicationChange.class,

+				"ProfileApplicationChange", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

+		initEReference(

+				getProfileApplicationChange_Profile(),

+				theUMLPackage.getProfile(),

+				null,

+				"profile", null, 0, 1, ProfileApplicationChange.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

+

+		initEClass(directedRelationshipChangeEClass, DirectedRelationshipChange.class,

+				"DirectedRelationshipChange", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

+

+		initEClass(umlDiffEClass, UMLDiff.class,

+				"UMLDiff", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

+		initEReference(

+				getUMLDiff_Discriminant(),

+				theEcorePackage.getEObject(),

+				null,

+				"discriminant", null, 0, 1, UMLDiff.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

+		initEReference(

+				getUMLDiff_EReference(),

+				theEcorePackage.getEReference(),

+				null,

+				"eReference", null, 0, 1, UMLDiff.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

 

 		// Create resource

 		createResource(eNS_URI);

 	}

 

-} //UMLComparePackageImpl

+} // UMLComparePackageImpl

diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/util/UMLCompareAdapterFactory.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/util/UMLCompareAdapterFactory.java
index f2ef83c86..398680852 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/util/UMLCompareAdapterFactory.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/util/UMLCompareAdapterFactory.java
@@ -1,5 +1,5 @@
 /**

- * Copyright (c) 2012 Obeo.

+ * Copyright (c) 2012, 2013 Obeo.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -12,36 +12,41 @@ package org.eclipse.emf.compare.uml2.internal.util;
 

 import org.eclipse.emf.common.notify.Adapter;

 import org.eclipse.emf.common.notify.Notifier;

-

 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

-

 import org.eclipse.emf.compare.Diff;

-

-import org.eclipse.emf.compare.uml2.internal.*;

-

+import org.eclipse.emf.compare.uml2.internal.AssociationChange;

+import org.eclipse.emf.compare.uml2.internal.DirectedRelationshipChange;

+import org.eclipse.emf.compare.uml2.internal.ExecutionSpecificationChange;

+import org.eclipse.emf.compare.uml2.internal.ExtendChange;

+import org.eclipse.emf.compare.uml2.internal.GeneralizationSetChange;

+import org.eclipse.emf.compare.uml2.internal.IntervalConstraintChange;

+import org.eclipse.emf.compare.uml2.internal.MessageChange;

+import org.eclipse.emf.compare.uml2.internal.ProfileApplicationChange;

+import org.eclipse.emf.compare.uml2.internal.StereotypeApplicationChange;

+import org.eclipse.emf.compare.uml2.internal.StereotypePropertyChange;

+import org.eclipse.emf.compare.uml2.internal.StereotypeReferenceChange;

+import org.eclipse.emf.compare.uml2.internal.UMLComparePackage;

+import org.eclipse.emf.compare.uml2.internal.UMLDiff;

 import org.eclipse.emf.ecore.EObject;

 

 /**

- * <!-- begin-user-doc -->

- * The <b>Adapter Factory</b> for the model.

- * It provides an adapter <code>createXXX</code> method for each class of the model.

- * <!-- end-user-doc -->

+ * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter

+ * <code>createXXX</code> method for each class of the model. <!-- end-user-doc -->

+ * 

  * @see org.eclipse.emf.compare.uml2.internal.UMLComparePackage

  * @generated

  */

 public class UMLCompareAdapterFactory extends AdapterFactoryImpl {

 	/**

-	 * The cached model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected static UMLComparePackage modelPackage;

 

 	/**

-	 * Creates an instance of the adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public UMLCompareAdapterFactory() {

@@ -51,10 +56,10 @@ public class UMLCompareAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Returns whether this factory is applicable for the type of the object.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

-	 * <!-- end-user-doc -->

+	 * Returns whether this factory is applicable for the type of the object. <!-- begin-user-doc --> This

+	 * implementation returns <code>true</code> if the object is either the model's package or is an instance

+	 * object of the model. <!-- end-user-doc -->

+	 * 

 	 * @return whether this factory is applicable for the type of the object.

 	 * @generated

 	 */

@@ -70,88 +75,88 @@ public class UMLCompareAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * The switch that delegates to the <code>createXXX</code> methods.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * The switch that delegates to the <code>createXXX</code> methods. <!-- begin-user-doc --> <!--

+	 * end-user-doc -->

+	 * 

 	 * @generated

 	 */

-	protected UMLCompareSwitch<Adapter> modelSwitch =

-		new UMLCompareSwitch<Adapter>() {

-			@Override

-			public Adapter caseAssociationChange(AssociationChange object) {

-				return createAssociationChangeAdapter();

-			}

-			@Override

-			public Adapter caseDependencyChange(DependencyChange object) {

-				return createDependencyChangeAdapter();

-			}

-			@Override

-			public Adapter caseInterfaceRealizationChange(InterfaceRealizationChange object) {

-				return createInterfaceRealizationChangeAdapter();

-			}

-			@Override

-			public Adapter caseSubstitutionChange(SubstitutionChange object) {

-				return createSubstitutionChangeAdapter();

-			}

-			@Override

-			public Adapter caseExtendChange(ExtendChange object) {

-				return createExtendChangeAdapter();

-			}

-			@Override

-			public Adapter caseIncludeChange(IncludeChange object) {

-				return createIncludeChangeAdapter();

-			}

-			@Override

-			public Adapter caseGeneralizationSetChange(GeneralizationSetChange object) {

-				return createGeneralizationSetChangeAdapter();

-			}

-			@Override

-			public Adapter caseExecutionSpecificationChange(ExecutionSpecificationChange object) {

-				return createExecutionSpecificationChangeAdapter();

-			}

-			@Override

-			public Adapter caseIntervalConstraintChange(IntervalConstraintChange object) {

-				return createIntervalConstraintChangeAdapter();

-			}

-			@Override

-			public Adapter caseMessageChange(MessageChange object) {

-				return createMessageChangeAdapter();

-			}

-			@Override

-			public Adapter caseStereotypePropertyChange(StereotypePropertyChange object) {

-				return createStereotypePropertyChangeAdapter();

-			}

-			@Override

-			public Adapter caseStereotypeApplicationChange(StereotypeApplicationChange object) {

-				return createStereotypeApplicationChangeAdapter();

-			}

-			@Override

-			public Adapter caseStereotypeReferenceChange(StereotypeReferenceChange object) {

-				return createStereotypeReferenceChangeAdapter();

-			}

-			@Override

-			public Adapter caseProfileApplicationChange(ProfileApplicationChange object) {

-				return createProfileApplicationChangeAdapter();

-			}

-			@Override

-			public Adapter caseUMLDiff(UMLDiff object) {

-				return createUMLDiffAdapter();

-			}

-			@Override

-			public Adapter caseDiff(Diff object) {

-				return createDiffAdapter();

-			}

-			@Override

-			public Adapter defaultCase(EObject object) {

-				return createEObjectAdapter();

-			}

-		};

+	protected UMLCompareSwitch<Adapter> modelSwitch = new UMLCompareSwitch<Adapter>() {

+		@Override

+		public Adapter caseAssociationChange(AssociationChange object) {

+			return createAssociationChangeAdapter();

+		}

+

+		@Override

+		public Adapter caseExtendChange(ExtendChange object) {

+			return createExtendChangeAdapter();

+		}

+

+		@Override

+		public Adapter caseGeneralizationSetChange(GeneralizationSetChange object) {

+			return createGeneralizationSetChangeAdapter();

+		}

+

+		@Override

+		public Adapter caseExecutionSpecificationChange(ExecutionSpecificationChange object) {

+			return createExecutionSpecificationChangeAdapter();

+		}

+

+		@Override

+		public Adapter caseIntervalConstraintChange(IntervalConstraintChange object) {

+			return createIntervalConstraintChangeAdapter();

+		}

+

+		@Override

+		public Adapter caseMessageChange(MessageChange object) {

+			return createMessageChangeAdapter();

+		}

+

+		@Override

+		public Adapter caseStereotypePropertyChange(StereotypePropertyChange object) {

+			return createStereotypePropertyChangeAdapter();

+		}

+

+		@Override

+		public Adapter caseStereotypeApplicationChange(StereotypeApplicationChange object) {

+			return createStereotypeApplicationChangeAdapter();

+		}

+

+		@Override

+		public Adapter caseStereotypeReferenceChange(StereotypeReferenceChange object) {

+			return createStereotypeReferenceChangeAdapter();

+		}

+

+		@Override

+		public Adapter caseProfileApplicationChange(ProfileApplicationChange object) {

+			return createProfileApplicationChangeAdapter();

+		}

+

+		@Override

+		public Adapter caseDirectedRelationshipChange(DirectedRelationshipChange object) {

+			return createDirectedRelationshipChangeAdapter();

+		}

+

+		@Override

+		public Adapter caseUMLDiff(UMLDiff object) {

+			return createUMLDiffAdapter();

+		}

+

+		@Override

+		public Adapter caseDiff(Diff object) {

+			return createDiffAdapter();

+		}

+

+		@Override

+		public Adapter defaultCase(EObject object) {

+			return createEObjectAdapter();

+		}

+	};

 

 	/**

-	 * Creates an adapter for the <code>target</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * @param target the object to adapt.

+	 * Creates an adapter for the <code>target</code>. <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

+	 * @param target

+	 *            the object to adapt.

 	 * @return the adapter for the <code>target</code>.

 	 * @generated

 	 */

@@ -160,13 +165,12 @@ public class UMLCompareAdapterFactory extends AdapterFactoryImpl {
 		return modelSwitch.doSwitch((EObject)target);

 	}

 

-

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.internal.AssociationChange <em>Association Change</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

+	 * Creates a new adapter for an object of class '

+	 * {@link org.eclipse.emf.compare.uml2.internal.AssociationChange <em>Association Change</em>}'. <!--

+	 * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's

+	 * useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.emf.compare.uml2.internal.AssociationChange

 	 * @generated

@@ -176,53 +180,11 @@ public class UMLCompareAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.internal.DependencyChange <em>Dependency Change</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.emf.compare.uml2.internal.DependencyChange

-	 * @generated

-	 */

-	public Adapter createDependencyChangeAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.internal.InterfaceRealizationChange <em>Interface Realization Change</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.emf.compare.uml2.internal.InterfaceRealizationChange

-	 * @generated

-	 */

-	public Adapter createInterfaceRealizationChangeAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.internal.SubstitutionChange <em>Substitution Change</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.emf.compare.uml2.internal.SubstitutionChange

-	 * @generated

-	 */

-	public Adapter createSubstitutionChangeAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.internal.ExtendChange <em>Extend Change</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

+	 * Creates a new adapter for an object of class '

+	 * {@link org.eclipse.emf.compare.uml2.internal.ExtendChange <em>Extend Change</em>}'. <!-- begin-user-doc

+	 * --> This default implementation returns null so that we can easily ignore cases; it's useful to ignore

+	 * a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.emf.compare.uml2.internal.ExtendChange

 	 * @generated

@@ -232,25 +194,12 @@ public class UMLCompareAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.internal.IncludeChange <em>Include Change</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * @return the new adapter.

-	 * @see org.eclipse.emf.compare.uml2.internal.IncludeChange

-	 * @generated

-	 */

-	public Adapter createIncludeChangeAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.internal.GeneralizationSetChange <em>Generalization Set Change</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

+	 * Creates a new adapter for an object of class '

+	 * {@link org.eclipse.emf.compare.uml2.internal.GeneralizationSetChange

+	 * <em>Generalization Set Change</em>}'. <!-- begin-user-doc --> This default implementation returns null

+	 * so that we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the

+	 * cases anyway. <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.emf.compare.uml2.internal.GeneralizationSetChange

 	 * @generated

@@ -260,11 +209,12 @@ public class UMLCompareAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.internal.ExecutionSpecificationChange <em>Execution Specification Change</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

+	 * Creates a new adapter for an object of class '

+	 * {@link org.eclipse.emf.compare.uml2.internal.ExecutionSpecificationChange

+	 * <em>Execution Specification Change</em>}'. <!-- begin-user-doc --> This default implementation returns

+	 * null so that we can easily ignore cases; it's useful to ignore a case when inheritance will catch all

+	 * the cases anyway. <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.emf.compare.uml2.internal.ExecutionSpecificationChange

 	 * @generated

@@ -274,11 +224,12 @@ public class UMLCompareAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.internal.IntervalConstraintChange <em>Interval Constraint Change</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

+	 * Creates a new adapter for an object of class '

+	 * {@link org.eclipse.emf.compare.uml2.internal.IntervalConstraintChange

+	 * <em>Interval Constraint Change</em>}'. <!-- begin-user-doc --> This default implementation returns null

+	 * so that we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the

+	 * cases anyway. <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.emf.compare.uml2.internal.IntervalConstraintChange

 	 * @generated

@@ -288,11 +239,11 @@ public class UMLCompareAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.internal.MessageChange <em>Message Change</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

+	 * Creates a new adapter for an object of class '

+	 * {@link org.eclipse.emf.compare.uml2.internal.MessageChange <em>Message Change</em>}'. <!--

+	 * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's

+	 * useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.emf.compare.uml2.internal.MessageChange

 	 * @generated

@@ -302,11 +253,12 @@ public class UMLCompareAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.internal.StereotypePropertyChange <em>Stereotype Property Change</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

+	 * Creates a new adapter for an object of class '

+	 * {@link org.eclipse.emf.compare.uml2.internal.StereotypePropertyChange

+	 * <em>Stereotype Property Change</em>}'. <!-- begin-user-doc --> This default implementation returns null

+	 * so that we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the

+	 * cases anyway. <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.emf.compare.uml2.internal.StereotypePropertyChange

 	 * @generated

@@ -316,11 +268,12 @@ public class UMLCompareAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.internal.StereotypeApplicationChange <em>Stereotype Application Change</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

+	 * Creates a new adapter for an object of class '

+	 * {@link org.eclipse.emf.compare.uml2.internal.StereotypeApplicationChange

+	 * <em>Stereotype Application Change</em>}'. <!-- begin-user-doc --> This default implementation returns

+	 * null so that we can easily ignore cases; it's useful to ignore a case when inheritance will catch all

+	 * the cases anyway. <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.emf.compare.uml2.internal.StereotypeApplicationChange

 	 * @generated

@@ -330,11 +283,12 @@ public class UMLCompareAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.internal.StereotypeReferenceChange <em>Stereotype Reference Change</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

+	 * Creates a new adapter for an object of class '

+	 * {@link org.eclipse.emf.compare.uml2.internal.StereotypeReferenceChange

+	 * <em>Stereotype Reference Change</em>}'. <!-- begin-user-doc --> This default implementation returns

+	 * null so that we can easily ignore cases; it's useful to ignore a case when inheritance will catch all

+	 * the cases anyway. <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.emf.compare.uml2.internal.StereotypeReferenceChange

 	 * @generated

@@ -344,11 +298,12 @@ public class UMLCompareAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.internal.ProfileApplicationChange <em>Profile Application Change</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

+	 * Creates a new adapter for an object of class '

+	 * {@link org.eclipse.emf.compare.uml2.internal.ProfileApplicationChange

+	 * <em>Profile Application Change</em>}'. <!-- begin-user-doc --> This default implementation returns null

+	 * so that we can easily ignore cases; it's useful to ignore a case when inheritance will catch all the

+	 * cases anyway. <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.emf.compare.uml2.internal.ProfileApplicationChange

 	 * @generated

@@ -358,11 +313,26 @@ public class UMLCompareAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.internal.UMLDiff <em>UML Diff</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

+	 * Creates a new adapter for an object of class '

+	 * {@link org.eclipse.emf.compare.uml2.internal.DirectedRelationshipChange

+	 * <em>Directed Relationship Change</em>}'. <!-- begin-user-doc --> This default implementation returns

+	 * null so that we can easily ignore cases; it's useful to ignore a case when inheritance will catch all

+	 * the cases anyway. <!-- end-user-doc -->

+	 * 

+	 * @return the new adapter.

+	 * @see org.eclipse.emf.compare.uml2.internal.DirectedRelationshipChange

+	 * @generated

+	 */

+	public Adapter createDirectedRelationshipChangeAdapter() {

+		return null;

+	}

+

+	/**

+	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.uml2.internal.UMLDiff

+	 * <em>UML Diff</em>}'. <!-- begin-user-doc --> This default implementation returns null so that we can

+	 * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.emf.compare.uml2.internal.UMLDiff

 	 * @generated

@@ -372,11 +342,10 @@ public class UMLCompareAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.Diff <em>Diff</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

+	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.Diff <em>Diff</em>}'. <!--

+	 * begin-user-doc --> This default implementation returns null so that we can easily ignore cases; it's

+	 * useful to ignore a case when inheritance will catch all the cases anyway. <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.emf.compare.Diff

 	 * @generated

@@ -386,10 +355,9 @@ public class UMLCompareAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for the default case.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null.

-	 * <!-- end-user-doc -->

+	 * Creates a new adapter for the default case. <!-- begin-user-doc --> This default implementation returns

+	 * null. <!-- end-user-doc -->

+	 * 

 	 * @return the new adapter.

 	 * @generated

 	 */

@@ -397,4 +365,4 @@ public class UMLCompareAdapterFactory extends AdapterFactoryImpl {
 		return null;

 	}

 

-} //UMLCompareAdapterFactory

+} // UMLCompareAdapterFactory

diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/util/UMLCompareSwitch.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/util/UMLCompareSwitch.java
index f9faa3205..ccac51fb4 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/util/UMLCompareSwitch.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/internal/util/UMLCompareSwitch.java
@@ -1,5 +1,5 @@
 /**

- * Copyright (c) 2012 Obeo.

+ * Copyright (c) 2012, 2013 Obeo.

  * All rights reserved. This program and the accompanying materials

  * are made available under the terms of the Eclipse Public License v1.0

  * which accompanies this distribution, and is available at

@@ -13,38 +13,42 @@ package org.eclipse.emf.compare.uml2.internal.util;
 import java.util.List;

 

 import org.eclipse.emf.compare.Diff;

-

-import org.eclipse.emf.compare.uml2.internal.*;

-

+import org.eclipse.emf.compare.uml2.internal.AssociationChange;

+import org.eclipse.emf.compare.uml2.internal.DirectedRelationshipChange;

+import org.eclipse.emf.compare.uml2.internal.ExecutionSpecificationChange;

+import org.eclipse.emf.compare.uml2.internal.ExtendChange;

+import org.eclipse.emf.compare.uml2.internal.GeneralizationSetChange;

+import org.eclipse.emf.compare.uml2.internal.IntervalConstraintChange;

+import org.eclipse.emf.compare.uml2.internal.MessageChange;

+import org.eclipse.emf.compare.uml2.internal.ProfileApplicationChange;

+import org.eclipse.emf.compare.uml2.internal.StereotypeApplicationChange;

+import org.eclipse.emf.compare.uml2.internal.StereotypePropertyChange;

+import org.eclipse.emf.compare.uml2.internal.StereotypeReferenceChange;

+import org.eclipse.emf.compare.uml2.internal.UMLComparePackage;

+import org.eclipse.emf.compare.uml2.internal.UMLDiff;

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EObject;

 

 /**

- * <!-- begin-user-doc -->

- * The <b>Switch</b> for the model's inheritance hierarchy.

- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}

- * to invoke the <code>caseXXX</code> method for each class of the model,

- * starting with the actual class of the object

- * and proceeding up the inheritance hierarchy

- * until a non-null result is returned,

- * which is the result of the switch.

- * <!-- end-user-doc -->

+ * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance hierarchy. It supports the call

+ * {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the

+ * model, starting with the actual class of the object and proceeding up the inheritance hierarchy until a

+ * non-null result is returned, which is the result of the switch. <!-- end-user-doc -->

+ * 

  * @see org.eclipse.emf.compare.uml2.internal.UMLComparePackage

  * @generated

  */

 public class UMLCompareSwitch<T> {

 	/**

-	 * The cached model package

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	protected static UMLComparePackage modelPackage;

 

 	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * Creates an instance of the switch. <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @generated

 	 */

 	public UMLCompareSwitch() {

@@ -54,9 +58,9 @@ public class UMLCompareSwitch<T> {
 	}

 

 	/**

-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields

+	 * that result. <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the first non-null result returned by a <code>caseXXX</code> call.

 	 * @generated

 	 */

@@ -65,29 +69,25 @@ public class UMLCompareSwitch<T> {
 	}

 

 	/**

-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields

+	 * that result. <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the first non-null result returned by a <code>caseXXX</code> call.

 	 * @generated

 	 */

 	protected T doSwitch(EClass theEClass, EObject theEObject) {

 		if (theEClass.eContainer() == modelPackage) {

 			return doSwitch(theEClass.getClassifierID(), theEObject);

-		}

-		else {

+		} else {

 			List<EClass> eSuperTypes = theEClass.getESuperTypes();

-			return

-				eSuperTypes.isEmpty() ?

-					defaultCase(theEObject) :

-					doSwitch(eSuperTypes.get(0), theEObject);

+			return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0), theEObject);

 		}

 	}

 

 	/**

-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields

+	 * that result. <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

 	 * @return the first non-null result returned by a <code>caseXXX</code> call.

 	 * @generated

 	 */

@@ -96,133 +96,180 @@ public class UMLCompareSwitch<T> {
 			case UMLComparePackage.ASSOCIATION_CHANGE: {

 				AssociationChange associationChange = (AssociationChange)theEObject;

 				T result = caseAssociationChange(associationChange);

-				if (result == null) result = caseUMLDiff(associationChange);

-				if (result == null) result = caseDiff(associationChange);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case UMLComparePackage.DEPENDENCY_CHANGE: {

-				DependencyChange dependencyChange = (DependencyChange)theEObject;

-				T result = caseDependencyChange(dependencyChange);

-				if (result == null) result = caseUMLDiff(dependencyChange);

-				if (result == null) result = caseDiff(dependencyChange);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case UMLComparePackage.INTERFACE_REALIZATION_CHANGE: {

-				InterfaceRealizationChange interfaceRealizationChange = (InterfaceRealizationChange)theEObject;

-				T result = caseInterfaceRealizationChange(interfaceRealizationChange);

-				if (result == null) result = caseUMLDiff(interfaceRealizationChange);

-				if (result == null) result = caseDiff(interfaceRealizationChange);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case UMLComparePackage.SUBSTITUTION_CHANGE: {

-				SubstitutionChange substitutionChange = (SubstitutionChange)theEObject;

-				T result = caseSubstitutionChange(substitutionChange);

-				if (result == null) result = caseUMLDiff(substitutionChange);

-				if (result == null) result = caseDiff(substitutionChange);

-				if (result == null) result = defaultCase(theEObject);

+				if (result == null) {

+					result = caseUMLDiff(associationChange);

+				}

+				if (result == null) {

+					result = caseDiff(associationChange);

+				}

+				if (result == null) {

+					result = defaultCase(theEObject);

+				}

 				return result;

 			}

 			case UMLComparePackage.EXTEND_CHANGE: {

 				ExtendChange extendChange = (ExtendChange)theEObject;

 				T result = caseExtendChange(extendChange);

-				if (result == null) result = caseUMLDiff(extendChange);

-				if (result == null) result = caseDiff(extendChange);

-				if (result == null) result = defaultCase(theEObject);

-				return result;

-			}

-			case UMLComparePackage.INCLUDE_CHANGE: {

-				IncludeChange includeChange = (IncludeChange)theEObject;

-				T result = caseIncludeChange(includeChange);

-				if (result == null) result = caseUMLDiff(includeChange);

-				if (result == null) result = caseDiff(includeChange);

-				if (result == null) result = defaultCase(theEObject);

+				if (result == null) {

+					result = caseUMLDiff(extendChange);

+				}

+				if (result == null) {

+					result = caseDiff(extendChange);

+				}

+				if (result == null) {

+					result = defaultCase(theEObject);

+				}

 				return result;

 			}

 			case UMLComparePackage.GENERALIZATION_SET_CHANGE: {

 				GeneralizationSetChange generalizationSetChange = (GeneralizationSetChange)theEObject;

 				T result = caseGeneralizationSetChange(generalizationSetChange);

-				if (result == null) result = caseUMLDiff(generalizationSetChange);

-				if (result == null) result = caseDiff(generalizationSetChange);

-				if (result == null) result = defaultCase(theEObject);

+				if (result == null) {

+					result = caseUMLDiff(generalizationSetChange);

+				}

+				if (result == null) {

+					result = caseDiff(generalizationSetChange);

+				}

+				if (result == null) {

+					result = defaultCase(theEObject);

+				}

 				return result;

 			}

 			case UMLComparePackage.EXECUTION_SPECIFICATION_CHANGE: {

 				ExecutionSpecificationChange executionSpecificationChange = (ExecutionSpecificationChange)theEObject;

 				T result = caseExecutionSpecificationChange(executionSpecificationChange);

-				if (result == null) result = caseUMLDiff(executionSpecificationChange);

-				if (result == null) result = caseDiff(executionSpecificationChange);

-				if (result == null) result = defaultCase(theEObject);

+				if (result == null) {

+					result = caseUMLDiff(executionSpecificationChange);

+				}

+				if (result == null) {

+					result = caseDiff(executionSpecificationChange);

+				}

+				if (result == null) {

+					result = defaultCase(theEObject);

+				}

 				return result;

 			}

 			case UMLComparePackage.INTERVAL_CONSTRAINT_CHANGE: {

 				IntervalConstraintChange intervalConstraintChange = (IntervalConstraintChange)theEObject;

 				T result = caseIntervalConstraintChange(intervalConstraintChange);

-				if (result == null) result = caseUMLDiff(intervalConstraintChange);

-				if (result == null) result = caseDiff(intervalConstraintChange);

-				if (result == null) result = defaultCase(theEObject);

+				if (result == null) {

+					result = caseUMLDiff(intervalConstraintChange);

+				}

+				if (result == null) {

+					result = caseDiff(intervalConstraintChange);

+				}

+				if (result == null) {

+					result = defaultCase(theEObject);

+				}

 				return result;

 			}

 			case UMLComparePackage.MESSAGE_CHANGE: {

 				MessageChange messageChange = (MessageChange)theEObject;

 				T result = caseMessageChange(messageChange);

-				if (result == null) result = caseUMLDiff(messageChange);

-				if (result == null) result = caseDiff(messageChange);

-				if (result == null) result = defaultCase(theEObject);

+				if (result == null) {

+					result = caseUMLDiff(messageChange);

+				}

+				if (result == null) {

+					result = caseDiff(messageChange);

+				}

+				if (result == null) {

+					result = defaultCase(theEObject);

+				}

 				return result;

 			}

 			case UMLComparePackage.STEREOTYPE_PROPERTY_CHANGE: {

 				StereotypePropertyChange stereotypePropertyChange = (StereotypePropertyChange)theEObject;

 				T result = caseStereotypePropertyChange(stereotypePropertyChange);

-				if (result == null) result = caseUMLDiff(stereotypePropertyChange);

-				if (result == null) result = caseDiff(stereotypePropertyChange);

-				if (result == null) result = defaultCase(theEObject);

+				if (result == null) {

+					result = caseUMLDiff(stereotypePropertyChange);

+				}

+				if (result == null) {

+					result = caseDiff(stereotypePropertyChange);

+				}

+				if (result == null) {

+					result = defaultCase(theEObject);

+				}

 				return result;

 			}

 			case UMLComparePackage.STEREOTYPE_APPLICATION_CHANGE: {

 				StereotypeApplicationChange stereotypeApplicationChange = (StereotypeApplicationChange)theEObject;

 				T result = caseStereotypeApplicationChange(stereotypeApplicationChange);

-				if (result == null) result = caseUMLDiff(stereotypeApplicationChange);

-				if (result == null) result = caseDiff(stereotypeApplicationChange);

-				if (result == null) result = defaultCase(theEObject);

+				if (result == null) {

+					result = caseUMLDiff(stereotypeApplicationChange);

+				}

+				if (result == null) {

+					result = caseDiff(stereotypeApplicationChange);

+				}

+				if (result == null) {

+					result = defaultCase(theEObject);

+				}

 				return result;

 			}

 			case UMLComparePackage.STEREOTYPE_REFERENCE_CHANGE: {

 				StereotypeReferenceChange stereotypeReferenceChange = (StereotypeReferenceChange)theEObject;

 				T result = caseStereotypeReferenceChange(stereotypeReferenceChange);

-				if (result == null) result = caseUMLDiff(stereotypeReferenceChange);

-				if (result == null) result = caseDiff(stereotypeReferenceChange);

-				if (result == null) result = defaultCase(theEObject);

+				if (result == null) {

+					result = caseUMLDiff(stereotypeReferenceChange);

+				}

+				if (result == null) {

+					result = caseDiff(stereotypeReferenceChange);

+				}

+				if (result == null) {

+					result = defaultCase(theEObject);

+				}

 				return result;

 			}

 			case UMLComparePackage.PROFILE_APPLICATION_CHANGE: {

 				ProfileApplicationChange profileApplicationChange = (ProfileApplicationChange)theEObject;

 				T result = caseProfileApplicationChange(profileApplicationChange);

-				if (result == null) result = caseUMLDiff(profileApplicationChange);

-				if (result == null) result = caseDiff(profileApplicationChange);

-				if (result == null) result = defaultCase(theEObject);

+				if (result == null) {

+					result = caseUMLDiff(profileApplicationChange);

+				}

+				if (result == null) {

+					result = caseDiff(profileApplicationChange);

+				}

+				if (result == null) {

+					result = defaultCase(theEObject);

+				}

+				return result;

+			}

+			case UMLComparePackage.DIRECTED_RELATIONSHIP_CHANGE: {

+				DirectedRelationshipChange directedRelationshipChange = (DirectedRelationshipChange)theEObject;

+				T result = caseDirectedRelationshipChange(directedRelationshipChange);

+				if (result == null) {

+					result = caseUMLDiff(directedRelationshipChange);

+				}

+				if (result == null) {

+					result = caseDiff(directedRelationshipChange);

+				}

+				if (result == null) {

+					result = defaultCase(theEObject);

+				}

 				return result;

 			}

 			case UMLComparePackage.UML_DIFF: {

 				UMLDiff umlDiff = (UMLDiff)theEObject;

 				T result = caseUMLDiff(umlDiff);

-				if (result == null) result = caseDiff(umlDiff);

-				if (result == null) result = defaultCase(theEObject);

+				if (result == null) {

+					result = caseDiff(umlDiff);

+				}

+				if (result == null) {

+					result = defaultCase(theEObject);

+				}

 				return result;

 			}

-			default: return defaultCase(theEObject);

+			default:

+				return defaultCase(theEObject);

 		}

 	}

 

 	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Association Change</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * Returns the result of interpreting the object as an instance of '<em>Association Change</em>'. <!--

+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the

+	 * switch. <!-- end-user-doc -->

+	 * 

+	 * @param object

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Association Change</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -232,57 +279,12 @@ public class UMLCompareSwitch<T> {
 	}

 

 	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Dependency Change</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Dependency Change</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseDependencyChange(DependencyChange object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Interface Realization Change</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Interface Realization Change</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseInterfaceRealizationChange(InterfaceRealizationChange object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Substitution Change</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Substitution Change</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseSubstitutionChange(SubstitutionChange object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Extend Change</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * Returns the result of interpreting the object as an instance of '<em>Extend Change</em>'. <!--

+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the

+	 * switch. <!-- end-user-doc -->

+	 * 

+	 * @param object

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Extend Change</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -292,27 +294,12 @@ public class UMLCompareSwitch<T> {
 	}

 

 	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Include Change</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Include Change</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseIncludeChange(IncludeChange object) {

-		return null;

-	}

-

-	/**

 	 * Returns the result of interpreting the object as an instance of '<em>Generalization Set Change</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * <!-- begin-user-doc --> This implementation returns null; returning a non-null result will terminate

+	 * the switch. <!-- end-user-doc -->

+	 * 

+	 * @param object

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Generalization Set Change</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -322,13 +309,14 @@ public class UMLCompareSwitch<T> {
 	}

 

 	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Execution Specification Change</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Execution Specification Change</em>'.

+	 * Returns the result of interpreting the object as an instance of '

+	 * <em>Execution Specification Change</em>'. <!-- begin-user-doc --> This implementation returns null;

+	 * returning a non-null result will terminate the switch. <!-- end-user-doc -->

+	 * 

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '

+	 *         <em>Execution Specification Change</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

 	 */

@@ -338,11 +326,11 @@ public class UMLCompareSwitch<T> {
 

 	/**

 	 * Returns the result of interpreting the object as an instance of '<em>Interval Constraint Change</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * <!-- begin-user-doc --> This implementation returns null; returning a non-null result will terminate

+	 * the switch. <!-- end-user-doc -->

+	 * 

+	 * @param object

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Interval Constraint Change</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -352,12 +340,12 @@ public class UMLCompareSwitch<T> {
 	}

 

 	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Message Change</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * Returns the result of interpreting the object as an instance of '<em>Message Change</em>'. <!--

+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the

+	 * switch. <!-- end-user-doc -->

+	 * 

+	 * @param object

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Message Change</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -368,11 +356,11 @@ public class UMLCompareSwitch<T> {
 

 	/**

 	 * Returns the result of interpreting the object as an instance of '<em>Stereotype Property Change</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * <!-- begin-user-doc --> This implementation returns null; returning a non-null result will terminate

+	 * the switch. <!-- end-user-doc -->

+	 * 

+	 * @param object

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Stereotype Property Change</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -382,13 +370,14 @@ public class UMLCompareSwitch<T> {
 	}

 

 	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Stereotype Application Change</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Stereotype Application Change</em>'.

+	 * Returns the result of interpreting the object as an instance of '<em>Stereotype Application Change</em>

+	 * '. <!-- begin-user-doc --> This implementation returns null; returning a non-null result will terminate

+	 * the switch. <!-- end-user-doc -->

+	 * 

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Stereotype Application Change</em>

+	 *         '.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

 	 */

@@ -398,11 +387,11 @@ public class UMLCompareSwitch<T> {
 

 	/**

 	 * Returns the result of interpreting the object as an instance of '<em>Stereotype Reference Change</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * <!-- begin-user-doc --> This implementation returns null; returning a non-null result will terminate

+	 * the switch. <!-- end-user-doc -->

+	 * 

+	 * @param object

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Stereotype Reference Change</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -413,11 +402,11 @@ public class UMLCompareSwitch<T> {
 

 	/**

 	 * Returns the result of interpreting the object as an instance of '<em>Profile Application Change</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * <!-- begin-user-doc --> This implementation returns null; returning a non-null result will terminate

+	 * the switch. <!-- end-user-doc -->

+	 * 

+	 * @param object

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Profile Application Change</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -427,12 +416,28 @@ public class UMLCompareSwitch<T> {
 	}

 

 	/**

-	 * Returns the result of interpreting the object as an instance of '<em>UML Diff</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * Returns the result of interpreting the object as an instance of '<em>Directed Relationship Change</em>

+	 * '. <!-- begin-user-doc --> This implementation returns null; returning a non-null result will terminate

+	 * the switch. <!-- end-user-doc -->

+	 * 

+	 * @param object

+	 *            the target of the switch.

+	 * @return the result of interpreting the object as an instance of '<em>Directed Relationship Change</em>

+	 *         '.

+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

+	 * @generated

+	 */

+	public T caseDirectedRelationshipChange(DirectedRelationshipChange object) {

+		return null;

+	}

+

+	/**

+	 * Returns the result of interpreting the object as an instance of '<em>UML Diff</em>'. <!--

+	 * begin-user-doc --> This implementation returns null; returning a non-null result will terminate the

+	 * switch. <!-- end-user-doc -->

+	 * 

+	 * @param object

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>UML Diff</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -442,12 +447,12 @@ public class UMLCompareSwitch<T> {
 	}

 

 	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Diff</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * Returns the result of interpreting the object as an instance of '<em>Diff</em>'. <!-- begin-user-doc

+	 * --> This implementation returns null; returning a non-null result will terminate the switch. <!--

+	 * end-user-doc -->

+	 * 

+	 * @param object

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Diff</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -457,12 +462,12 @@ public class UMLCompareSwitch<T> {
 	}

 

 	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch, but this is the last case anyway.

-	 * <!-- end-user-doc -->

-	 * @param object the target of the switch.

+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. <!-- begin-user-doc

+	 * --> This implementation returns null; returning a non-null result will terminate the switch, but this

+	 * is the last case anyway. <!-- end-user-doc -->

+	 * 

+	 * @param object

+	 *            the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

 	 * @generated

@@ -471,4 +476,4 @@ public class UMLCompareSwitch<T> {
 		return null;

 	}

 

-} //UMLCompareSwitch

+} // UMLCompareSwitch

diff --git a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/clazz/UMLDependencyChangeFactory.java b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/UMLDirectedRelationshipFactory.java
index 638000741..d2c9ac97e 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/clazz/UMLDependencyChangeFactory.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/UMLDirectedRelationshipFactory.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Obeo - initial API and implementation

  *******************************************************************************/

-package org.eclipse.emf.compare.uml2.internal.postprocessor.extension.clazz;

+package org.eclipse.emf.compare.uml2.internal.postprocessor.extension;

 

 import static com.google.common.base.Predicates.instanceOf;

 

@@ -21,23 +21,22 @@ import java.util.Set;
 

 import org.eclipse.emf.compare.Diff;

 import org.eclipse.emf.compare.ReferenceChange;

-import org.eclipse.emf.compare.uml2.internal.DependencyChange;

+import org.eclipse.emf.compare.uml2.internal.DirectedRelationshipChange;

 import org.eclipse.emf.compare.uml2.internal.UMLCompareFactory;

 import org.eclipse.emf.compare.uml2.internal.UMLDiff;

 import org.eclipse.emf.compare.uml2.internal.postprocessor.AbstractUMLChangeFactory;

-import org.eclipse.emf.compare.utils.MatchUtil;

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.util.Switch;

-import org.eclipse.uml2.uml.Dependency;

+import org.eclipse.uml2.uml.DirectedRelationship;

 import org.eclipse.uml2.uml.UMLPackage;

 

 /**

- * Factory for Dependency changes.

+ * Factory for DirectedRelationship changes.

  * 

  * @author <a href="mailto:cedric.notot@obeo.fr">Cedric Notot</a>

  */

-public class UMLDependencyChangeFactory extends AbstractUMLChangeFactory {

+public class UMLDirectedRelationshipFactory extends AbstractUMLChangeFactory {

 

 	/**

 	 * {@inheritDoc}

@@ -46,7 +45,7 @@ public class UMLDependencyChangeFactory extends AbstractUMLChangeFactory {
 	 */

 	@Override

 	public Class<? extends UMLDiff> getExtensionKind() {

-		return DependencyChange.class;

+		return DirectedRelationshipChange.class;

 	}

 

 	/**

@@ -56,7 +55,7 @@ public class UMLDependencyChangeFactory extends AbstractUMLChangeFactory {
 	 */

 	@Override

 	public UMLDiff createExtension() {

-		return UMLCompareFactory.eINSTANCE.createDependencyChange();

+		return UMLCompareFactory.eINSTANCE.createDirectedRelationshipChange();

 	}

 

 	/**

@@ -66,7 +65,7 @@ public class UMLDependencyChangeFactory extends AbstractUMLChangeFactory {
 	 */

 	@Override

 	protected EObject getDiscriminant(Diff input) {

-		return Iterables.find(getDiscriminants(input), instanceOf(Dependency.class), null);

+		return Iterables.find(getDiscriminants(input), instanceOf(DirectedRelationship.class), null);

 	}

 

 	/**

@@ -79,7 +78,7 @@ public class UMLDependencyChangeFactory extends AbstractUMLChangeFactory {
 		return new DiscriminantsGetter() {

 

 			@Override

-			public Set<EObject> caseDependency(Dependency object) {

+			public Set<EObject> caseDirectedRelationship(DirectedRelationship object) {

 				Set<EObject> result = new HashSet<EObject>();

 				result.add(object);

 				return result;

@@ -95,45 +94,35 @@ public class UMLDependencyChangeFactory extends AbstractUMLChangeFactory {
 	 */

 	protected List<EClass> getManagedConcreteDiscriminantKind() {

 		final List<EClass> result = new ArrayList<EClass>();

+

 		result.add(UMLPackage.Literals.DEPENDENCY);

 		result.add(UMLPackage.Literals.ABSTRACTION);

 		result.add(UMLPackage.Literals.USAGE);

 		result.add(UMLPackage.Literals.REALIZATION);

+

+		result.add(UMLPackage.Literals.INTERFACE_REALIZATION);

+

+		result.add(UMLPackage.Literals.SUBSTITUTION);

+

+		result.add(UMLPackage.Literals.DIRECTED_RELATIONSHIP);

+		result.add(UMLPackage.Literals.GENERALIZATION);

+		result.add(UMLPackage.Literals.INCLUDE);

+		result.add(UMLPackage.Literals.ELEMENT_IMPORT);

+		result.add(UMLPackage.Literals.INFORMATION_FLOW);

+		result.add(UMLPackage.Literals.PACKAGE_IMPORT);

 		return result;

 	}

 

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.emf.compare.uml2.internal.postprocessor.AbstractUMLChangeFactory#isRelatedToAnExtensionAdd(org.eclipse.emf.compare.ReferenceChange)

-	 */

 	@Override

 	protected boolean isRelatedToAnExtensionAdd(ReferenceChange input) {

 		return super.isRelatedToAnExtensionAdd(input)

 				&& getManagedConcreteDiscriminantKind().contains(input.getValue().eClass());

 	}

 

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.emf.compare.uml2.internal.postprocessor.AbstractUMLChangeFactory#isRelatedToAnExtensionDelete(org.eclipse.emf.compare.ReferenceChange)

-	 */

 	@Override

 	protected boolean isRelatedToAnExtensionDelete(ReferenceChange input) {

 		return super.isRelatedToAnExtensionDelete(input)

 				&& getManagedConcreteDiscriminantKind().contains(input.getValue().eClass());

 	}

 

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.emf.compare.uml2.internal.postprocessor.AbstractUMLChangeFactory#isRelatedToAnExtensionChange(org.eclipse.emf.compare.ReferenceChange)

-	 */

-	@Override

-	protected boolean isRelatedToAnExtensionChange(ReferenceChange input) {

-		return super.isRelatedToAnExtensionChange(input)

-				&& getManagedConcreteDiscriminantKind().contains(

-						MatchUtil.getContainer(input.getMatch().getComparison(), input).eClass());

-	}

-

 }

diff --git a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/UMLExtensionFactoryRegistry.java b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/UMLExtensionFactoryRegistry.java
index 4adb24877..2ed01b213 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/UMLExtensionFactoryRegistry.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/UMLExtensionFactoryRegistry.java
@@ -19,17 +19,13 @@ import java.util.Map;
 import org.eclipse.emf.compare.Diff;
 import org.eclipse.emf.compare.internal.postprocessor.factories.IChangeFactory;
 import org.eclipse.emf.compare.uml2.internal.postprocessor.extension.clazz.UMLAssociationChangeFactory;
-import org.eclipse.emf.compare.uml2.internal.postprocessor.extension.clazz.UMLDependencyChangeFactory;
 import org.eclipse.emf.compare.uml2.internal.postprocessor.extension.clazz.UMLGeneralizationSetChangeFactory;
-import org.eclipse.emf.compare.uml2.internal.postprocessor.extension.clazz.UMLInterfaceRealizationChangeFactory;
-import org.eclipse.emf.compare.uml2.internal.postprocessor.extension.clazz.UMLSubstitutionChangeFactory;
 import org.eclipse.emf.compare.uml2.internal.postprocessor.extension.profile.UMLProfileApplicationChangeFactory;
 import org.eclipse.emf.compare.uml2.internal.postprocessor.extension.profile.UMLStereotypeApplicationChangeFactory;
 import org.eclipse.emf.compare.uml2.internal.postprocessor.extension.sequence.UMLExecutionSpecificationChangeFactory;
 import org.eclipse.emf.compare.uml2.internal.postprocessor.extension.sequence.UMLIntervalConstraintChangeFactory;
 import org.eclipse.emf.compare.uml2.internal.postprocessor.extension.sequence.UMLMessageChangeFactory;
 import org.eclipse.emf.compare.uml2.internal.postprocessor.extension.usecase.UMLExtendChangeFactory;
-import org.eclipse.emf.compare.uml2.internal.postprocessor.extension.usecase.UMLIncludeChangeFactory;
 
 /**
  * Registry of all {@link IDiffExtensionFactory} for UML.
@@ -56,14 +52,11 @@ public final class UMLExtensionFactoryRegistry {
 
 		List<IChangeFactory> factories = new ArrayList<IChangeFactory>();
 		factories.add(new UMLAssociationChangeFactory());
-		factories.add(new UMLDependencyChangeFactory());
-		factories.add(new UMLInterfaceRealizationChangeFactory());
-		factories.add(new UMLSubstitutionChangeFactory());
+		factories.add(new UMLDirectedRelationshipFactory());
 		factories.add(new UMLGeneralizationSetChangeFactory());
 		factories.add(new UMLExtendChangeFactory());
 		factories.add(new UMLMessageChangeFactory());
 		factories.add(new UMLExecutionSpecificationChangeFactory());
-		factories.add(new UMLIncludeChangeFactory());
 		factories.add(new UMLIntervalConstraintChangeFactory());
 		factories.add(new UMLProfileApplicationChangeFactory());
 		factories.add(new UMLStereotypeApplicationChangeFactory());
diff --git a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/clazz/UMLInterfaceRealizationChangeFactory.java b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/clazz/UMLInterfaceRealizationChangeFactory.java
deleted file mode 100644
index 1b61c90d7..000000000
--- a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/clazz/UMLInterfaceRealizationChangeFactory.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2013 Obeo.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *     Obeo - initial API and implementation

- *******************************************************************************/

-package org.eclipse.emf.compare.uml2.internal.postprocessor.extension.clazz;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.emf.compare.ReferenceChange;

-import org.eclipse.emf.compare.uml2.internal.InterfaceRealizationChange;

-import org.eclipse.emf.compare.uml2.internal.UMLCompareFactory;

-import org.eclipse.emf.compare.uml2.internal.UMLDiff;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * Factory for Interface realization changes.

- * 

- * @author <a href="mailto:cedric.notot@obeo.fr">Cedric Notot</a>

- */

-public class UMLInterfaceRealizationChangeFactory extends UMLDependencyChangeFactory {

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.emf.compare.uml2.internal.postprocessor.extension.clazz.UMLDependencyChangeFactory#getExtensionKind()

-	 */

-	@Override

-	public Class<? extends UMLDiff> getExtensionKind() {

-		return InterfaceRealizationChange.class;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.emf.compare.uml2.internal.postprocessor.extension.clazz.UMLDependencyChangeFactory#createExtension()

-	 */

-	@Override

-	public UMLDiff createExtension() {

-		return UMLCompareFactory.eINSTANCE.createInterfaceRealizationChange();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.emf.compare.uml2.internal.postprocessor.extension.clazz.UMLDependencyChangeFactory#isRelatedToAnExtensionChange(org.eclipse.emf.compare.ReferenceChange)

-	 */

-	@Override

-	protected boolean isRelatedToAnExtensionChange(ReferenceChange input) {

-		return super.isRelatedToAnExtensionChange(input)

-				|| input.getReference().equals(UMLPackage.Literals.INTERFACE_REALIZATION__CONTRACT);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.emf.compare.uml2.internal.postprocessor.extension.clazz.UMLDependencyChangeFactory#getManagedConcreteDiscriminantKind()

-	 */

-	@Override

-	protected List<EClass> getManagedConcreteDiscriminantKind() {

-		final List<EClass> result = new ArrayList<EClass>();

-		result.add(UMLPackage.Literals.INTERFACE_REALIZATION);

-		return result;

-	}

-

-}

diff --git a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/clazz/UMLSubstitutionChangeFactory.java b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/clazz/UMLSubstitutionChangeFactory.java
deleted file mode 100644
index 4004c1d4d..000000000
--- a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/clazz/UMLSubstitutionChangeFactory.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2013 Obeo.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *     Obeo - initial API and implementation

- *******************************************************************************/

-package org.eclipse.emf.compare.uml2.internal.postprocessor.extension.clazz;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.emf.compare.ReferenceChange;

-import org.eclipse.emf.compare.uml2.internal.SubstitutionChange;

-import org.eclipse.emf.compare.uml2.internal.UMLCompareFactory;

-import org.eclipse.emf.compare.uml2.internal.UMLDiff;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.uml2.uml.UMLPackage;

-

-/**

- * Factory for Substitution changes.

- * 

- * @author <a href="mailto:cedric.notot@obeo.fr">Cedric Notot</a>

- */

-public class UMLSubstitutionChangeFactory extends UMLDependencyChangeFactory {

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.emf.compare.uml2.internal.postprocessor.extension.clazz.UMLDependencyChangeFactory#getExtensionKind()

-	 */

-	@Override

-	public Class<? extends UMLDiff> getExtensionKind() {

-		return SubstitutionChange.class;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.emf.compare.uml2.internal.postprocessor.extension.clazz.UMLDependencyChangeFactory#createExtension()

-	 */

-	@Override

-	public UMLDiff createExtension() {

-		return UMLCompareFactory.eINSTANCE.createSubstitutionChange();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.emf.compare.uml2.internal.postprocessor.extension.clazz.UMLDependencyChangeFactory#isRelatedToAnExtensionChange(org.eclipse.emf.compare.ReferenceChange)

-	 */

-	@Override

-	protected boolean isRelatedToAnExtensionChange(ReferenceChange input) {

-		return super.isRelatedToAnExtensionChange(input)

-				|| input.getReference().equals(UMLPackage.Literals.SUBSTITUTION__CONTRACT);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.emf.compare.uml2.internal.postprocessor.extension.clazz.UMLDependencyChangeFactory#getManagedConcreteDiscriminantKind()

-	 */

-	@Override

-	protected List<EClass> getManagedConcreteDiscriminantKind() {

-		final List<EClass> result = new ArrayList<EClass>();

-		result.add(UMLPackage.Literals.SUBSTITUTION);

-		return result;

-	}

-

-}

diff --git a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/usecase/UMLExtendChangeFactory.java b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/usecase/UMLExtendChangeFactory.java
index 7c71c58c9..6cd0bdc05 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/usecase/UMLExtendChangeFactory.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/usecase/UMLExtendChangeFactory.java
@@ -10,19 +10,18 @@
  *******************************************************************************/

 package org.eclipse.emf.compare.uml2.internal.postprocessor.extension.usecase;

 

-import static com.google.common.base.Predicates.instanceOf;

-

 import com.google.common.base.Predicate;

-import com.google.common.collect.Iterables;

 

+import java.util.ArrayList;

 import java.util.HashSet;

+import java.util.List;

 import java.util.Set;

 

-import org.eclipse.emf.compare.Diff;

 import org.eclipse.emf.compare.uml2.internal.ExtendChange;

 import org.eclipse.emf.compare.uml2.internal.UMLCompareFactory;

 import org.eclipse.emf.compare.uml2.internal.UMLDiff;

-import org.eclipse.emf.compare.uml2.internal.postprocessor.AbstractUMLChangeFactory;

+import org.eclipse.emf.compare.uml2.internal.postprocessor.extension.UMLDirectedRelationshipFactory;

+import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EStructuralFeature;

 import org.eclipse.emf.ecore.EStructuralFeature.Setting;

@@ -36,7 +35,27 @@ import org.eclipse.uml2.uml.UMLPackage;
  * 

  * @author <a href="mailto:cedric.notot@obeo.fr">Cedric Notot</a>

  */

-public class UMLExtendChangeFactory extends AbstractUMLChangeFactory {

+public class UMLExtendChangeFactory extends UMLDirectedRelationshipFactory {

+

+	/**

+	 * {@inheritDoc}

+	 * 

+	 * @see org.eclipse.emf.compare.uml2.internal.postprocessor.extension.clazz.UMLDependencyChangeFactory#getExtensionKind()

+	 */

+	@Override

+	public Class<? extends UMLDiff> getExtensionKind() {

+		return ExtendChange.class;

+	}

+

+	/**

+	 * {@inheritDoc}

+	 * 

+	 * @see org.eclipse.emf.compare.uml2.internal.postprocessor.extension.clazz.UMLDependencyChangeFactory#createExtension()

+	 */

+	@Override

+	public UMLDiff createExtension() {

+		return UMLCompareFactory.eINSTANCE.createExtendChange();

+	}

 

 	/**

 	 * Discriminants getter for the Extend change.

@@ -82,41 +101,23 @@ public class UMLExtendChangeFactory extends AbstractUMLChangeFactory {
 	/**

 	 * {@inheritDoc}

 	 * 

-	 * @see org.eclipse.emf.compare.internal.postprocessor.factories.AbstractChangeFactory#getExtensionKind()

-	 */

-	@Override

-	public Class<? extends UMLDiff> getExtensionKind() {

-		return ExtendChange.class;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.emf.compare.internal.postprocessor.factories.AbstractChangeFactory#createExtension()

-	 */

-	@Override

-	public UMLDiff createExtension() {

-		return UMLCompareFactory.eINSTANCE.createExtendChange();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.emf.compare.uml2.internal.postprocessor.AbstractUMLChangeFactory#getDiscriminant(org.eclipse.emf.compare.Diff)

+	 * @see org.eclipse.emf.compare.uml2.internal.postprocessor.AbstractUMLChangeFactory#getDiscriminantsGetter()

 	 */

 	@Override

-	protected EObject getDiscriminant(Diff input) {

-		return Iterables.find(getDiscriminants(input), instanceOf(Extend.class), null);

+	protected Switch<Set<EObject>> getDiscriminantsGetter() {

+		return new ExtendDiscriminantsGetter();

 	}

 

 	/**

 	 * {@inheritDoc}

 	 * 

-	 * @see org.eclipse.emf.compare.uml2.internal.postprocessor.AbstractUMLChangeFactory#getDiscriminantsGetter()

+	 * @see org.eclipse.emf.compare.uml2.internal.postprocessor.extension.clazz.UMLDependencyChangeFactory#getManagedConcreteDiscriminantKind()

 	 */

 	@Override

-	protected Switch<Set<EObject>> getDiscriminantsGetter() {

-		return new ExtendDiscriminantsGetter();

+	protected List<EClass> getManagedConcreteDiscriminantKind() {

+		final List<EClass> result = new ArrayList<EClass>();

+		result.add(UMLPackage.Literals.EXTEND);

+		return result;

 	}

 

 }

diff --git a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/usecase/UMLIncludeChangeFactory.java b/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/usecase/UMLIncludeChangeFactory.java
deleted file mode 100644
index 5a539ea6b..000000000
--- a/plugins/org.eclipse.emf.compare.uml2/src/org/eclipse/emf/compare/uml2/internal/postprocessor/extension/usecase/UMLIncludeChangeFactory.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2013 Obeo.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *     Obeo - initial API and implementation

- *******************************************************************************/

-package org.eclipse.emf.compare.uml2.internal.postprocessor.extension.usecase;

-

-import static com.google.common.base.Predicates.instanceOf;

-

-import com.google.common.collect.Iterables;

-

-import java.util.HashSet;

-import java.util.Set;

-

-import org.eclipse.emf.compare.Diff;

-import org.eclipse.emf.compare.uml2.internal.IncludeChange;

-import org.eclipse.emf.compare.uml2.internal.UMLCompareFactory;

-import org.eclipse.emf.compare.uml2.internal.UMLDiff;

-import org.eclipse.emf.compare.uml2.internal.postprocessor.AbstractUMLChangeFactory;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.util.Switch;

-import org.eclipse.uml2.uml.Include;

-

-/**

- * Factory for include changes.

- * 

- * @author <a href="mailto:cedric.notot@obeo.fr">Cedric Notot</a>

- */

-public class UMLIncludeChangeFactory extends AbstractUMLChangeFactory {

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.emf.compare.internal.postprocessor.factories.AbstractChangeFactory#getExtensionKind()

-	 */

-	@Override

-	public Class<? extends UMLDiff> getExtensionKind() {

-		return IncludeChange.class;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.emf.compare.internal.postprocessor.factories.AbstractChangeFactory#createExtension()

-	 */

-	@Override

-	public UMLDiff createExtension() {

-		return UMLCompareFactory.eINSTANCE.createIncludeChange();

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.emf.compare.uml2.internal.postprocessor.AbstractUMLChangeFactory#getDiscriminant(org.eclipse.emf.compare.Diff)

-	 */

-	@Override

-	protected EObject getDiscriminant(Diff input) {

-		return Iterables.find(getDiscriminants(input), instanceOf(Include.class), null);

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.emf.compare.uml2.internal.postprocessor.AbstractUMLChangeFactory#getDiscriminantsGetter()

-	 */

-	@Override

-	protected Switch<Set<EObject>> getDiscriminantsGetter() {

-		return new DiscriminantsGetter() {

-

-			@Override

-			public Set<EObject> caseInclude(Include object) {

-				Set<EObject> result = new HashSet<EObject>();

-				result.add(object);

-				return result;

-			}

-

-		};

-	}

-

-}

diff --git a/plugins/org.eclipse.emf.compare/model/compare.ecore b/plugins/org.eclipse.emf.compare/model/compare.ecore
index 8a2399fff..200c67a8f 100644
--- a/plugins/org.eclipse.emf.compare/model/compare.ecore
+++ b/plugins/org.eclipse.emf.compare/model/compare.ecore
@@ -13,7 +13,7 @@
     <eOperations name="getDifferences" upperBound="-1" eType="#//Diff">

       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

         <details key="documentation" value="Returns all differences that reference the given EObject (for instance, all ReferenceChanges that reference the given EObject through the &quot;value&quot; EReference). &#xA;&lt;p>&#xA;To get differences detected on the given EObject or one of its counterpart in left, right or origin, you should call the following code:&#xA;&lt;pre>&#xA;Match match = getMatch(eObject);&#xA;if (match != null) {&#xA;    differences = match.getDifferences();&#xA;}&#xA;&lt;/pre>"/>

-      </eAnnotations>

+      </eAnnotations>
       <eParameters name="element" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject">

         <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

           <details key="documentation" value="The EObject for which we seek all related differences."/>

@@ -271,7 +271,7 @@
         <details key="documentation" value="The attribute in which &quot;something&quot; changed."/>

       </eAnnotations>

     </eStructuralFeatures>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject">

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

         <details key="documentation" value="References the actual value on which a difference has been detected."/>

       </eAnnotations>