merge commit

36 files changed, 105 insertions, 145 deletions

diff --git a/plugins/org.eclipse.emf.compare.diagram.ide.tests/src/org/eclipse/emf/compare/diagram/ide/tests/nodechanges/NodechangesTest.java b/plugins/org.eclipse.emf.compare.diagram.ide.tests/src/org/eclipse/emf/compare/diagram/ide/tests/nodechanges/NodechangesTest.java
index fca89499a..10a53a10f 100644
--- a/plugins/org.eclipse.emf.compare.diagram.ide.tests/src/org/eclipse/emf/compare/diagram/ide/tests/nodechanges/NodechangesTest.java
+++ b/plugins/org.eclipse.emf.compare.diagram.ide.tests/src/org/eclipse/emf/compare/diagram/ide/tests/nodechanges/NodechangesTest.java
@@ -5,9 +5,9 @@ import static com.google.common.base.Predicates.instanceOf;
 import static junit.framework.Assert.assertNotNull;

 import static junit.framework.Assert.assertSame;

 import static junit.framework.Assert.assertTrue;

+import static org.eclipse.emf.compare.utils.EMFComparePredicates.changedAttribute;

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

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

-import static org.eclipse.emf.compare.utils.EMFComparePredicates.changedAttribute;

 

 import java.io.IOException;

 import java.util.List;

@@ -19,14 +19,14 @@ import org.eclipse.emf.compare.EMFCompare;
 import org.eclipse.emf.compare.diagram.GMFCompare;

 import org.eclipse.emf.compare.diagram.LabelChange;

 import org.eclipse.emf.compare.diagram.NodeChange;

-import org.eclipse.emf.compare.diagram.ide.diff.DiagramDiffExtensionPostProcessor;

 import org.eclipse.emf.compare.diagram.diff.util.DiagramCompareConstants;

+import org.eclipse.emf.compare.diagram.ide.diff.DiagramDiffExtensionPostProcessor;

 import org.eclipse.emf.compare.diagram.ide.tests.nodechanges.data.NodeChangesInputData;

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

+import org.eclipse.emf.compare.diagram.tests.DiagramInputData;

 import org.eclipse.emf.compare.extension.EMFCompareExtensionRegistry;

 import org.eclipse.emf.compare.extension.PostProcessorDescriptor;

 import org.eclipse.emf.compare.scope.IComparisonScope;

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

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

 import org.junit.Before;

 import org.junit.Test;

@@ -118,7 +118,7 @@ public class NodechangesTest extends AbstractTest {
 	}

 

 	@Override

-	protected AbstractInputData getInput() {

+	protected DiagramInputData getInput() {

 		return input;

 	}

 	

diff --git a/plugins/org.eclipse.emf.compare.diagram.ide.tests/src/org/eclipse/emf/compare/diagram/ide/tests/nodechanges/data/NodeChangesInputData.java b/plugins/org.eclipse.emf.compare.diagram.ide.tests/src/org/eclipse/emf/compare/diagram/ide/tests/nodechanges/data/NodeChangesInputData.java
index 72736bf8b..24b145e8e 100644
--- a/plugins/org.eclipse.emf.compare.diagram.ide.tests/src/org/eclipse/emf/compare/diagram/ide/tests/nodechanges/data/NodeChangesInputData.java
+++ b/plugins/org.eclipse.emf.compare.diagram.ide.tests/src/org/eclipse/emf/compare/diagram/ide/tests/nodechanges/data/NodeChangesInputData.java
@@ -7,7 +7,7 @@ import java.util.Collections;
 

 import org.eclipse.emf.common.EMFPlugin;

 import org.eclipse.emf.common.util.URI;

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

+import org.eclipse.emf.compare.diagram.tests.DiagramInputData;

 import org.eclipse.emf.ecore.EcorePackage;

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

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

@@ -17,33 +17,33 @@ import org.eclipse.emf.ecore.xmi.impl.EcoreResourceFactoryImpl;
 import org.eclipse.gmf.runtime.emf.core.resources.GMFResourceFactory;

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

 

-public class NodeChangesInputData extends AbstractInputData {

+public class NodeChangesInputData extends DiagramInputData {

 	

 	public Resource getA1Left() throws IOException {

-		return loadFromClassloader("a1/TC01.ecorediag"); //$NON-NLS-1$

+		return loadFromClassLoader("a1/TC01.ecorediag"); //$NON-NLS-1$

 	}

 

 	public Resource getA1Right() throws IOException {

-		return loadFromClassloader("a1/TC02.ecorediag"); //$NON-NLS-1$

+		return loadFromClassLoader("a1/TC02.ecorediag"); //$NON-NLS-1$

 	}

 	

 	public Resource getA2Left() throws IOException {

-		return loadFromClassloader("a2/TC01.ecorediag"); //$NON-NLS-1$

+		return loadFromClassLoader("a2/TC01.ecorediag"); //$NON-NLS-1$

 	}

 

 	public Resource getA2Right() throws IOException {

-		return loadFromClassloader("a2/TC02.ecorediag"); //$NON-NLS-1$

+		return loadFromClassLoader("a2/TC02.ecorediag"); //$NON-NLS-1$

 	}

 

 	

 	@Override

-	protected Resource loadFromClassloader(String string) throws IOException {

+	protected Resource loadFromClassLoader(String string) throws IOException {

 		final URL fileURL = getClass().getResource(string);

 		final InputStream str = fileURL.openStream();

 		final URI uri = URI.createURI(fileURL.toString());

 

 		ResourceSet resourceSet = new ResourceSetImpl();

-		sets.add(resourceSet);

+		//sets.add(resourceSet);

 

 		if (!EMFPlugin.IS_RESOURCES_BUNDLE_AVAILABLE) {

 			resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put("ecore",

diff --git a/plugins/org.eclipse.emf.compare.diagram.ide/src/org/eclipse/emf/compare/diagram/ide/diff/DiagramDiffExtensionPostProcessor.java b/plugins/org.eclipse.emf.compare.diagram.ide/src/org/eclipse/emf/compare/diagram/ide/diff/DiagramDiffExtensionPostProcessor.java
index 6d3c0e03f..571ad6381 100644
--- a/plugins/org.eclipse.emf.compare.diagram.ide/src/org/eclipse/emf/compare/diagram/ide/diff/DiagramDiffExtensionPostProcessor.java
+++ b/plugins/org.eclipse.emf.compare.diagram.ide/src/org/eclipse/emf/compare/diagram/ide/diff/DiagramDiffExtensionPostProcessor.java
@@ -20,9 +20,7 @@ import org.eclipse.emf.compare.diagram.diff.util.DiffUtil;
 import org.eclipse.emf.compare.diagram.ide.diff.internal.extension.IDiffExtensionFactory;

 import org.eclipse.emf.compare.diagram.provider.IViewLabelProvider;

 import org.eclipse.emf.compare.diagram.provider.ViewLabelProviderExtensionRegistry;

-import org.eclipse.emf.compare.extension.EMFCompareExtensionRegistry;

 import org.eclipse.emf.compare.extension.IPostProcessor;

-import org.eclipse.emf.compare.extension.PostProcessorDescriptor;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart;

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

diff --git a/plugins/org.eclipse.emf.compare.diagram.tests/src/org/eclipse/emf/compare/diagram/tests/AbstractTest.java b/plugins/org.eclipse.emf.compare.diagram.tests/src/org/eclipse/emf/compare/diagram/tests/AbstractTest.java
index 052a966f8..9f27efa2c 100644
--- a/plugins/org.eclipse.emf.compare.diagram.tests/src/org/eclipse/emf/compare/diagram/tests/AbstractTest.java
+++ b/plugins/org.eclipse.emf.compare.diagram.tests/src/org/eclipse/emf/compare/diagram/tests/AbstractTest.java
@@ -7,7 +7,6 @@ import org.eclipse.emf.compare.Diff;
 import org.eclipse.emf.compare.diagram.diff.DiagramDiffExtensionPostProcessor;

 import org.eclipse.emf.compare.extension.EMFCompareExtensionRegistry;

 import org.eclipse.emf.compare.extension.PostProcessorDescriptor;

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

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

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

 import org.junit.After;

@@ -30,8 +29,8 @@ public abstract class AbstractTest {
 	@After

 	public void after() {

 		EMFCompareExtensionRegistry.clearRegistry();

-		if (getInput() != null && getInput().sets != null) {

-			for (ResourceSet set : getInput().sets) {

+		if (getInput() != null && getInput().getSets() != null) {

+			for (ResourceSet set : getInput().getSets()) {

 				cleanup(set);

 			}

 		}

@@ -58,6 +57,6 @@ public abstract class AbstractTest {
 		return Integer.valueOf(count);

 	}

 	

-	protected abstract AbstractInputData getInput();

+	protected abstract DiagramInputData getInput();

 

 }

diff --git a/plugins/org.eclipse.emf.compare.diagram.tests/src/org/eclipse/emf/compare/diagram/tests/DiagramInputData.java b/plugins/org.eclipse.emf.compare.diagram.tests/src/org/eclipse/emf/compare/diagram/tests/DiagramInputData.java
new file mode 100644
index 000000000..9d1a8aee7
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.diagram.tests/src/org/eclipse/emf/compare/diagram/tests/DiagramInputData.java
@@ -0,0 +1,21 @@
+package org.eclipse.emf.compare.diagram.tests;

+

+import java.util.LinkedHashSet;

+import java.util.Set;

+

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

+import org.eclipse.emf.ecore.resource.ResourceSet;

+

+public class DiagramInputData extends AbstractInputData {

+

+	/** Store the set of the resource sets of the input data. */

+	private Set<ResourceSet> sets = new LinkedHashSet<ResourceSet>();

+

+	public DiagramInputData() {

+	}

+

+	public Set<ResourceSet> getSets() {

+		return sets;

+	}

+

+}

diff --git a/plugins/org.eclipse.emf.compare.diagram.tests/src/org/eclipse/emf/compare/diagram/tests/hide/HideTest.java b/plugins/org.eclipse.emf.compare.diagram.tests/src/org/eclipse/emf/compare/diagram/tests/hide/HideTest.java
index da6ccd2a7..8efff216d 100644
--- a/plugins/org.eclipse.emf.compare.diagram.tests/src/org/eclipse/emf/compare/diagram/tests/hide/HideTest.java
+++ b/plugins/org.eclipse.emf.compare.diagram.tests/src/org/eclipse/emf/compare/diagram/tests/hide/HideTest.java
@@ -17,9 +17,9 @@ import org.eclipse.emf.compare.DifferenceKind;
 import org.eclipse.emf.compare.EMFCompare;

 import org.eclipse.emf.compare.diagram.Hide;

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

+import org.eclipse.emf.compare.diagram.tests.DiagramInputData;

 import org.eclipse.emf.compare.diagram.tests.hide.data.HideInputData;

 import org.eclipse.emf.compare.scope.IComparisonScope;

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

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

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

 import org.junit.Test;

@@ -62,8 +62,8 @@ public class HideTest extends AbstractTest {
 	}

 

 	@Override

-	protected AbstractInputData getInput() {

-		return input;

+	protected DiagramInputData getInput() {

+		return null;

 	}

 

 }

diff --git a/plugins/org.eclipse.emf.compare.diagram.tests/src/org/eclipse/emf/compare/diagram/tests/hide/data/HideInputData.java b/plugins/org.eclipse.emf.compare.diagram.tests/src/org/eclipse/emf/compare/diagram/tests/hide/data/HideInputData.java
index 0fbba1398..4a0f4c5e5 100644
--- a/plugins/org.eclipse.emf.compare.diagram.tests/src/org/eclipse/emf/compare/diagram/tests/hide/data/HideInputData.java
+++ b/plugins/org.eclipse.emf.compare.diagram.tests/src/org/eclipse/emf/compare/diagram/tests/hide/data/HideInputData.java
@@ -7,11 +7,11 @@ import org.eclipse.emf.ecore.resource.Resource;
 

 public class HideInputData extends AbstractInputData {

 	public Resource getA1Left() throws IOException {

-		return loadFromClassloader("a1/TC01.ecorediag"); //$NON-NLS-1$

+		return loadFromClassLoader("a1/TC01.ecorediag"); //$NON-NLS-1$

 	}

 

 	public Resource getA1Right() throws IOException {

-		return loadFromClassloader("a1/TC02.ecorediag"); //$NON-NLS-1$

+		return loadFromClassLoader("a1/TC02.ecorediag"); //$NON-NLS-1$

 	}

 

 }

diff --git a/plugins/org.eclipse.emf.compare.diagram.tests/src/org/eclipse/emf/compare/diagram/tests/nodechanges/NodechangesTest.java b/plugins/org.eclipse.emf.compare.diagram.tests/src/org/eclipse/emf/compare/diagram/tests/nodechanges/NodechangesTest.java
index 16d7f0db3..56b2e2748 100644
--- a/plugins/org.eclipse.emf.compare.diagram.tests/src/org/eclipse/emf/compare/diagram/tests/nodechanges/NodechangesTest.java
+++ b/plugins/org.eclipse.emf.compare.diagram.tests/src/org/eclipse/emf/compare/diagram/tests/nodechanges/NodechangesTest.java
@@ -3,12 +3,10 @@ package org.eclipse.emf.compare.diagram.tests.nodechanges;
 import static com.google.common.base.Predicates.and;

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

 import static junit.framework.Assert.assertFalse;

-import static junit.framework.Assert.assertNotNull;

 import static junit.framework.Assert.assertSame;

 import static junit.framework.Assert.assertTrue;

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

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

-import static org.eclipse.emf.compare.utils.EMFComparePredicates.changedAttribute;

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

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

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

@@ -16,41 +14,23 @@ import static org.eclipse.emf.compare.utils.EMFComparePredicates.removedFromRefe
 import static org.eclipse.emf.compare.utils.EMFComparePredicates.valueNameMatches;

 

 import java.io.IOException;

-import java.util.ArrayList;

-import java.util.Iterator;

 import java.util.List;

 

 import org.eclipse.emf.compare.Comparison;

 import org.eclipse.emf.compare.Diff;

 import org.eclipse.emf.compare.DifferenceKind;

 import org.eclipse.emf.compare.EMFCompare;

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

 import org.eclipse.emf.compare.ReferenceChange;

 import org.eclipse.emf.compare.ResourceAttachmentChange;

-import org.eclipse.emf.compare.diagram.LabelChange;

 import org.eclipse.emf.compare.diagram.NodeChange;

-import org.eclipse.emf.compare.diagram.ecoretools.EcoreToolsViewLabelProvider;

-import org.eclipse.emf.compare.diagram.provider.ViewLabelProviderExtensionDescriptor;

-import org.eclipse.emf.compare.diagram.provider.ViewLabelProviderExtensionRegistry;

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

+import org.eclipse.emf.compare.diagram.tests.DiagramInputData;

 import org.eclipse.emf.compare.diagram.tests.nodechanges.data.NodeChangesInputData;

 import org.eclipse.emf.compare.scope.IComparisonScope;

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

 import org.eclipse.emf.compare.utils.MatchUtil;

-import org.eclipse.emf.ecore.EAnnotation;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EDataType;

-import org.eclipse.emf.ecore.EEnum;

-import org.eclipse.emf.ecore.EPackage;

 import org.eclipse.emf.ecore.EcorePackage;

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

-import org.eclipse.gmf.runtime.notation.Bounds;

-import org.eclipse.gmf.runtime.notation.DrawerStyle;

-import org.eclipse.gmf.runtime.notation.FilteringStyle;

-import org.eclipse.gmf.runtime.notation.MultiDiagramLinkStyle;

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

-import org.eclipse.gmf.runtime.notation.ShapeStyle;

-import org.eclipse.gmf.runtime.notation.SortingStyle;

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

 import org.junit.Test;

 

@@ -294,7 +274,7 @@ public class NodechangesTest extends AbstractTest {
 	}

 

 	@Override

-	protected AbstractInputData getInput() {

+	protected DiagramInputData getInput() {

 		return input;

 	}

 	

diff --git a/plugins/org.eclipse.emf.compare.diagram.tests/src/org/eclipse/emf/compare/diagram/tests/nodechanges/data/NodeChangesInputData.java b/plugins/org.eclipse.emf.compare.diagram.tests/src/org/eclipse/emf/compare/diagram/tests/nodechanges/data/NodeChangesInputData.java
index 0d673da78..0a6d6cc31 100644
--- a/plugins/org.eclipse.emf.compare.diagram.tests/src/org/eclipse/emf/compare/diagram/tests/nodechanges/data/NodeChangesInputData.java
+++ b/plugins/org.eclipse.emf.compare.diagram.tests/src/org/eclipse/emf/compare/diagram/tests/nodechanges/data/NodeChangesInputData.java
@@ -7,7 +7,7 @@ import java.util.Collections;
 

 import org.eclipse.emf.common.EMFPlugin;

 import org.eclipse.emf.common.util.URI;

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

+import org.eclipse.emf.compare.diagram.tests.DiagramInputData;

 import org.eclipse.emf.ecore.EcorePackage;

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

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

@@ -17,32 +17,32 @@ import org.eclipse.emf.ecore.xmi.impl.EcoreResourceFactoryImpl;
 import org.eclipse.gmf.runtime.emf.core.resources.GMFResourceFactory;

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

 

-public class NodeChangesInputData extends AbstractInputData {

+public class NodeChangesInputData extends DiagramInputData {

 	public Resource getA1Left() throws IOException {

-		return loadFromClassloader("a1/TC1.ecorediag"); //$NON-NLS-1$

+		return loadFromClassLoader("a1/TC1.ecorediag"); //$NON-NLS-1$

 	}

 

 	public Resource getA1Right() throws IOException {

-		return loadFromClassloader("a1/TC2.ecorediag"); //$NON-NLS-1$

+		return loadFromClassLoader("a1/TC2.ecorediag"); //$NON-NLS-1$

 	}

 	

 	public Resource getA2Left() throws IOException {

-		return loadFromClassloader("a2/TC01.ecorediag"); //$NON-NLS-1$

+		return loadFromClassLoader("a2/TC01.ecorediag"); //$NON-NLS-1$

 	}

 

 	public Resource getA2Right() throws IOException {

-		return loadFromClassloader("a2/TC02.ecorediag"); //$NON-NLS-1$

+		return loadFromClassLoader("a2/TC02.ecorediag"); //$NON-NLS-1$

 	}

 

 	

 	@Override

-	protected Resource loadFromClassloader(String string) throws IOException {

+	protected Resource loadFromClassLoader(String string) throws IOException {

 		final URL fileURL = getClass().getResource(string);

 		final InputStream str = fileURL.openStream();

 		final URI uri = URI.createURI(fileURL.toString());

 

 		ResourceSet resourceSet = new ResourceSetImpl();

-		sets.add(resourceSet);

+		getSets().add(resourceSet);

 

 		if (!EMFPlugin.IS_RESOURCES_BUNDLE_AVAILABLE) {

 			resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put("ecore",

diff --git a/plugins/org.eclipse.emf.compare.diagram.tests/src/org/eclipse/emf/compare/diagram/tests/show/ShowTest.java b/plugins/org.eclipse.emf.compare.diagram.tests/src/org/eclipse/emf/compare/diagram/tests/show/ShowTest.java
index 6445b2349..9072422a8 100644
--- a/plugins/org.eclipse.emf.compare.diagram.tests/src/org/eclipse/emf/compare/diagram/tests/show/ShowTest.java
+++ b/plugins/org.eclipse.emf.compare.diagram.tests/src/org/eclipse/emf/compare/diagram/tests/show/ShowTest.java
@@ -17,9 +17,9 @@ import org.eclipse.emf.compare.DifferenceKind;
 import org.eclipse.emf.compare.EMFCompare;

 import org.eclipse.emf.compare.diagram.Show;

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

+import org.eclipse.emf.compare.diagram.tests.DiagramInputData;

 import org.eclipse.emf.compare.diagram.tests.show.data.ShowInputData;

 import org.eclipse.emf.compare.scope.IComparisonScope;

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

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

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

 import org.junit.Test;

@@ -62,8 +62,8 @@ public class ShowTest extends AbstractTest {
 	}

 

 	@Override

-	protected AbstractInputData getInput() {

-		return input;

+	protected DiagramInputData getInput() {

+		return null;

 	}

 

 }

diff --git a/plugins/org.eclipse.emf.compare.diagram.tests/src/org/eclipse/emf/compare/diagram/tests/show/data/ShowInputData.java b/plugins/org.eclipse.emf.compare.diagram.tests/src/org/eclipse/emf/compare/diagram/tests/show/data/ShowInputData.java
index 2b754a63c..3d91fe5ae 100644
--- a/plugins/org.eclipse.emf.compare.diagram.tests/src/org/eclipse/emf/compare/diagram/tests/show/data/ShowInputData.java
+++ b/plugins/org.eclipse.emf.compare.diagram.tests/src/org/eclipse/emf/compare/diagram/tests/show/data/ShowInputData.java
@@ -7,11 +7,11 @@ import org.eclipse.emf.ecore.resource.Resource;
 

 public class ShowInputData extends AbstractInputData {

 	public Resource getA1Left() throws IOException {

-		return loadFromClassloader("a1/TC01.ecorediag"); //$NON-NLS-1$

+		return loadFromClassLoader("a1/TC01.ecorediag"); //$NON-NLS-1$

 	}

 

 	public Resource getA1Right() throws IOException {

-		return loadFromClassloader("a1/TC02.ecorediag"); //$NON-NLS-1$

+		return loadFromClassLoader("a1/TC02.ecorediag"); //$NON-NLS-1$

 	}

 

 }

diff --git a/plugins/org.eclipse.emf.compare.diagram/src/org/eclipse/emf/compare/diagram/diff/internal/extension/AbstractDiffExtensionFactory.java b/plugins/org.eclipse.emf.compare.diagram/src/org/eclipse/emf/compare/diagram/diff/internal/extension/AbstractDiffExtensionFactory.java
index 4ca02ca48..d7c2381ad 100644
--- a/plugins/org.eclipse.emf.compare.diagram/src/org/eclipse/emf/compare/diagram/diff/internal/extension/AbstractDiffExtensionFactory.java
+++ b/plugins/org.eclipse.emf.compare.diagram/src/org/eclipse/emf/compare/diagram/diff/internal/extension/AbstractDiffExtensionFactory.java
@@ -178,7 +178,7 @@ public abstract class AbstractDiffExtensionFactory implements IDiffExtensionFact
 		return diff instanceof ReferenceChange && getRelatedExtensionKind(diff) == DifferenceKind.CHANGE;
 	}
 
-	private boolean isExtensionAlreadyExist(Diff input) {
+	protected boolean isExtensionAlreadyExist(Diff input) {
 		return false;
 	}
 
diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/AssociationChange.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/AssociationChange.java
index 560445279..dac4f02db 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/AssociationChange.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/AssociationChange.java
@@ -10,7 +10,6 @@
  */

 package org.eclipse.emf.compare.uml2;

 

-import org.eclipse.uml2.uml.Association;

 

 /**

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

diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/DependencyChange.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/DependencyChange.java
index 3b11ce758..2b71d2846 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/DependencyChange.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/DependencyChange.java
@@ -10,7 +10,6 @@
  */

 package org.eclipse.emf.compare.uml2;

 

-import org.eclipse.uml2.uml.Dependency;

 

 /**

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

diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/ExtendChange.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/ExtendChange.java
index 1c6378971..a8ebabf53 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/ExtendChange.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/ExtendChange.java
@@ -10,7 +10,6 @@
  */

 package org.eclipse.emf.compare.uml2;

 

-import org.eclipse.uml2.uml.Extend;

 

 /**

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

diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/GeneralizationSetChange.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/GeneralizationSetChange.java
index a7cb5320e..6b8f6e8c9 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/GeneralizationSetChange.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/GeneralizationSetChange.java
@@ -10,7 +10,6 @@
  */

 package org.eclipse.emf.compare.uml2;

 

-import org.eclipse.uml2.uml.GeneralizationSet;

 

 /**

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

diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/ProfileApplicationChange.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/ProfileApplicationChange.java
index 1c17eede9..400e42cc0 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/ProfileApplicationChange.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/ProfileApplicationChange.java
@@ -10,8 +10,6 @@
  */

 package org.eclipse.emf.compare.uml2;

 

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

-

 import org.eclipse.uml2.uml.Profile;

 

 /**

diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/StereotypeApplicationChange.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/StereotypeApplicationChange.java
index 2fbc3c3fe..db046aad3 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/StereotypeApplicationChange.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/StereotypeApplicationChange.java
@@ -10,8 +10,6 @@
  */

 package org.eclipse.emf.compare.uml2;

 

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

-

 import org.eclipse.uml2.uml.Stereotype;

 

 /**

diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/UMLDiff.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/UMLDiff.java
index faa8655e7..2ec6067d9 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/UMLDiff.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/UMLDiff.java
@@ -10,9 +10,7 @@
  */

 package org.eclipse.emf.compare.uml2;

 

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

 import org.eclipse.emf.compare.Diff;

-

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EReference;

 

diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/AssociationChangeImpl.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/AssociationChangeImpl.java
index d48c2d8ac..75a31fe69 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/AssociationChangeImpl.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/AssociationChangeImpl.java
@@ -10,17 +10,9 @@
  */

 package org.eclipse.emf.compare.uml2.impl;

 

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

-

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

 import org.eclipse.emf.compare.uml2.UMLComparePackage;

-

 import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-

-import org.eclipse.uml2.uml.Association;

 

 /**

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

diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/DependencyChangeImpl.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/DependencyChangeImpl.java
index a4212c951..50749fe12 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/DependencyChangeImpl.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/DependencyChangeImpl.java
@@ -10,17 +10,9 @@
  */

 package org.eclipse.emf.compare.uml2.impl;

 

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

-

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

 import org.eclipse.emf.compare.uml2.UMLComparePackage;

-

 import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-

-import org.eclipse.uml2.uml.Dependency;

 

 /**

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

diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/ExecutionSpecificationChangeImpl.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/ExecutionSpecificationChangeImpl.java
index d0afb1818..40f3c5c27 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/ExecutionSpecificationChangeImpl.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/ExecutionSpecificationChangeImpl.java
@@ -12,7 +12,6 @@ package org.eclipse.emf.compare.uml2.impl;
 

 import org.eclipse.emf.compare.uml2.ExecutionSpecificationChange;

 import org.eclipse.emf.compare.uml2.UMLComparePackage;

-

 import org.eclipse.emf.ecore.EClass;

 

 /**

diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/ExtendChangeImpl.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/ExtendChangeImpl.java
index 67c5be7d6..a9bdc3d54 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/ExtendChangeImpl.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/ExtendChangeImpl.java
@@ -10,17 +10,9 @@
  */

 package org.eclipse.emf.compare.uml2.impl;

 

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

-

 import org.eclipse.emf.compare.uml2.ExtendChange;

 import org.eclipse.emf.compare.uml2.UMLComparePackage;

-

 import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-

-import org.eclipse.uml2.uml.Extend;

 

 /**

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

diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/GeneralizationSetChangeImpl.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/GeneralizationSetChangeImpl.java
index 1733c5266..baf11aef5 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/GeneralizationSetChangeImpl.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/GeneralizationSetChangeImpl.java
@@ -10,17 +10,9 @@
  */

 package org.eclipse.emf.compare.uml2.impl;

 

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

-

 import org.eclipse.emf.compare.uml2.GeneralizationSetChange;

 import org.eclipse.emf.compare.uml2.UMLComparePackage;

-

 import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.InternalEObject;

-

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-

-import org.eclipse.uml2.uml.GeneralizationSet;

 

 /**

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

diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/IncludeChangeImpl.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/IncludeChangeImpl.java
index 4d82d5fe2..50e4c79b7 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/IncludeChangeImpl.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/IncludeChangeImpl.java
@@ -12,7 +12,6 @@ package org.eclipse.emf.compare.uml2.impl;
 

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

 import org.eclipse.emf.compare.uml2.UMLComparePackage;

-

 import org.eclipse.emf.ecore.EClass;

 

 /**

diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/InterfaceRealizationChangeImpl.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/InterfaceRealizationChangeImpl.java
index 12b35bcc2..4296600ff 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/InterfaceRealizationChangeImpl.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/InterfaceRealizationChangeImpl.java
@@ -12,7 +12,6 @@ package org.eclipse.emf.compare.uml2.impl;
 

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

 import org.eclipse.emf.compare.uml2.UMLComparePackage;

-

 import org.eclipse.emf.ecore.EClass;

 

 /**

diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/IntervalConstraintChangeImpl.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/IntervalConstraintChangeImpl.java
index 79cb81352..3756da125 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/IntervalConstraintChangeImpl.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/IntervalConstraintChangeImpl.java
@@ -12,7 +12,6 @@ package org.eclipse.emf.compare.uml2.impl;
 

 import org.eclipse.emf.compare.uml2.IntervalConstraintChange;

 import org.eclipse.emf.compare.uml2.UMLComparePackage;

-

 import org.eclipse.emf.ecore.EClass;

 

 /**

diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/MessageChangeImpl.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/MessageChangeImpl.java
index bd48c96c8..2f09c234f 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/MessageChangeImpl.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/MessageChangeImpl.java
@@ -12,7 +12,6 @@ package org.eclipse.emf.compare.uml2.impl;
 

 import org.eclipse.emf.compare.uml2.MessageChange;

 import org.eclipse.emf.compare.uml2.UMLComparePackage;

-

 import org.eclipse.emf.ecore.EClass;

 

 /**

diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/ProfileApplicationChangeImpl.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/ProfileApplicationChangeImpl.java
index e578db28b..07162e502 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/ProfileApplicationChangeImpl.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/ProfileApplicationChangeImpl.java
@@ -11,20 +11,11 @@
 package org.eclipse.emf.compare.uml2.impl;

 

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

-

-import org.eclipse.emf.compare.impl.ReferenceChangeImpl;

-

 import org.eclipse.emf.compare.uml2.ProfileApplicationChange;

 import org.eclipse.emf.compare.uml2.UMLComparePackage;

-import org.eclipse.emf.compare.uml2.UMLDiff;

-

 import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EReference;

 import org.eclipse.emf.ecore.InternalEObject;

-

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

-

 import org.eclipse.uml2.uml.Profile;

 

 /**

diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/StereotypeApplicationChangeImpl.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/StereotypeApplicationChangeImpl.java
index a6516d418..315cc409d 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/StereotypeApplicationChangeImpl.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/StereotypeApplicationChangeImpl.java
@@ -11,20 +11,11 @@
 package org.eclipse.emf.compare.uml2.impl;

 

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

-

-import org.eclipse.emf.compare.impl.ReferenceChangeImpl;

-

 import org.eclipse.emf.compare.uml2.StereotypeApplicationChange;

 import org.eclipse.emf.compare.uml2.UMLComparePackage;

-import org.eclipse.emf.compare.uml2.UMLDiff;

-

 import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EReference;

 import org.eclipse.emf.ecore.InternalEObject;

-

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

-

 import org.eclipse.uml2.uml.Stereotype;

 

 /**

diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/StereotypePropertyChangeImpl.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/StereotypePropertyChangeImpl.java
index 6b0f65504..954027f5c 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/StereotypePropertyChangeImpl.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/StereotypePropertyChangeImpl.java
@@ -11,15 +11,11 @@
 package org.eclipse.emf.compare.uml2.impl;

 

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

-

 import org.eclipse.emf.compare.uml2.StereotypePropertyChange;

 import org.eclipse.emf.compare.uml2.UMLComparePackage;

-

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.InternalEObject;

-

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

-

 import org.eclipse.uml2.uml.Stereotype;

 

 /**

diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/StereotypeReferenceChangeImpl.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/StereotypeReferenceChangeImpl.java
index e2bc303f7..c713f9841 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/StereotypeReferenceChangeImpl.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/StereotypeReferenceChangeImpl.java
@@ -12,7 +12,6 @@ package org.eclipse.emf.compare.uml2.impl;
 

 import org.eclipse.emf.compare.uml2.StereotypeReferenceChange;

 import org.eclipse.emf.compare.uml2.UMLComparePackage;

-

 import org.eclipse.emf.ecore.EClass;

 

 /**

diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/SubstitutionChangeImpl.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/SubstitutionChangeImpl.java
index b33a0182c..912783c55 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/SubstitutionChangeImpl.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/SubstitutionChangeImpl.java
@@ -12,7 +12,6 @@ package org.eclipse.emf.compare.uml2.impl;
 

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

 import org.eclipse.emf.compare.uml2.UMLComparePackage;

-

 import org.eclipse.emf.ecore.EClass;

 

 /**

diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/UMLCompareFactoryImpl.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/UMLCompareFactoryImpl.java
index 280bfd47a..b172e2714 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/UMLCompareFactoryImpl.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/impl/UMLCompareFactoryImpl.java
@@ -10,14 +10,26 @@
  */

 package org.eclipse.emf.compare.uml2.impl;

 

-import org.eclipse.emf.compare.uml2.*;

-

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

+import org.eclipse.emf.compare.uml2.DependencyChange;

+import org.eclipse.emf.compare.uml2.ExecutionSpecificationChange;

+import org.eclipse.emf.compare.uml2.ExtendChange;

+import org.eclipse.emf.compare.uml2.GeneralizationSetChange;

+import org.eclipse.emf.compare.uml2.IncludeChange;

+import org.eclipse.emf.compare.uml2.InterfaceRealizationChange;

+import org.eclipse.emf.compare.uml2.IntervalConstraintChange;

+import org.eclipse.emf.compare.uml2.MessageChange;

+import org.eclipse.emf.compare.uml2.ProfileApplicationChange;

+import org.eclipse.emf.compare.uml2.StereotypeApplicationChange;

+import org.eclipse.emf.compare.uml2.StereotypePropertyChange;

+import org.eclipse.emf.compare.uml2.StereotypeReferenceChange;

+import org.eclipse.emf.compare.uml2.SubstitutionChange;

+import org.eclipse.emf.compare.uml2.UMLCompareFactory;

+import org.eclipse.emf.compare.uml2.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;

 

 /**

diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/util/UMLCompareAdapterFactory.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/util/UMLCompareAdapterFactory.java
index 568947c8c..cac458cc5 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/util/UMLCompareAdapterFactory.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/util/UMLCompareAdapterFactory.java
@@ -12,14 +12,24 @@ package org.eclipse.emf.compare.uml2.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.ReferenceChange;

-

-import org.eclipse.emf.compare.uml2.*;

-

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

+import org.eclipse.emf.compare.uml2.DependencyChange;

+import org.eclipse.emf.compare.uml2.ExecutionSpecificationChange;

+import org.eclipse.emf.compare.uml2.ExtendChange;

+import org.eclipse.emf.compare.uml2.GeneralizationSetChange;

+import org.eclipse.emf.compare.uml2.IncludeChange;

+import org.eclipse.emf.compare.uml2.InterfaceRealizationChange;

+import org.eclipse.emf.compare.uml2.IntervalConstraintChange;

+import org.eclipse.emf.compare.uml2.MessageChange;

+import org.eclipse.emf.compare.uml2.ProfileApplicationChange;

+import org.eclipse.emf.compare.uml2.StereotypeApplicationChange;

+import org.eclipse.emf.compare.uml2.StereotypePropertyChange;

+import org.eclipse.emf.compare.uml2.StereotypeReferenceChange;

+import org.eclipse.emf.compare.uml2.SubstitutionChange;

+import org.eclipse.emf.compare.uml2.UMLComparePackage;

+import org.eclipse.emf.compare.uml2.UMLDiff;

 import org.eclipse.emf.ecore.EObject;

 

 /**

diff --git a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/util/UMLCompareSwitch.java b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/util/UMLCompareSwitch.java
index 63747230e..5efaca663 100644
--- a/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/util/UMLCompareSwitch.java
+++ b/plugins/org.eclipse.emf.compare.uml2/src-gen/org/eclipse/emf/compare/uml2/util/UMLCompareSwitch.java
@@ -11,13 +11,24 @@
 package org.eclipse.emf.compare.uml2.util;

 

 import org.eclipse.emf.compare.Diff;

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

-

-import org.eclipse.emf.compare.uml2.*;

-

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

+import org.eclipse.emf.compare.uml2.DependencyChange;

+import org.eclipse.emf.compare.uml2.ExecutionSpecificationChange;

+import org.eclipse.emf.compare.uml2.ExtendChange;

+import org.eclipse.emf.compare.uml2.GeneralizationSetChange;

+import org.eclipse.emf.compare.uml2.IncludeChange;

+import org.eclipse.emf.compare.uml2.InterfaceRealizationChange;

+import org.eclipse.emf.compare.uml2.IntervalConstraintChange;

+import org.eclipse.emf.compare.uml2.MessageChange;

+import org.eclipse.emf.compare.uml2.ProfileApplicationChange;

+import org.eclipse.emf.compare.uml2.StereotypeApplicationChange;

+import org.eclipse.emf.compare.uml2.StereotypePropertyChange;

+import org.eclipse.emf.compare.uml2.StereotypeReferenceChange;

+import org.eclipse.emf.compare.uml2.SubstitutionChange;

+import org.eclipse.emf.compare.uml2.UMLComparePackage;

+import org.eclipse.emf.compare.uml2.UMLDiff;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EPackage;

-

 import org.eclipse.emf.ecore.util.Switch;

 

 /**