Switch to Eclipse mars.2

Format all non generated classes to get ride of formatter
incompatibilities
Migrate checkstyle config for checkstyle 6.19

Change-Id: I8c2b31765053a3686de62320f893bedf4ad81d1f
Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>

42 files changed, 572 insertions, 585 deletions

diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/AbstractDynamicProfileTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/AbstractDynamicProfileTest.java
index fbd742f4f..e5b03b4f7 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/AbstractDynamicProfileTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/AbstractDynamicProfileTest.java
@@ -30,13 +30,12 @@ public abstract class AbstractDynamicProfileTest extends AbstractUMLProfileTest
 		addProfilePathmap();
 		if (!EMFPlugin.IS_ECLIPSE_RUNNING) {
 			// It is required to link the EPackage to the UML package of the UML Profile
-			UMLPlugin
-					.getEPackageNsURIToProfileLocationMap()
-					.put("http://www.eclipse.org/emf/compare/uml2/1.0.0/testprofile",
-							URI.createURI("pathmap://UML_COMPARE_TESTS_PROFILE/uml2.compare.testprofile.profile.uml#_hZFTgIwkEeC_FYHMbTTxXw")); //$NON-NLS-1$
+			UMLPlugin.getEPackageNsURIToProfileLocationMap()
+					.put("http://www.eclipse.org/emf/compare/uml2/1.0.0/testprofile", URI.createURI(
+							"pathmap://UML_COMPARE_TESTS_PROFILE/uml2.compare.testprofile.profile.uml#_hZFTgIwkEeC_FYHMbTTxXw")); //$NON-NLS-1$
 		} else {
-			registeredURI = UMLPlugin.getEPackageNsURIToProfileLocationMap().remove(
-					UML2CompareTestProfilePackage.eNS_URI);
+			registeredURI = UMLPlugin.getEPackageNsURIToProfileLocationMap()
+					.remove(UML2CompareTestProfilePackage.eNS_URI);
 			registeredPackage = EPackage.Registry.INSTANCE.remove(UML2CompareTestProfilePackage.eNS_URI);
 		}
 	}
@@ -47,8 +46,8 @@ public abstract class AbstractDynamicProfileTest extends AbstractUMLProfileTest
 	 */
 	public static void resetEPackageNsURIToProfileLocationMap() {
 		if (!EMFPlugin.IS_ECLIPSE_RUNNING) {
-			UMLPlugin.getEPackageNsURIToProfileLocationMap().remove(
-					"http://www.eclipse.org/emf/compare/uml2/1.0.0/testprofile");
+			UMLPlugin.getEPackageNsURIToProfileLocationMap()
+					.remove("http://www.eclipse.org/emf/compare/uml2/1.0.0/testprofile");
 		} else {
 			UMLPlugin.getEPackageNsURIToProfileLocationMap().put(UML2CompareTestProfilePackage.eNS_URI,
 					registeredURI);
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/AbstractStaticProfileTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/AbstractStaticProfileTest.java
index d7d6182c5..7e739fa39 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/AbstractStaticProfileTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/AbstractStaticProfileTest.java
@@ -34,9 +34,8 @@ public abstract class AbstractStaticProfileTest extends AbstractUMLProfileTest {
 			// It is required to link the EPackage to the UML package of the UML Profile
 			Map<String, URI> ePackageNsURIToProfileLocationMap = UMLPlugin
 					.getEPackageNsURIToProfileLocationMap();
-			ePackageNsURIToProfileLocationMap
-					.put(UML2CompareTestProfilePackage.eNS_URI,
-							URI.createURI("pathmap://UML_COMPARE_TESTS_PROFILE/uml2.compare.testprofile.profile.uml#_hZFTgIwkEeC_FYHMbTTxXw")); //$NON-NLS-1$
+			ePackageNsURIToProfileLocationMap.put(UML2CompareTestProfilePackage.eNS_URI, URI.createURI(
+					"pathmap://UML_COMPARE_TESTS_PROFILE/uml2.compare.testprofile.profile.uml#_hZFTgIwkEeC_FYHMbTTxXw")); //$NON-NLS-1$
 		}
 	}
 
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/AbstractUMLInputData.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/AbstractUMLInputData.java
index 0db0781c6..88ca748c9 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/AbstractUMLInputData.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/AbstractUMLInputData.java
@@ -62,11 +62,12 @@ public abstract class AbstractUMLInputData extends AbstractInputData {
 			UMLJarPath = UMLJarPath.substring(0, UMLJarPath.indexOf('!'));
 
 			final Map<URI, URI> uriMap = URIConverter.URI_MAP;
-			uriMap.put(URI.createURI(UMLResource.LIBRARIES_PATHMAP), URI.createURI(UMLJarPath
-					+ "!/libraries/"));
-			uriMap.put(URI.createURI(UMLResource.METAMODELS_PATHMAP), URI.createURI(UMLJarPath
-					+ "!/metamodels/"));
-			uriMap.put(URI.createURI(UMLResource.PROFILES_PATHMAP), URI.createURI(UMLJarPath + "!/profiles/"));
+			uriMap.put(URI.createURI(UMLResource.LIBRARIES_PATHMAP),
+					URI.createURI(UMLJarPath + "!/libraries/"));
+			uriMap.put(URI.createURI(UMLResource.METAMODELS_PATHMAP),
+					URI.createURI(UMLJarPath + "!/metamodels/"));
+			uriMap.put(URI.createURI(UMLResource.PROFILES_PATHMAP),
+					URI.createURI(UMLJarPath + "!/profiles/"));
 		}
 
 		Resource resource = resourceSet.createResource(uri);
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/AbstractUMLProfileTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/AbstractUMLProfileTest.java
index 892ae80f4..ed0efb8cf 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/AbstractUMLProfileTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/AbstractUMLProfileTest.java
@@ -29,8 +29,8 @@ public abstract class AbstractUMLProfileTest extends AbstractUMLTest {
 			final URL UMLJarredFileLocation = ResourcesPlugin.class.getResource("ResourcesPlugin.class");
 			String UMLJarPath = UMLJarredFileLocation.toString();
 			UMLJarPath = UMLJarPath.substring(0, UMLJarPath.indexOf('!'));
-			URIConverter.URI_MAP.put(URI.createURI("pathmap://UML_COMPARE_TESTS_PROFILE/"), URI
-					.createURI(getProfilePath()));
+			URIConverter.URI_MAP.put(URI.createURI("pathmap://UML_COMPARE_TESTS_PROFILE/"),
+					URI.createURI(getProfilePath()));
 		}
 	}
 
@@ -47,9 +47,8 @@ public abstract class AbstractUMLProfileTest extends AbstractUMLTest {
 
 	protected static String getProfilePath() {
 		final String thisNamespace = "org.eclipse.emf.compare.uml2.tests";
-		final URL thisClassLocation = AbstractUMLProfileTest.class.getResource(AbstractUMLProfileTest.class
-				.getSimpleName()
-				+ ".class");
+		final URL thisClassLocation = AbstractUMLProfileTest.class
+				.getResource(AbstractUMLProfileTest.class.getSimpleName() + ".class");
 		String profilePath = thisClassLocation.toString();
 		profilePath = profilePath.substring(0, profilePath.indexOf(thisNamespace) + thisNamespace.length());
 		profilePath += "/model/";
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/AbstractUMLTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/AbstractUMLTest.java
index a9b6bb3c7..fb2d3f0dc 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/AbstractUMLTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/AbstractUMLTest.java
@@ -138,12 +138,12 @@ public abstract class AbstractUMLTest {
 	protected void registerPostProcessors(
 			final IPostProcessor.Descriptor.Registry<String> postProcessorRegistry) {
 		postProcessorRegistry.put(UMLPostProcessor.class.getName(),
-				new TestPostProcessor.TestPostProcessorDescriptor(Pattern
-						.compile("http://www.eclipse.org/uml2/\\d\\.0\\.0/UML"), null,
+				new TestPostProcessor.TestPostProcessorDescriptor(
+						Pattern.compile("http://www.eclipse.org/uml2/\\d\\.0\\.0/UML"), null,
 						new UMLPostProcessor(), 20));
 		postProcessorRegistry.put(OpaqueElementBodyChangePostProcessor.class.getName(),
-				new TestPostProcessor.TestPostProcessorDescriptor(Pattern
-						.compile("http://www.eclipse.org/uml2/\\d\\.0\\.0/UML"), null,
+				new TestPostProcessor.TestPostProcessorDescriptor(
+						Pattern.compile("http://www.eclipse.org/uml2/\\d\\.0\\.0/UML"), null,
 						new OpaqueElementBodyChangePostProcessor(), 25));
 	}
 
@@ -210,13 +210,13 @@ public abstract class AbstractUMLTest {
 		return new Predicate<Diff>() {
 			public boolean apply(Diff input) {
 				if (input instanceof ReferenceChange) {
-					return ReferenceUtil.getAsList(input.getMatch().getLeft(),
-							((ReferenceChange)input).getReference()).contains(
-							((ReferenceChange)input).getValue());
+					return ReferenceUtil
+							.getAsList(input.getMatch().getLeft(), ((ReferenceChange)input).getReference())
+							.contains(((ReferenceChange)input).getValue());
 				} else if (input instanceof AttributeChange) {
-					return ReferenceUtil.getAsList(input.getMatch().getLeft(),
-							((AttributeChange)input).getAttribute()).contains(
-							((AttributeChange)input).getValue());
+					return ReferenceUtil
+							.getAsList(input.getMatch().getLeft(), ((AttributeChange)input).getAttribute())
+							.contains(((AttributeChange)input).getValue());
 				}
 				return false;
 			}
@@ -242,7 +242,8 @@ public abstract class AbstractUMLTest {
 		testMergeRightToLeft(left, right, origin, false);
 	}
 
-	protected void testMergeLeftToRight(Notifier left, Notifier right, Notifier origin, boolean pseudoAllowed) {
+	protected void testMergeLeftToRight(Notifier left, Notifier right, Notifier origin,
+			boolean pseudoAllowed) {
 		final IComparisonScope scope = new DefaultComparisonScope(left, right, origin);
 		final Comparison comparisonBefore = getCompare().compare(scope);
 		EList<Diff> differencesBefore = comparisonBefore.getDifferences();
@@ -259,7 +260,8 @@ public abstract class AbstractUMLTest {
 		assertTrue("Comparison#getDifferences() must be empty after copyAllLeftToRight", diffs);
 	}
 
-	protected void testMergeRightToLeft(Notifier left, Notifier right, Notifier origin, boolean pseudoAllowed) {
+	protected void testMergeRightToLeft(Notifier left, Notifier right, Notifier origin,
+			boolean pseudoAllowed) {
 		final IComparisonScope scope = new DefaultComparisonScope(left, right, origin);
 		final Comparison comparisonBefore = getCompare().compare(scope);
 		EList<Diff> differencesBefore = comparisonBefore.getDifferences();
@@ -278,12 +280,12 @@ public abstract class AbstractUMLTest {
 
 	protected void testIntersections(Comparison comparison) {
 		for (Diff diff : comparison.getDifferences()) {
-			int realRefinesSize = Iterables.size(Iterables.filter(diff.getRefines(),
-					not(instanceOf(StereotypedElementChange.class))));
+			int realRefinesSize = Iterables.size(
+					Iterables.filter(diff.getRefines(), not(instanceOf(StereotypedElementChange.class))));
 			assertFalse("Wrong number of refines (without StereotypedElementChange) on" + diff,
 					realRefinesSize > 1);
-			int stereotypedElementChangeRefines = Iterables.size(Iterables.filter(diff.getRefines(),
-					instanceOf(StereotypedElementChange.class)));
+			int stereotypedElementChangeRefines = Iterables
+					.size(Iterables.filter(diff.getRefines(), instanceOf(StereotypedElementChange.class)));
 			assertFalse("Wrong number of refines (of type StereotypedElementChange) on " + diff,
 					stereotypedElementChangeRefines > 1);
 
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociation2Test.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociation2Test.java
index 96c07f7b5..e49ebc871 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociation2Test.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociation2Test.java
@@ -208,10 +208,10 @@ public class AddAssociation2Test extends AbstractUMLTest {
 					"model.class1_class0_0.class1");
 			addPropertyClass0Description = addedToReference("model.Class1", "ownedAttribute",
 					"model.Class1.class0");
-			addPropertyClass0InAssociationDescription = addedToReference("model.class1_class0_0",
-					"memberEnd", "model.Class1.class0");
-			addPropertyClass1InAssociationDescription = addedToReference("model.class1_class0_0",
-					"memberEnd", "model.class1_class0_0.class1");
+			addPropertyClass0InAssociationDescription = addedToReference("model.class1_class0_0", "memberEnd",
+					"model.Class1.class0");
+			addPropertyClass1InAssociationDescription = addedToReference("model.class1_class0_0", "memberEnd",
+					"model.class1_class0_0.class1");
 			addRefAssociationInPropertyClass1Description = changedReference("model.class1_class0_0.class1",
 					"association", null, "model.class1_class0_0");
 			addRefTypeInPropertyClass1Description = changedReference("model.class1_class0_0.class1", "type",
@@ -268,11 +268,11 @@ public class AddAssociation2Test extends AbstractUMLTest {
 		assertEquals(1, count(differences, instanceOf(AssociationChange.class)));
 		Diff addUMLAssociation = null;
 		if (kind.equals(TestKind.ADD)) {
-			addUMLAssociation = Iterators.find(differences.iterator(), and(
-					instanceOf(AssociationChange.class), ofKind(DifferenceKind.ADD)));
+			addUMLAssociation = Iterators.find(differences.iterator(),
+					and(instanceOf(AssociationChange.class), ofKind(DifferenceKind.ADD)));
 		} else {
-			addUMLAssociation = Iterators.find(differences.iterator(), and(
-					instanceOf(AssociationChange.class), ofKind(DifferenceKind.DELETE)));
+			addUMLAssociation = Iterators.find(differences.iterator(),
+					and(instanceOf(AssociationChange.class), ofKind(DifferenceKind.DELETE)));
 		}
 		assertNotNull(addUMLAssociation);
 		assertEquals(13, addUMLAssociation.getRefinedBy().size());
@@ -288,17 +288,17 @@ public class AddAssociation2Test extends AbstractUMLTest {
 		assertTrue(addUMLAssociation.getRefinedBy().contains(addRefTypeInPropertyClass0));
 
 		// MultiplicityElementChanges
-		assertTrue(addUMLAssociation.getRefinedBy().contains(
-				Iterators.find(addLiteralIntegerInClass1.getRefines().iterator(),
+		assertTrue(addUMLAssociation.getRefinedBy()
+				.contains(Iterators.find(addLiteralIntegerInClass1.getRefines().iterator(),
 						instanceOf(MultiplicityElementChange.class))));
-		assertTrue(addUMLAssociation.getRefinedBy().contains(
-				Iterators.find(addUnlimitedNaturalInClass1.getRefines().iterator(),
+		assertTrue(addUMLAssociation.getRefinedBy()
+				.contains(Iterators.find(addUnlimitedNaturalInClass1.getRefines().iterator(),
 						instanceOf(MultiplicityElementChange.class))));
-		assertTrue(addUMLAssociation.getRefinedBy().contains(
-				Iterators.find(addLiteralIntegerInClass0.getRefines().iterator(),
+		assertTrue(addUMLAssociation.getRefinedBy()
+				.contains(Iterators.find(addLiteralIntegerInClass0.getRefines().iterator(),
 						instanceOf(MultiplicityElementChange.class))));
-		assertTrue(addUMLAssociation.getRefinedBy().contains(
-				Iterators.find(addUnlimitedNaturalInClass0.getRefines().iterator(),
+		assertTrue(addUMLAssociation.getRefinedBy()
+				.contains(Iterators.find(addUnlimitedNaturalInClass0.getRefines().iterator(),
 						instanceOf(MultiplicityElementChange.class))));
 
 		// CHECK REQUIREMENT
@@ -375,8 +375,8 @@ public class AddAssociation2Test extends AbstractUMLTest {
 		}
 
 		assertNotNull(addPropertyClass0InAssociation.getEquivalence());
-		assertTrue(addPropertyClass0InAssociation.getEquivalence().getDifferences().contains(
-				addRefAssociationInPropertyClass0));
+		assertTrue(addPropertyClass0InAssociation.getEquivalence().getDifferences()
+				.contains(addRefAssociationInPropertyClass0));
 
 		testIntersections(comparison);
 
@@ -407,8 +407,8 @@ public class AddAssociation2Test extends AbstractUMLTest {
 	protected void registerPostProcessors(Registry<String> postProcessorRegistry) {
 		super.registerPostProcessors(postProcessorRegistry);
 		postProcessorRegistry.put(MultiplicityElementChangePostProcessor.class.getName(),
-				new TestPostProcessor.TestPostProcessorDescriptor(Pattern
-						.compile("http://www.eclipse.org/uml2/\\d\\.0\\.0/UML"), null,
+				new TestPostProcessor.TestPostProcessorDescriptor(
+						Pattern.compile("http://www.eclipse.org/uml2/\\d\\.0\\.0/UML"), null,
 						new MultiplicityElementChangePostProcessor(), 25));
 	}
 
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociation3Test.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociation3Test.java
index b54f65296..8aaaef892 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociation3Test.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociation3Test.java
@@ -197,8 +197,8 @@ public class AddAssociation3Test extends AbstractUMLTest {
 					"model.Class1", null);
 			addRefAssociationInPropertyClass0Description = changedReference("model.AssociationClass0.class0",
 					"association", "model.AssociationClass0", null);
-			addRefTypeInPropertyClass0Description = changedReference("model.AssociationClass0.class0",
-					"type", "model.Class0", null);
+			addRefTypeInPropertyClass0Description = changedReference("model.AssociationClass0.class0", "type",
+					"model.Class0", null);
 			addLiteralIntegerInClass1Description = removedLowerValueIn("model.Class0.class1");
 			addUnlimitedNaturalInClass1Description = removedUpperValueIn("model.Class0.class1");
 			addLiteralIntegerInClass0Description = removedLowerValueIn("model.AssociationClass0.class0");
@@ -219,8 +219,8 @@ public class AddAssociation3Test extends AbstractUMLTest {
 					"model.Class1");
 			addRefAssociationInPropertyClass0Description = changedReference("model.AssociationClass0.class0",
 					"association", null, "model.AssociationClass0");
-			addRefTypeInPropertyClass0Description = changedReference("model.AssociationClass0.class0",
-					"type", null, "model.Class0");
+			addRefTypeInPropertyClass0Description = changedReference("model.AssociationClass0.class0", "type",
+					null, "model.Class0");
 			addLiteralIntegerInClass1Description = addedLowerValueIn("model.Class0.class1");
 			addUnlimitedNaturalInClass1Description = addedUpperValueIn("model.Class0.class1");
 			addLiteralIntegerInClass0Description = addedLowerValueIn("model.AssociationClass0.class0");
@@ -270,11 +270,11 @@ public class AddAssociation3Test extends AbstractUMLTest {
 		assertEquals(1, count(differences, instanceOf(AssociationChange.class)));
 		Diff addUMLAssociation = null;
 		if (kind.equals(TestKind.ADD)) {
-			addUMLAssociation = Iterators.find(differences.iterator(), and(
-					instanceOf(AssociationChange.class), ofKind(DifferenceKind.ADD)));
+			addUMLAssociation = Iterators.find(differences.iterator(),
+					and(instanceOf(AssociationChange.class), ofKind(DifferenceKind.ADD)));
 		} else {
-			addUMLAssociation = Iterators.find(differences.iterator(), and(
-					instanceOf(AssociationChange.class), ofKind(DifferenceKind.DELETE)));
+			addUMLAssociation = Iterators.find(differences.iterator(),
+					and(instanceOf(AssociationChange.class), ofKind(DifferenceKind.DELETE)));
 		}
 		assertNotNull(addUMLAssociation);
 		assertEquals(13, addUMLAssociation.getRefinedBy().size());
@@ -289,17 +289,17 @@ public class AddAssociation3Test extends AbstractUMLTest {
 		assertTrue(addUMLAssociation.getRefinedBy().contains(addPropertyClass0InAssociation));
 
 		// MultiplicityElementChanges
-		assertTrue(addUMLAssociation.getRefinedBy().contains(
-				Iterators.find(addLiteralIntegerInClass1.getRefines().iterator(),
+		assertTrue(addUMLAssociation.getRefinedBy()
+				.contains(Iterators.find(addLiteralIntegerInClass1.getRefines().iterator(),
 						instanceOf(MultiplicityElementChange.class))));
-		assertTrue(addUMLAssociation.getRefinedBy().contains(
-				Iterators.find(addUnlimitedNaturalInClass1.getRefines().iterator(),
+		assertTrue(addUMLAssociation.getRefinedBy()
+				.contains(Iterators.find(addUnlimitedNaturalInClass1.getRefines().iterator(),
 						instanceOf(MultiplicityElementChange.class))));
-		assertTrue(addUMLAssociation.getRefinedBy().contains(
-				Iterators.find(addLiteralIntegerInClass0.getRefines().iterator(),
+		assertTrue(addUMLAssociation.getRefinedBy()
+				.contains(Iterators.find(addLiteralIntegerInClass0.getRefines().iterator(),
 						instanceOf(MultiplicityElementChange.class))));
-		assertTrue(addUMLAssociation.getRefinedBy().contains(
-				Iterators.find(addUnlimitedNaturalInClass0.getRefines().iterator(),
+		assertTrue(addUMLAssociation.getRefinedBy()
+				.contains(Iterators.find(addUnlimitedNaturalInClass0.getRefines().iterator(),
 						instanceOf(MultiplicityElementChange.class))));
 
 		// CHECK REQUIREMENT
@@ -376,8 +376,8 @@ public class AddAssociation3Test extends AbstractUMLTest {
 		}
 
 		assertNotNull(addPropertyClass1InAssociation.getEquivalence());
-		assertTrue(addPropertyClass1InAssociation.getEquivalence().getDifferences().contains(
-				addRefAssociationInPropertyClass1));
+		assertTrue(addPropertyClass1InAssociation.getEquivalence().getDifferences()
+				.contains(addRefAssociationInPropertyClass1));
 
 		testIntersections(comparison);
 	}
@@ -407,8 +407,8 @@ public class AddAssociation3Test extends AbstractUMLTest {
 	protected void registerPostProcessors(Registry<String> postProcessorRegistry) {
 		super.registerPostProcessors(postProcessorRegistry);
 		postProcessorRegistry.put(MultiplicityElementChangePostProcessor.class.getName(),
-				new TestPostProcessor.TestPostProcessorDescriptor(Pattern
-						.compile("http://www.eclipse.org/uml2/\\d\\.0\\.0/UML"), null,
+				new TestPostProcessor.TestPostProcessorDescriptor(
+						Pattern.compile("http://www.eclipse.org/uml2/\\d\\.0\\.0/UML"), null,
 						new MultiplicityElementChangePostProcessor(), 25));
 	}
 }
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociationTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociationTest.java
index 504faee99..88ffc5c91 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociationTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/AddAssociationTest.java
@@ -288,11 +288,11 @@ public class AddAssociationTest extends AbstractUMLTest {
 		assertEquals(1, count(differences, instanceOf(AssociationChange.class)));
 		Diff addUMLAssociation = null;
 		if (kind.equals(TestKind.ADD)) {
-			addUMLAssociation = Iterators.find(differences.iterator(), and(
-					instanceOf(AssociationChange.class), ofKind(DifferenceKind.ADD)));
+			addUMLAssociation = Iterators.find(differences.iterator(),
+					and(instanceOf(AssociationChange.class), ofKind(DifferenceKind.ADD)));
 		} else {
-			addUMLAssociation = Iterators.find(differences.iterator(), and(
-					instanceOf(AssociationChange.class), ofKind(DifferenceKind.DELETE)));
+			addUMLAssociation = Iterators.find(differences.iterator(),
+					and(instanceOf(AssociationChange.class), ofKind(DifferenceKind.DELETE)));
 		}
 		assertNotNull(addUMLAssociation);
 		assertEquals(15, addUMLAssociation.getRefinedBy().size());
@@ -308,32 +308,32 @@ public class AddAssociationTest extends AbstractUMLTest {
 		assertTrue(addUMLAssociation.getRefinedBy().contains(addOwnedEndClass1InAssociation));
 		assertTrue(addUMLAssociation.getRefinedBy().contains(addOwnedEndClass2InAssociation));
 		// MultiplicityElementChanges
-		assertTrue(addUMLAssociation.getRefinedBy().contains(
-				Iterators.find(addLiteralIntegerInClass1.getRefines().iterator(),
+		assertTrue(addUMLAssociation.getRefinedBy()
+				.contains(Iterators.find(addLiteralIntegerInClass1.getRefines().iterator(),
 						instanceOf(MultiplicityElementChange.class))));
-		assertTrue(addUMLAssociation.getRefinedBy().contains(
-				Iterators.find(addUnlimitedNaturalInClass1.getRefines().iterator(),
+		assertTrue(addUMLAssociation.getRefinedBy()
+				.contains(Iterators.find(addUnlimitedNaturalInClass1.getRefines().iterator(),
 						instanceOf(MultiplicityElementChange.class))));
-		assertTrue(addUMLAssociation.getRefinedBy().contains(
-				Iterators.find(addLiteralIntegerInClass2.getRefines().iterator(),
+		assertTrue(addUMLAssociation.getRefinedBy()
+				.contains(Iterators.find(addLiteralIntegerInClass2.getRefines().iterator(),
 						instanceOf(MultiplicityElementChange.class))));
-		assertTrue(addUMLAssociation.getRefinedBy().contains(
-				Iterators.find(addUnlimitedNaturalInClass2.getRefines().iterator(),
+		assertTrue(addUMLAssociation.getRefinedBy()
+				.contains(Iterators.find(addUnlimitedNaturalInClass2.getRefines().iterator(),
 						instanceOf(MultiplicityElementChange.class))));
 
 		// CHECK REQUIREMENT
 		if (kind.equals(TestKind.ADD)) {
 			assertEquals(2, addRefAssociationInPropertyClass1.getRequires().size());
-			assertTrue(addRefAssociationInPropertyClass1.getRequires().contains(
-					addOwnedEndClass1InAssociation));
+			assertTrue(
+					addRefAssociationInPropertyClass1.getRequires().contains(addOwnedEndClass1InAssociation));
 			assertTrue(addRefAssociationInPropertyClass1.getRequires().contains(addAssociation));
 
 			assertEquals(1, addRefTypeInPropertyClass1.getRequires().size());
 			assertTrue(addRefTypeInPropertyClass1.getRequires().contains(addOwnedEndClass1InAssociation));
 
 			assertEquals(2, addRefAssociationInPropertyClass2.getRequires().size());
-			assertTrue(addRefAssociationInPropertyClass2.getRequires().contains(
-					addOwnedEndClass2InAssociation));
+			assertTrue(
+					addRefAssociationInPropertyClass2.getRequires().contains(addOwnedEndClass2InAssociation));
 			assertTrue(addRefAssociationInPropertyClass2.getRequires().contains(addAssociation));
 
 			assertEquals(1, addRefTypeInPropertyClass2.getRequires().size());
@@ -344,13 +344,13 @@ public class AddAssociationTest extends AbstractUMLTest {
 
 			assertEquals(2, addNavigableOwnedEndClass1InAssociation.getRequires().size());
 			assertTrue(addNavigableOwnedEndClass1InAssociation.getRequires().contains(addAssociation));
-			assertTrue(addNavigableOwnedEndClass1InAssociation.getRequires().contains(
-					addOwnedEndClass1InAssociation));
+			assertTrue(addNavigableOwnedEndClass1InAssociation.getRequires()
+					.contains(addOwnedEndClass1InAssociation));
 
 			assertEquals(2, addNavigableOwnedEndClass2InAssociation.getRequires().size());
 			assertTrue(addNavigableOwnedEndClass2InAssociation.getRequires().contains(addAssociation));
-			assertTrue(addNavigableOwnedEndClass2InAssociation.getRequires().contains(
-					addOwnedEndClass2InAssociation));
+			assertTrue(addNavigableOwnedEndClass2InAssociation.getRequires()
+					.contains(addOwnedEndClass2InAssociation));
 
 			assertEquals(1, addLiteralIntegerInClass1.getRequires().size());
 			assertTrue(addLiteralIntegerInClass1.getRequires().contains(addOwnedEndClass1InAssociation));
@@ -418,8 +418,8 @@ public class AddAssociationTest extends AbstractUMLTest {
 	protected void registerPostProcessors(Registry<String> postProcessorRegistry) {
 		super.registerPostProcessors(postProcessorRegistry);
 		postProcessorRegistry.put(MultiplicityElementChangePostProcessor.class.getName(),
-				new TestPostProcessor.TestPostProcessorDescriptor(Pattern
-						.compile("http://www.eclipse.org/uml2/\\d\\.0\\.0/UML"), null,
+				new TestPostProcessor.TestPostProcessorDescriptor(
+						Pattern.compile("http://www.eclipse.org/uml2/\\d\\.0\\.0/UML"), null,
 						new MultiplicityElementChangePostProcessor(), 25));
 	}
 }
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/ChangeAssociationTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/ChangeAssociationTest.java
index c638cd3a3..a8394fbc1 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/ChangeAssociationTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/association/ChangeAssociationTest.java
@@ -189,8 +189,8 @@ public class ChangeAssociationTest extends AbstractUMLTest {
 					null, "model.Class2");
 			addLiteralIntegerInClass2Description = addedLowerValueIn("model.class1_class0_0.Class2");
 			addUnlimitedNaturalInClass2Description = addedUpperValueIn("model.class1_class0_0.Class2");
-			addPropertyClass2InAssociationDescription = addedToReference("model.class1_class0_0",
-					"memberEnd", "model.class1_class0_0.Class2");
+			addPropertyClass2InAssociationDescription = addedToReference("model.class1_class0_0", "memberEnd",
+					"model.class1_class0_0.Class2");
 		}
 
 		final Diff addPropertyClass2 = Iterators.find(differences.iterator(), addPropertyClass2Description);
@@ -215,8 +215,8 @@ public class ChangeAssociationTest extends AbstractUMLTest {
 		// CHECK EXTENSION
 		// No extension anymore
 		assertEquals(0, count(differences, instanceOf(AssociationChange.class)));
-		Diff changeUMLAssociation = Iterators.find(differences.iterator(), and(
-				instanceOf(AssociationChange.class), ofKind(DifferenceKind.CHANGE)), null);
+		Diff changeUMLAssociation = Iterators.find(differences.iterator(),
+				and(instanceOf(AssociationChange.class), ofKind(DifferenceKind.CHANGE)), null);
 		assertNull(changeUMLAssociation);
 		// assertNotNull(changeUMLAssociation);
 		// assertEquals(5, changeUMLAssociation.getRefinedBy().size());
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 a94b152d1..73ce90550 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
@@ -143,11 +143,11 @@ public class AddAbstractionTest extends AbstractUMLTest {
 		assertEquals(1, count(differences, instanceOf(DirectedRelationshipChange.class)));
 		Diff addUMLDependency = null;
 		if (kind.equals(TestKind.ADD)) {
-			addUMLDependency = Iterators.find(differences.iterator(), and(
-					instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.ADD)));
+			addUMLDependency = Iterators.find(differences.iterator(),
+					and(instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.ADD)));
 		} else {
-			addUMLDependency = Iterators.find(differences.iterator(), and(
-					instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.DELETE)));
+			addUMLDependency = Iterators.find(differences.iterator(),
+					and(instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.DELETE)));
 		}
 		assertNotNull(addUMLDependency);
 		assertEquals(3, 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 f7502142c..b19d7c8e6 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
@@ -142,11 +142,11 @@ public class AddDependencyTest extends AbstractUMLTest {
 		assertEquals(1, count(differences, instanceOf(DirectedRelationshipChange.class)));
 		Diff addUMLDependency = null;
 		if (kind.equals(TestKind.ADD)) {
-			addUMLDependency = Iterators.find(differences.iterator(), and(
-					instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.ADD)));
+			addUMLDependency = Iterators.find(differences.iterator(),
+					and(instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.ADD)));
 		} else {
-			addUMLDependency = Iterators.find(differences.iterator(), and(
-					instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.DELETE)));
+			addUMLDependency = Iterators.find(differences.iterator(),
+					and(instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.DELETE)));
 		}
 		assertNotNull(addUMLDependency);
 		assertEquals(3, 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 ee9658a3f..c99dfcc44 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
@@ -115,7 +115,8 @@ public class AddInterfaceRealizationTest extends AbstractUMLTest {
 		Predicate<? super Diff> addContractInInterfaceRealizationDescription = null;
 
 		if (kind.equals(TestKind.DELETE)) {
-			//addInterfaceRealizationDescription = removed("model.Class0.InterfaceRealization0"); //$NON-NLS-1$
+			// addInterfaceRealizationDescription = removed("model.Class0.InterfaceRealization0");
+			// //$NON-NLS-1$
 			addInterfaceRealizationDescription = removedFromReference("model.Class0", "interfaceRealization",
 					"model.Class0.InterfaceRealization0");
 			addClientInInterfaceRealizationDescription = removedFromReference(
@@ -125,9 +126,9 @@ public class AddInterfaceRealizationTest extends AbstractUMLTest {
 			addContractInInterfaceRealizationDescription = changedReference(
 					"model.Class0.InterfaceRealization0", "contract", "model.Interface0", null);
 		} else {
-			//addInterfaceRealizationDescription = added("model.Class0.InterfaceRealization0"); //$NON-NLS-1$
-			addInterfaceRealizationDescription = addedToReference(
-					"model.Class0", "interfaceRealization", "model.Class0.InterfaceRealization0"); //$NON-NLS-1$
+			// addInterfaceRealizationDescription = added("model.Class0.InterfaceRealization0"); //$NON-NLS-1$
+			addInterfaceRealizationDescription = addedToReference("model.Class0", "interfaceRealization", //$NON-NLS-1$
+					"model.Class0.InterfaceRealization0");
 			addClientInInterfaceRealizationDescription = addedToReference(
 					"model.Class0.InterfaceRealization0", "client", "model.Class0");
 			addSupplierInInterfaceRealizationDescription = addedToReference(
@@ -154,11 +155,11 @@ public class AddInterfaceRealizationTest extends AbstractUMLTest {
 		assertEquals(1, count(differences, instanceOf(DirectedRelationshipChange.class)));
 		Diff addUMLDependency = null;
 		if (kind.equals(TestKind.ADD)) {
-			addUMLDependency = Iterators.find(differences.iterator(), and(
-					instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.ADD)));
+			addUMLDependency = Iterators.find(differences.iterator(),
+					and(instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.ADD)));
 		} else {
-			addUMLDependency = Iterators.find(differences.iterator(), and(
-					instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.DELETE)));
+			addUMLDependency = Iterators.find(differences.iterator(),
+					and(instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.DELETE)));
 		}
 		assertNotNull(addUMLDependency);
 		assertEquals(4, 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 93bd28b99..eaae8977d 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
@@ -143,11 +143,11 @@ public class AddRealizationTest extends AbstractUMLTest {
 		assertEquals(1, count(differences, instanceOf(DirectedRelationshipChange.class)));
 		Diff addUMLDependency = null;
 		if (kind.equals(TestKind.ADD)) {
-			addUMLDependency = Iterators.find(differences.iterator(), and(
-					instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.ADD)));
+			addUMLDependency = Iterators.find(differences.iterator(),
+					and(instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.ADD)));
 		} else {
-			addUMLDependency = Iterators.find(differences.iterator(), and(
-					instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.DELETE)));
+			addUMLDependency = Iterators.find(differences.iterator(),
+					and(instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.DELETE)));
 		}
 		assertNotNull(addUMLDependency);
 		assertEquals(3, 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 379963319..7ca7b5096 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
@@ -126,8 +126,8 @@ public class AddSubstitutionTest extends AbstractUMLTest {
 			addContractInInterfaceRealizationDescription = changedReference("model.Class0.Substitution0",
 					"contract", "model.Class1", null);
 		} else {
-			addInterfaceRealizationDescription = addedToReference(
-					"model.Class0", "substitution", "model.Class0.Substitution0"); //$NON-NLS-1$
+			addInterfaceRealizationDescription = addedToReference("model.Class0", "substitution", //$NON-NLS-1$
+					"model.Class0.Substitution0");
 			addClientInInterfaceRealizationDescription = addedToReference("model.Class0.Substitution0",
 					"client", "model.Class0");
 			addSupplierInInterfaceRealizationDescription = addedToReference("model.Class0.Substitution0",
@@ -154,11 +154,11 @@ public class AddSubstitutionTest extends AbstractUMLTest {
 		assertEquals(1, count(differences, instanceOf(DirectedRelationshipChange.class)));
 		Diff addUMLDependency = null;
 		if (kind.equals(TestKind.ADD)) {
-			addUMLDependency = Iterators.find(differences.iterator(), and(
-					instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.ADD)));
+			addUMLDependency = Iterators.find(differences.iterator(),
+					and(instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.ADD)));
 		} else {
-			addUMLDependency = Iterators.find(differences.iterator(), and(
-					instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.DELETE)));
+			addUMLDependency = Iterators.find(differences.iterator(),
+					and(instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.DELETE)));
 		}
 		assertNotNull(addUMLDependency);
 		assertEquals(4, 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 b9c32c051..c57df2947 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
@@ -124,7 +124,8 @@ public class AddUsageTest extends AbstractUMLTest {
 		} else {
 			addDependencyDescription = added("model.Usage0"); //$NON-NLS-1$
 			addRefClass0InDependencyDescription = addedToReference("model.Usage0", "client", "model.Class0");
-			addRefClass1InDependencyDescription = addedToReference("model.Usage0", "supplier", "model.Class1");
+			addRefClass1InDependencyDescription = addedToReference("model.Usage0", "supplier",
+					"model.Class1");
 		}
 
 		final Diff addDependency = Iterators.find(differences.iterator(), addDependencyDescription);
@@ -141,11 +142,11 @@ public class AddUsageTest extends AbstractUMLTest {
 		assertEquals(1, count(differences, instanceOf(DirectedRelationshipChange.class)));
 		Diff addUMLDependency = null;
 		if (kind.equals(TestKind.ADD)) {
-			addUMLDependency = Iterators.find(differences.iterator(), and(
-					instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.ADD)));
+			addUMLDependency = Iterators.find(differences.iterator(),
+					and(instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.ADD)));
 		} else {
-			addUMLDependency = Iterators.find(differences.iterator(), and(
-					instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.DELETE)));
+			addUMLDependency = Iterators.find(differences.iterator(),
+					and(instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.DELETE)));
 		}
 		assertNotNull(addUMLDependency);
 		assertEquals(3, 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 cbf07a701..0fdadb5be 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
@@ -124,8 +124,8 @@ public class ChangeDependencyTest extends AbstractUMLTest {
 		// CHECK EXTENSION
 		// No extension anymore
 		assertEquals(0, count(differences, instanceOf(DirectedRelationshipChange.class)));
-		Diff changeUMLDependency = Iterators.find(differences.iterator(), and(
-				instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.CHANGE)), null);
+		Diff changeUMLDependency = Iterators.find(differences.iterator(),
+				and(instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.CHANGE)), null);
 		assertNull(changeUMLDependency);
 		// assertNotNull(changeUMLDependency);
 		// assertEquals(1, 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 e6a3db04f..92cd9d0c6 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
@@ -124,8 +124,8 @@ public class ChangeUsageTest extends AbstractUMLTest {
 		// CHECK EXTENSION
 		// no extension any more
 		assertEquals(0, count(differences, instanceOf(DirectedRelationshipChange.class)));
-		Diff changeUMLDependency = Iterators.find(differences.iterator(), and(
-				instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.CHANGE)), null);
+		Diff changeUMLDependency = Iterators.find(differences.iterator(),
+				and(instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.CHANGE)), null);
 		assertNull(changeUMLDependency);
 		// assertNotNull(changeUMLDependency);
 		// assertEquals(1, changeUMLDependency.getRefinedBy().size());
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/edit/provider/StaticStereotypedElementItemProviderTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/edit/provider/StaticStereotypedElementItemProviderTest.java
index 37d64a876..38978ddc4 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/edit/provider/StaticStereotypedElementItemProviderTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/edit/provider/StaticStereotypedElementItemProviderTest.java
@@ -60,8 +60,8 @@ public class StaticStereotypedElementItemProviderTest extends AbstractStaticProf
 			org.eclipse.emf.compare.postprocessor.IPostProcessor.Descriptor.Registry<String> postProcessorRegistry) {
 		super.registerPostProcessors(postProcessorRegistry);
 		postProcessorRegistry.put(StereotypedElementChangePostProcessor.class.getName(),
-				new TestPostProcessor.TestPostProcessorDescriptor(Pattern
-						.compile("http://www.eclipse.org/uml2/\\d\\.0\\.0/UML"), null, //$NON-NLS-1$
+				new TestPostProcessor.TestPostProcessorDescriptor(
+						Pattern.compile("http://www.eclipse.org/uml2/\\d\\.0\\.0/UML"), null, //$NON-NLS-1$
 						new StereotypedElementChangePostProcessor(), 25));
 	}
 
@@ -73,8 +73,8 @@ public class StaticStereotypedElementItemProviderTest extends AbstractStaticProf
 
 	@Test
 	public void testIconsAndLabelsStaticProfile() throws IOException {
-		AdapterFactory stereotypedElementItemProviderDecorator = new ComposedAdapterFactory(Lists
-				.<AdapterFactory> newArrayList(new UMLProfileItemProviderAdapterFactoryDecorator(),
+		AdapterFactory stereotypedElementItemProviderDecorator = new ComposedAdapterFactory(
+				Lists.<AdapterFactory> newArrayList(new UMLProfileItemProviderAdapterFactoryDecorator(),
 						new UML2CompareTestProfileItemProviderAdapterFactory()));
 
 		// Map<Ordered list of applied stereotyped, Expected icon>
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/edit/provider/StereotypedElementItemProviderTestUtil.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/edit/provider/StereotypedElementItemProviderTestUtil.java
index 70bf7b55f..1eeef2c26 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/edit/provider/StereotypedElementItemProviderTestUtil.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/edit/provider/StereotypedElementItemProviderTestUtil.java
@@ -70,8 +70,7 @@ public class StereotypedElementItemProviderTestUtil {
 					// Checks icon
 					List<String> actualIcons = getIconsLocation(itemLabelProvider.getImage(eObject));
 					assertEquals(1, actualIcons.size());
-					assertEquals(
-							"Wrong icon for stereotypes :" + generateExpectedIconKey(appliedStereotypes), //$NON-NLS-1$
+					assertEquals("Wrong icon for stereotypes :" + generateExpectedIconKey(appliedStereotypes), //$NON-NLS-1$
 							getExpectedIcon(appliedStereotypes, expectedStaticIcons), actualIcons.get(0));
 				} else {
 					assertNotNull(itemLabelProvider);
@@ -82,7 +81,8 @@ public class StereotypedElementItemProviderTestUtil {
 		}
 	}
 
-	private static String getExpectedIcon(List<Stereotype> stereotypes, Map<String, String> expectedIconsMap) {
+	private static String getExpectedIcon(List<Stereotype> stereotypes,
+			Map<String, String> expectedIconsMap) {
 		return expectedIconsMap.get(generateExpectedIconKey(stereotypes));
 	}
 
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/executionSpecification/AddActionExecutionSpecificationTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/executionSpecification/AddActionExecutionSpecificationTest.java
index e728b4341..0b94742d2 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/executionSpecification/AddActionExecutionSpecificationTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/executionSpecification/AddActionExecutionSpecificationTest.java
@@ -145,8 +145,8 @@ public class AddActionExecutionSpecificationTest extends AbstractUMLTest {
 					"coveredBy", "model.interaction0.ActionExecSpec0Finish0");
 			addCoveredByInLifeline1Description3 = removedFromReference("model.interaction0.Lifeline1",
 					"coveredBy", "model.interaction0.ActionExecSpec0");
-			addCoveredInActionExecSpecDescription = removedFromReference(
-					"model.interaction0.ActionExecSpec0", "covered", "model.interaction0.Lifeline1");
+			addCoveredInActionExecSpecDescription = removedFromReference("model.interaction0.ActionExecSpec0",
+					"covered", "model.interaction0.Lifeline1");
 		} else {
 			addActionExecSpecDescription = added("model.interaction0.ActionExecSpec0"); //$NON-NLS-1$
 			addStartDescription = added("model.interaction0.ActionExecSpec0Start0"); //$NON-NLS-1$
@@ -213,11 +213,11 @@ public class AddActionExecutionSpecificationTest extends AbstractUMLTest {
 		assertEquals(1, count(differences, instanceOf(ExecutionSpecificationChange.class)));
 		Diff addUMLMessage = null;
 		if (kind.equals(TestKind.ADD)) {
-			addUMLMessage = Iterators.find(differences.iterator(), and(
-					instanceOf(ExecutionSpecificationChange.class), ofKind(DifferenceKind.ADD)));
+			addUMLMessage = Iterators.find(differences.iterator(),
+					and(instanceOf(ExecutionSpecificationChange.class), ofKind(DifferenceKind.ADD)));
 		} else {
-			addUMLMessage = Iterators.find(differences.iterator(), and(
-					instanceOf(ExecutionSpecificationChange.class), ofKind(DifferenceKind.DELETE)));
+			addUMLMessage = Iterators.find(differences.iterator(),
+					and(instanceOf(ExecutionSpecificationChange.class), ofKind(DifferenceKind.DELETE)));
 		}
 		assertNotNull(addUMLMessage);
 		assertEquals(13, addUMLMessage.getRefinedBy().size());
@@ -335,10 +335,10 @@ public class AddActionExecutionSpecificationTest extends AbstractUMLTest {
 
 		assertNotNull(addCoveredInActionExecSpec.getEquivalence());
 		assertEquals(2, addCoveredInActionExecSpec.getEquivalence().getDifferences().size());
-		assertTrue(addCoveredInActionExecSpec.getEquivalence().getDifferences().contains(
-				addCoveredInActionExecSpec));
-		assertTrue(addCoveredInActionExecSpec.getEquivalence().getDifferences().contains(
-				addCoveredByInLifeline1_3));
+		assertTrue(addCoveredInActionExecSpec.getEquivalence().getDifferences()
+				.contains(addCoveredInActionExecSpec));
+		assertTrue(addCoveredInActionExecSpec.getEquivalence().getDifferences()
+				.contains(addCoveredByInLifeline1_3));
 
 		testIntersections(comparison);
 
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/executionSpecification/AddBehaviorExecutionSpecificationTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/executionSpecification/AddBehaviorExecutionSpecificationTest.java
index a7fd9eccf..701587ffe 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/executionSpecification/AddBehaviorExecutionSpecificationTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/executionSpecification/AddBehaviorExecutionSpecificationTest.java
@@ -213,11 +213,11 @@ public class AddBehaviorExecutionSpecificationTest extends AbstractUMLTest {
 		assertEquals(1, count(differences, instanceOf(ExecutionSpecificationChange.class)));
 		Diff addUMLMessage = null;
 		if (kind.equals(TestKind.ADD)) {
-			addUMLMessage = Iterators.find(differences.iterator(), and(
-					instanceOf(ExecutionSpecificationChange.class), ofKind(DifferenceKind.ADD)));
+			addUMLMessage = Iterators.find(differences.iterator(),
+					and(instanceOf(ExecutionSpecificationChange.class), ofKind(DifferenceKind.ADD)));
 		} else {
-			addUMLMessage = Iterators.find(differences.iterator(), and(
-					instanceOf(ExecutionSpecificationChange.class), ofKind(DifferenceKind.DELETE)));
+			addUMLMessage = Iterators.find(differences.iterator(),
+					and(instanceOf(ExecutionSpecificationChange.class), ofKind(DifferenceKind.DELETE)));
 		}
 		assertNotNull(addUMLMessage);
 		assertEquals(13, addUMLMessage.getRefinedBy().size());
@@ -335,10 +335,10 @@ public class AddBehaviorExecutionSpecificationTest extends AbstractUMLTest {
 
 		assertNotNull(addCoveredInActionExecSpec.getEquivalence());
 		assertEquals(2, addCoveredInActionExecSpec.getEquivalence().getDifferences().size());
-		assertTrue(addCoveredInActionExecSpec.getEquivalence().getDifferences().contains(
-				addCoveredInActionExecSpec));
-		assertTrue(addCoveredInActionExecSpec.getEquivalence().getDifferences().contains(
-				addCoveredByInLifeline1_3));
+		assertTrue(addCoveredInActionExecSpec.getEquivalence().getDifferences()
+				.contains(addCoveredInActionExecSpec));
+		assertTrue(addCoveredInActionExecSpec.getEquivalence().getDifferences()
+				.contains(addCoveredByInLifeline1_3));
 
 		testIntersections(comparison);
 
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/extend/AddExtendTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/extend/AddExtendTest.java
index cf26bb649..db0885807 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/extend/AddExtendTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/extend/AddExtendTest.java
@@ -146,11 +146,11 @@ public class AddExtendTest extends AbstractUMLTest {
 		assertEquals(1, count(differences, instanceOf(ExtendChange.class)));
 		Diff addUMLExtend = null;
 		if (kind.equals(TestKind.ADD)) {
-			addUMLExtend = Iterators.find(differences.iterator(), and(instanceOf(ExtendChange.class),
-					ofKind(DifferenceKind.ADD)));
+			addUMLExtend = Iterators.find(differences.iterator(),
+					and(instanceOf(ExtendChange.class), ofKind(DifferenceKind.ADD)));
 		} else {
-			addUMLExtend = Iterators.find(differences.iterator(), and(instanceOf(ExtendChange.class),
-					ofKind(DifferenceKind.DELETE)));
+			addUMLExtend = Iterators.find(differences.iterator(),
+					and(instanceOf(ExtendChange.class), ofKind(DifferenceKind.DELETE)));
 		}
 		assertNotNull(addUMLExtend);
 		assertEquals(4, addUMLExtend.getRefinedBy().size());
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/generalizationSet/AddGeneralizationSetTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/generalizationSet/AddGeneralizationSetTest.java
index a33b939a4..fb3539368 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/generalizationSet/AddGeneralizationSetTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/generalizationSet/AddGeneralizationSetTest.java
@@ -167,11 +167,11 @@ public class AddGeneralizationSetTest extends AbstractUMLTest {
 		assertEquals(1, count(differences, instanceOf(GeneralizationSetChange.class)));
 		Diff addUMLGeneralizationSet = null;
 		if (kind.equals(TestKind.ADD)) {
-			addUMLGeneralizationSet = Iterators.find(differences.iterator(), and(
-					instanceOf(GeneralizationSetChange.class), ofKind(DifferenceKind.ADD)));
+			addUMLGeneralizationSet = Iterators.find(differences.iterator(),
+					and(instanceOf(GeneralizationSetChange.class), ofKind(DifferenceKind.ADD)));
 		} else {
-			addUMLGeneralizationSet = Iterators.find(differences.iterator(), and(
-					instanceOf(GeneralizationSetChange.class), ofKind(DifferenceKind.DELETE)));
+			addUMLGeneralizationSet = Iterators.find(differences.iterator(),
+					and(instanceOf(GeneralizationSetChange.class), ofKind(DifferenceKind.DELETE)));
 		}
 		assertNotNull(addUMLGeneralizationSet);
 		assertEquals(5, addUMLGeneralizationSet.getRefinedBy().size());
@@ -220,13 +220,13 @@ public class AddGeneralizationSetTest extends AbstractUMLTest {
 
 		assertNotNull(addRefGeneralizationInGeneralizationSet1.getEquivalence());
 		assertEquals(2, addRefGeneralizationInGeneralizationSet1.getEquivalence().getDifferences().size());
-		assertTrue(addRefGeneralizationInGeneralizationSet1.getEquivalence().getDifferences().contains(
-				addRefGeneralizationSetInClass0));
+		assertTrue(addRefGeneralizationInGeneralizationSet1.getEquivalence().getDifferences()
+				.contains(addRefGeneralizationSetInClass0));
 
 		assertNotNull(addRefGeneralizationInGeneralizationSet2.getEquivalence());
 		assertEquals(2, addRefGeneralizationInGeneralizationSet2.getEquivalence().getDifferences().size());
-		assertTrue(addRefGeneralizationInGeneralizationSet2.getEquivalence().getDifferences().contains(
-				addRefGeneralizationSetInClass2));
+		assertTrue(addRefGeneralizationInGeneralizationSet2.getEquivalence().getDifferences()
+				.contains(addRefGeneralizationSetInClass2));
 
 		testIntersections(comparison);
 
@@ -244,8 +244,8 @@ public class AddGeneralizationSetTest extends AbstractUMLTest {
 			final String referenceName, final String removedQualifiedName,
 			final EStructuralFeature featureDelegate) {
 		// This is only meant for multi-valued references
-		return and(ofKind(DifferenceKind.DELETE), onEObject(qualifiedName), referenceValueMatch(
-				referenceName, removedQualifiedName, true, featureDelegate));
+		return and(ofKind(DifferenceKind.DELETE), onEObject(qualifiedName),
+				referenceValueMatch(referenceName, removedQualifiedName, true, featureDelegate));
 	}
 
 	public static Predicate<? super Diff> addedToReference1(final String qualifiedName,
@@ -260,8 +260,8 @@ public class AddGeneralizationSetTest extends AbstractUMLTest {
 			final String referenceName, final String removedQualifiedName,
 			final EStructuralFeature featureDelegate) {
 		// This is only meant for multi-valued references
-		return and(ofKind(DifferenceKind.ADD), onEObject(qualifiedName), referenceValueMatch(referenceName,
-				removedQualifiedName, true, featureDelegate));
+		return and(ofKind(DifferenceKind.ADD), onEObject(qualifiedName),
+				referenceValueMatch(referenceName, removedQualifiedName, true, featureDelegate));
 	}
 
 	@Override
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/implications/ImplicationsAssociationTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/implications/ImplicationsAssociationTest.java
index 09be485d8..8490bf1c3 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/implications/ImplicationsAssociationTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/implications/ImplicationsAssociationTest.java
@@ -288,8 +288,8 @@ public class ImplicationsAssociationTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.ADD);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addOwnedEndClass1InAssociation).copyLeftToRight(
-				diffs.addOwnedEndClass1InAssociation, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addOwnedEndClass1InAssociation)
+				.copyLeftToRight(diffs.addOwnedEndClass1InAssociation, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.ADD);
@@ -317,8 +317,8 @@ public class ImplicationsAssociationTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.ADD);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addOwnedEndClass1InAssociation).copyLeftToRight(
-				diffs.addOwnedEndClass1InAssociation, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addOwnedEndClass1InAssociation)
+				.copyLeftToRight(diffs.addOwnedEndClass1InAssociation, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.ADD);
@@ -336,8 +336,8 @@ public class ImplicationsAssociationTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.ADD);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addOwnedEndClass1InAssociation).copyLeftToRight(
-				diffs.addOwnedEndClass1InAssociation, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addOwnedEndClass1InAssociation)
+				.copyLeftToRight(diffs.addOwnedEndClass1InAssociation, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.ADD);
@@ -367,8 +367,8 @@ public class ImplicationsAssociationTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.ADD);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addMemberEndClass1InAssociation).copyLeftToRight(
-				diffs.addMemberEndClass1InAssociation, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addMemberEndClass1InAssociation)
+				.copyLeftToRight(diffs.addMemberEndClass1InAssociation, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.ADD);
@@ -396,8 +396,8 @@ public class ImplicationsAssociationTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.ADD);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addMemberEndClass1InAssociation).copyLeftToRight(
-				diffs.addMemberEndClass1InAssociation, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addMemberEndClass1InAssociation)
+				.copyLeftToRight(diffs.addMemberEndClass1InAssociation, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.ADD);
@@ -415,8 +415,8 @@ public class ImplicationsAssociationTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.ADD);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addMemberEndClass1InAssociation).copyLeftToRight(
-				diffs.addMemberEndClass1InAssociation, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addMemberEndClass1InAssociation)
+				.copyLeftToRight(diffs.addMemberEndClass1InAssociation, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.ADD);
@@ -491,8 +491,8 @@ public class ImplicationsAssociationTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.ADD);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addOwnedEndClass1InAssociation).copyRightToLeft(
-				diffs.addOwnedEndClass1InAssociation, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addOwnedEndClass1InAssociation)
+				.copyRightToLeft(diffs.addOwnedEndClass1InAssociation, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.ADD);
@@ -510,8 +510,8 @@ public class ImplicationsAssociationTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.ADD);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addOwnedEndClass1InAssociation).copyRightToLeft(
-				diffs.addOwnedEndClass1InAssociation, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addOwnedEndClass1InAssociation)
+				.copyRightToLeft(diffs.addOwnedEndClass1InAssociation, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.ADD);
@@ -529,8 +529,8 @@ public class ImplicationsAssociationTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.ADD);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addOwnedEndClass1InAssociation).copyRightToLeft(
-				diffs.addOwnedEndClass1InAssociation, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addOwnedEndClass1InAssociation)
+				.copyRightToLeft(diffs.addOwnedEndClass1InAssociation, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.ADD);
@@ -548,8 +548,8 @@ public class ImplicationsAssociationTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.ADD);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addMemberEndClass1InAssociation).copyRightToLeft(
-				diffs.addMemberEndClass1InAssociation, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addMemberEndClass1InAssociation)
+				.copyRightToLeft(diffs.addMemberEndClass1InAssociation, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.ADD);
@@ -567,8 +567,8 @@ public class ImplicationsAssociationTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.ADD);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addMemberEndClass1InAssociation).copyRightToLeft(
-				diffs.addMemberEndClass1InAssociation, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addMemberEndClass1InAssociation)
+				.copyRightToLeft(diffs.addMemberEndClass1InAssociation, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.ADD);
@@ -586,8 +586,8 @@ public class ImplicationsAssociationTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.ADD);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addMemberEndClass1InAssociation).copyRightToLeft(
-				diffs.addMemberEndClass1InAssociation, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addMemberEndClass1InAssociation)
+				.copyRightToLeft(diffs.addMemberEndClass1InAssociation, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.ADD);
@@ -691,8 +691,8 @@ public class ImplicationsAssociationTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.DELETE);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addOwnedEndClass1InAssociation).copyLeftToRight(
-				diffs.addOwnedEndClass1InAssociation, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addOwnedEndClass1InAssociation)
+				.copyLeftToRight(diffs.addOwnedEndClass1InAssociation, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.DELETE);
@@ -710,8 +710,8 @@ public class ImplicationsAssociationTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.DELETE);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addOwnedEndClass1InAssociation).copyLeftToRight(
-				diffs.addOwnedEndClass1InAssociation, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addOwnedEndClass1InAssociation)
+				.copyLeftToRight(diffs.addOwnedEndClass1InAssociation, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.DELETE);
@@ -729,8 +729,8 @@ public class ImplicationsAssociationTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.DELETE);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addOwnedEndClass1InAssociation).copyLeftToRight(
-				diffs.addOwnedEndClass1InAssociation, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addOwnedEndClass1InAssociation)
+				.copyLeftToRight(diffs.addOwnedEndClass1InAssociation, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.DELETE);
@@ -748,8 +748,8 @@ public class ImplicationsAssociationTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.DELETE);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addMemberEndClass1InAssociation).copyLeftToRight(
-				diffs.addMemberEndClass1InAssociation, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addMemberEndClass1InAssociation)
+				.copyLeftToRight(diffs.addMemberEndClass1InAssociation, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.DELETE);
@@ -767,8 +767,8 @@ public class ImplicationsAssociationTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.DELETE);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addMemberEndClass1InAssociation).copyLeftToRight(
-				diffs.addMemberEndClass1InAssociation, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addMemberEndClass1InAssociation)
+				.copyLeftToRight(diffs.addMemberEndClass1InAssociation, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.DELETE);
@@ -786,8 +786,8 @@ public class ImplicationsAssociationTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.DELETE);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addMemberEndClass1InAssociation).copyLeftToRight(
-				diffs.addMemberEndClass1InAssociation, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addMemberEndClass1InAssociation)
+				.copyLeftToRight(diffs.addMemberEndClass1InAssociation, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.DELETE);
@@ -862,8 +862,8 @@ public class ImplicationsAssociationTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.DELETE);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addOwnedEndClass1InAssociation).copyRightToLeft(
-				diffs.addOwnedEndClass1InAssociation, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addOwnedEndClass1InAssociation)
+				.copyRightToLeft(diffs.addOwnedEndClass1InAssociation, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.DELETE);
@@ -881,8 +881,8 @@ public class ImplicationsAssociationTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.DELETE);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addOwnedEndClass1InAssociation).copyRightToLeft(
-				diffs.addOwnedEndClass1InAssociation, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addOwnedEndClass1InAssociation)
+				.copyRightToLeft(diffs.addOwnedEndClass1InAssociation, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.DELETE);
@@ -900,8 +900,8 @@ public class ImplicationsAssociationTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.DELETE);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addOwnedEndClass1InAssociation).copyRightToLeft(
-				diffs.addOwnedEndClass1InAssociation, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addOwnedEndClass1InAssociation)
+				.copyRightToLeft(diffs.addOwnedEndClass1InAssociation, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.DELETE);
@@ -919,8 +919,8 @@ public class ImplicationsAssociationTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.DELETE);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addMemberEndClass1InAssociation).copyRightToLeft(
-				diffs.addMemberEndClass1InAssociation, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addMemberEndClass1InAssociation)
+				.copyRightToLeft(diffs.addMemberEndClass1InAssociation, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.DELETE);
@@ -938,8 +938,8 @@ public class ImplicationsAssociationTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.DELETE);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addMemberEndClass1InAssociation).copyRightToLeft(
-				diffs.addMemberEndClass1InAssociation, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addMemberEndClass1InAssociation)
+				.copyRightToLeft(diffs.addMemberEndClass1InAssociation, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.DELETE);
@@ -957,8 +957,8 @@ public class ImplicationsAssociationTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.DELETE);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addMemberEndClass1InAssociation).copyRightToLeft(
-				diffs.addMemberEndClass1InAssociation, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addMemberEndClass1InAssociation)
+				.copyRightToLeft(diffs.addMemberEndClass1InAssociation, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.DELETE);
@@ -977,41 +977,41 @@ public class ImplicationsAssociationTest extends AbstractUMLTest {
 		if (kind.equals(TestKind.DELETE)) {
 			assertEquals(0, diffs.addNavigableOwnedEndClass1InAssociation.getImplies().size());
 			assertEquals(1, diffs.addNavigableOwnedEndClass1InAssociation.getImpliedBy().size());
-			assertTrue(diffs.addNavigableOwnedEndClass1InAssociation.getImpliedBy().contains(
-					diffs.addOwnedEndClass1InAssociation));
+			assertTrue(diffs.addNavigableOwnedEndClass1InAssociation.getImpliedBy()
+					.contains(diffs.addOwnedEndClass1InAssociation));
 
 			assertEquals(1, diffs.addOwnedEndClass1InAssociation.getImplies().size());
-			assertTrue(diffs.addOwnedEndClass1InAssociation.getImplies().contains(
-					diffs.addNavigableOwnedEndClass1InAssociation));
+			assertTrue(diffs.addOwnedEndClass1InAssociation.getImplies()
+					.contains(diffs.addNavigableOwnedEndClass1InAssociation));
 			assertEquals(2, diffs.addOwnedEndClass1InAssociation.getImpliedBy().size());
-			assertTrue(diffs.addOwnedEndClass1InAssociation.getImpliedBy().contains(
-					diffs.addMemberEndClass1InAssociation));
-			assertTrue(diffs.addOwnedEndClass1InAssociation.getImpliedBy().contains(
-					diffs.addRefAssociationInPropertyClass1));
+			assertTrue(diffs.addOwnedEndClass1InAssociation.getImpliedBy()
+					.contains(diffs.addMemberEndClass1InAssociation));
+			assertTrue(diffs.addOwnedEndClass1InAssociation.getImpliedBy()
+					.contains(diffs.addRefAssociationInPropertyClass1));
 
 			assertEquals(1, diffs.addMemberEndClass1InAssociation.getImplies().size());
-			assertTrue(diffs.addMemberEndClass1InAssociation.getImplies().contains(
-					diffs.addOwnedEndClass1InAssociation));
+			assertTrue(diffs.addMemberEndClass1InAssociation.getImplies()
+					.contains(diffs.addOwnedEndClass1InAssociation));
 			assertEquals(0, diffs.addMemberEndClass1InAssociation.getImpliedBy().size());
 		} else {
 			assertEquals(1, diffs.addNavigableOwnedEndClass1InAssociation.getImplies().size());
-			assertTrue(diffs.addNavigableOwnedEndClass1InAssociation.getImplies().contains(
-					diffs.addOwnedEndClass1InAssociation));
+			assertTrue(diffs.addNavigableOwnedEndClass1InAssociation.getImplies()
+					.contains(diffs.addOwnedEndClass1InAssociation));
 			assertEquals(0, diffs.addNavigableOwnedEndClass1InAssociation.getImpliedBy().size());
 
 			assertEquals(2, diffs.addOwnedEndClass1InAssociation.getImplies().size());
-			assertTrue(diffs.addOwnedEndClass1InAssociation.getImplies().contains(
-					diffs.addMemberEndClass1InAssociation));
-			assertTrue(diffs.addOwnedEndClass1InAssociation.getImplies().contains(
-					diffs.addRefAssociationInPropertyClass1));
+			assertTrue(diffs.addOwnedEndClass1InAssociation.getImplies()
+					.contains(diffs.addMemberEndClass1InAssociation));
+			assertTrue(diffs.addOwnedEndClass1InAssociation.getImplies()
+					.contains(diffs.addRefAssociationInPropertyClass1));
 			assertEquals(1, diffs.addOwnedEndClass1InAssociation.getImpliedBy().size());
-			assertTrue(diffs.addOwnedEndClass1InAssociation.getImpliedBy().contains(
-					diffs.addNavigableOwnedEndClass1InAssociation));
+			assertTrue(diffs.addOwnedEndClass1InAssociation.getImpliedBy()
+					.contains(diffs.addNavigableOwnedEndClass1InAssociation));
 
 			assertEquals(0, diffs.addMemberEndClass1InAssociation.getImplies().size());
 			assertEquals(1, diffs.addMemberEndClass1InAssociation.getImpliedBy().size());
-			assertTrue(diffs.addMemberEndClass1InAssociation.getImpliedBy().contains(
-					diffs.addOwnedEndClass1InAssociation));
+			assertTrue(diffs.addMemberEndClass1InAssociation.getImpliedBy()
+					.contains(diffs.addOwnedEndClass1InAssociation));
 		}
 
 	}
@@ -1044,8 +1044,8 @@ public class ImplicationsAssociationTest extends AbstractUMLTest {
 	private static Predicate<? super Diff> refinesMultiplicityElementChange() {
 		return new Predicate<Diff>() {
 			public boolean apply(Diff input) {
-				return Iterators.any(input.getRefines().iterator(), instanceOf(
-						MultiplicityElementChange.class));
+				return Iterators.any(input.getRefines().iterator(),
+						instanceOf(MultiplicityElementChange.class));
 			}
 		};
 	}
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 f5b59c9da..786fef785 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
@@ -84,8 +84,8 @@ public class ImplicationsInterfaceRealizationTest extends AbstractUMLTest {
 			addSupplierInSubstitutionDescription = removedFromReference("model.Class0.substitution1",
 					"supplier", "model.Interface0");
 		} else {
-			addInterfaceRealizationDescription = addedToReference(
-					"model.Class0", "interfaceRealization", "model.Class0.InterfaceRealization0"); //$NON-NLS-1$
+			addInterfaceRealizationDescription = addedToReference("model.Class0", "interfaceRealization", //$NON-NLS-1$
+					"model.Class0.InterfaceRealization0");
 			addClientInInterfaceRealizationDescription = addedToReference(
 					"model.Class0.InterfaceRealization0", "client", "model.Class0");
 			addSupplierInInterfaceRealizationDescription = addedToReference(
@@ -114,12 +114,14 @@ public class ImplicationsInterfaceRealizationTest extends AbstractUMLTest {
 				addClientInSubstitutionDescription, null);
 		diffs.addSupplierInSubstitution = Iterators.find(differences.iterator(),
 				addSupplierInSubstitutionDescription, 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);
+		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,8 +164,8 @@ public class ImplicationsInterfaceRealizationTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.ADD);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addClientInInterfaceRealization).copyLeftToRight(
-				diffs.addClientInInterfaceRealization, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addClientInInterfaceRealization)
+				.copyLeftToRight(diffs.addClientInInterfaceRealization, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.ADD);
@@ -188,8 +190,8 @@ public class ImplicationsInterfaceRealizationTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.ADD);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addClientInInterfaceRealization).copyLeftToRight(
-				diffs.addClientInInterfaceRealization, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addClientInInterfaceRealization)
+				.copyLeftToRight(diffs.addClientInInterfaceRealization, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.ADD);
@@ -207,8 +209,8 @@ public class ImplicationsInterfaceRealizationTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.ADD);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addClientInInterfaceRealization).copyLeftToRight(
-				diffs.addClientInInterfaceRealization, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addClientInInterfaceRealization)
+				.copyLeftToRight(diffs.addClientInInterfaceRealization, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.ADD);
@@ -235,8 +237,8 @@ public class ImplicationsInterfaceRealizationTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.ADD);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addInterfaceRealization).copyLeftToRight(
-				diffs.addInterfaceRealization, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addInterfaceRealization)
+				.copyLeftToRight(diffs.addInterfaceRealization, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.ADD);
@@ -261,8 +263,8 @@ public class ImplicationsInterfaceRealizationTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.ADD);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addInterfaceRealization).copyLeftToRight(
-				diffs.addInterfaceRealization, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addInterfaceRealization)
+				.copyLeftToRight(diffs.addInterfaceRealization, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.ADD);
@@ -280,8 +282,8 @@ public class ImplicationsInterfaceRealizationTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.ADD);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addInterfaceRealization).copyLeftToRight(
-				diffs.addInterfaceRealization, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addInterfaceRealization)
+				.copyLeftToRight(diffs.addInterfaceRealization, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.ADD);
@@ -308,8 +310,8 @@ public class ImplicationsInterfaceRealizationTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.ADD);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addClientInInterfaceRealization).copyRightToLeft(
-				diffs.addClientInInterfaceRealization, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addClientInInterfaceRealization)
+				.copyRightToLeft(diffs.addClientInInterfaceRealization, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.ADD);
@@ -327,8 +329,8 @@ public class ImplicationsInterfaceRealizationTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.ADD);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addClientInInterfaceRealization).copyRightToLeft(
-				diffs.addClientInInterfaceRealization, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addClientInInterfaceRealization)
+				.copyRightToLeft(diffs.addClientInInterfaceRealization, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.ADD);
@@ -346,8 +348,8 @@ public class ImplicationsInterfaceRealizationTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.ADD);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addClientInInterfaceRealization).copyRightToLeft(
-				diffs.addClientInInterfaceRealization, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addClientInInterfaceRealization)
+				.copyRightToLeft(diffs.addClientInInterfaceRealization, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.ADD);
@@ -365,8 +367,8 @@ public class ImplicationsInterfaceRealizationTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.ADD);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addInterfaceRealization).copyRightToLeft(
-				diffs.addInterfaceRealization, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addInterfaceRealization)
+				.copyRightToLeft(diffs.addInterfaceRealization, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.ADD);
@@ -384,8 +386,8 @@ public class ImplicationsInterfaceRealizationTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.ADD);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addInterfaceRealization).copyRightToLeft(
-				diffs.addInterfaceRealization, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addInterfaceRealization)
+				.copyRightToLeft(diffs.addInterfaceRealization, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.ADD);
@@ -403,8 +405,8 @@ public class ImplicationsInterfaceRealizationTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.ADD);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addInterfaceRealization).copyRightToLeft(
-				diffs.addInterfaceRealization, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addInterfaceRealization)
+				.copyRightToLeft(diffs.addInterfaceRealization, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.ADD);
@@ -451,8 +453,8 @@ public class ImplicationsInterfaceRealizationTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.DELETE);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addClientInInterfaceRealization).copyLeftToRight(
-				diffs.addClientInInterfaceRealization, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addClientInInterfaceRealization)
+				.copyLeftToRight(diffs.addClientInInterfaceRealization, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.DELETE);
@@ -470,8 +472,8 @@ public class ImplicationsInterfaceRealizationTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.DELETE);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addClientInInterfaceRealization).copyLeftToRight(
-				diffs.addClientInInterfaceRealization, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addClientInInterfaceRealization)
+				.copyLeftToRight(diffs.addClientInInterfaceRealization, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.DELETE);
@@ -489,8 +491,8 @@ public class ImplicationsInterfaceRealizationTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.DELETE);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addClientInInterfaceRealization).copyLeftToRight(
-				diffs.addClientInInterfaceRealization, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addClientInInterfaceRealization)
+				.copyLeftToRight(diffs.addClientInInterfaceRealization, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.DELETE);
@@ -508,8 +510,8 @@ public class ImplicationsInterfaceRealizationTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.DELETE);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addInterfaceRealization).copyLeftToRight(
-				diffs.addInterfaceRealization, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addInterfaceRealization)
+				.copyLeftToRight(diffs.addInterfaceRealization, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.DELETE);
@@ -527,8 +529,8 @@ public class ImplicationsInterfaceRealizationTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.DELETE);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addInterfaceRealization).copyLeftToRight(
-				diffs.addInterfaceRealization, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addInterfaceRealization)
+				.copyLeftToRight(diffs.addInterfaceRealization, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.DELETE);
@@ -546,8 +548,8 @@ public class ImplicationsInterfaceRealizationTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.DELETE);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addInterfaceRealization).copyLeftToRight(
-				diffs.addInterfaceRealization, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addInterfaceRealization)
+				.copyLeftToRight(diffs.addInterfaceRealization, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.DELETE);
@@ -565,8 +567,8 @@ public class ImplicationsInterfaceRealizationTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.DELETE);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addClientInInterfaceRealization).copyRightToLeft(
-				diffs.addClientInInterfaceRealization, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addClientInInterfaceRealization)
+				.copyRightToLeft(diffs.addClientInInterfaceRealization, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.DELETE);
@@ -584,8 +586,8 @@ public class ImplicationsInterfaceRealizationTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.DELETE);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addClientInInterfaceRealization).copyRightToLeft(
-				diffs.addClientInInterfaceRealization, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addClientInInterfaceRealization)
+				.copyRightToLeft(diffs.addClientInInterfaceRealization, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.DELETE);
@@ -603,8 +605,8 @@ public class ImplicationsInterfaceRealizationTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.DELETE);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addClientInInterfaceRealization).copyRightToLeft(
-				diffs.addClientInInterfaceRealization, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addClientInInterfaceRealization)
+				.copyRightToLeft(diffs.addClientInInterfaceRealization, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.DELETE);
@@ -622,8 +624,8 @@ public class ImplicationsInterfaceRealizationTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.DELETE);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addInterfaceRealization).copyRightToLeft(
-				diffs.addInterfaceRealization, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addInterfaceRealization)
+				.copyRightToLeft(diffs.addInterfaceRealization, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.DELETE);
@@ -641,8 +643,8 @@ public class ImplicationsInterfaceRealizationTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.DELETE);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addInterfaceRealization).copyRightToLeft(
-				diffs.addInterfaceRealization, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addInterfaceRealization)
+				.copyRightToLeft(diffs.addInterfaceRealization, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.DELETE);
@@ -660,8 +662,8 @@ public class ImplicationsInterfaceRealizationTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.DELETE);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addInterfaceRealization).copyRightToLeft(
-				diffs.addInterfaceRealization, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addInterfaceRealization)
+				.copyRightToLeft(diffs.addInterfaceRealization, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.DELETE);
@@ -678,14 +680,14 @@ public class ImplicationsInterfaceRealizationTest extends AbstractUMLTest {
 
 		if (kind.equals(TestKind.DELETE)) {
 			assertEquals(1, diffs.addInterfaceRealization.getImpliedBy().size());
-			assertTrue(diffs.addInterfaceRealization.getImpliedBy().contains(
-					diffs.addClientInInterfaceRealization));
+			assertTrue(diffs.addInterfaceRealization.getImpliedBy()
+					.contains(diffs.addClientInInterfaceRealization));
 			assertEquals(1, diffs.addSubstitution.getImpliedBy().size());
 			assertTrue(diffs.addSubstitution.getImpliedBy().contains(diffs.addClientInSubstitution));
 		} else {
 			assertEquals(1, diffs.addInterfaceRealization.getImplies().size());
-			assertTrue(diffs.addInterfaceRealization.getImplies().contains(
-					diffs.addClientInInterfaceRealization));
+			assertTrue(diffs.addInterfaceRealization.getImplies()
+					.contains(diffs.addClientInInterfaceRealization));
 			assertEquals(1, diffs.addSubstitution.getImplies().size());
 			assertTrue(diffs.addSubstitution.getImplies().contains(diffs.addClientInSubstitution));
 		}
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/implications/ImplicationsTransitionTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/implications/ImplicationsTransitionTest.java
index 1705205f8..24efb6b83 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/implications/ImplicationsTransitionTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/implications/ImplicationsTransitionTest.java
@@ -72,8 +72,8 @@ public class ImplicationsTransitionTest extends AbstractUMLTest {
 			addTransitionDescription = added("model.StateMachine0.Region0.transition1"); //$NON-NLS-1$
 			addPreConditionDescription = changedReference("model.StateMachine0.Region0.transition1",
 					"preCondition", null, "model.StateMachine0.Region0.transition1.rule1");
-			addOwnedRuleDescription = addedToReference("model.StateMachine0.Region0.transition1",
-					"ownedRule", "model.StateMachine0.Region0.transition1.rule1");
+			addOwnedRuleDescription = addedToReference("model.StateMachine0.Region0.transition1", "ownedRule",
+					"model.StateMachine0.Region0.transition1.rule1");
 			addGuardDescription = changedReference("model.StateMachine0.Region0.transition1", "guard", null,
 					"model.StateMachine0.Region0.transition1.rule1");
 		}
@@ -126,8 +126,8 @@ public class ImplicationsTransitionTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.ADD);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addPrecondition).copyLeftToRight(
-				diffs.addPrecondition, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addPrecondition)
+				.copyLeftToRight(diffs.addPrecondition, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.ADD);
@@ -153,8 +153,8 @@ public class ImplicationsTransitionTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.ADD);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addPrecondition).copyLeftToRight(
-				diffs.addPrecondition, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addPrecondition)
+				.copyLeftToRight(diffs.addPrecondition, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.ADD);
@@ -172,8 +172,8 @@ public class ImplicationsTransitionTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.ADD);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addPrecondition).copyLeftToRight(
-				diffs.addPrecondition, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addPrecondition)
+				.copyLeftToRight(diffs.addPrecondition, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.ADD);
@@ -342,8 +342,8 @@ public class ImplicationsTransitionTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.ADD);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addPrecondition).copyRightToLeft(
-				diffs.addPrecondition, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addPrecondition)
+				.copyRightToLeft(diffs.addPrecondition, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.ADD);
@@ -361,8 +361,8 @@ public class ImplicationsTransitionTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.ADD);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addPrecondition).copyRightToLeft(
-				diffs.addPrecondition, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addPrecondition)
+				.copyRightToLeft(diffs.addPrecondition, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.ADD);
@@ -380,8 +380,8 @@ public class ImplicationsTransitionTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.ADD);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addPrecondition).copyRightToLeft(
-				diffs.addPrecondition, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addPrecondition)
+				.copyRightToLeft(diffs.addPrecondition, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.ADD);
@@ -542,8 +542,8 @@ public class ImplicationsTransitionTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.DELETE);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addPrecondition).copyLeftToRight(
-				diffs.addPrecondition, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addPrecondition)
+				.copyLeftToRight(diffs.addPrecondition, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.DELETE);
@@ -561,8 +561,8 @@ public class ImplicationsTransitionTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.DELETE);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addPrecondition).copyLeftToRight(
-				diffs.addPrecondition, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addPrecondition)
+				.copyLeftToRight(diffs.addPrecondition, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.DELETE);
@@ -580,8 +580,8 @@ public class ImplicationsTransitionTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.DELETE);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addPrecondition).copyLeftToRight(
-				diffs.addPrecondition, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addPrecondition)
+				.copyLeftToRight(diffs.addPrecondition, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.DELETE);
@@ -713,8 +713,8 @@ public class ImplicationsTransitionTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.DELETE);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addPrecondition).copyRightToLeft(
-				diffs.addPrecondition, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addPrecondition)
+				.copyRightToLeft(diffs.addPrecondition, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.DELETE);
@@ -732,8 +732,8 @@ public class ImplicationsTransitionTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.DELETE);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addPrecondition).copyRightToLeft(
-				diffs.addPrecondition, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addPrecondition)
+				.copyRightToLeft(diffs.addPrecondition, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.DELETE);
@@ -751,8 +751,8 @@ public class ImplicationsTransitionTest extends AbstractUMLTest {
 		DiffsOfInterest diffs = getDiffs(comparison, TestKind.DELETE);
 
 		// ** MERGE **
-		getMergerRegistry().getHighestRankingMerger(diffs.addPrecondition).copyRightToLeft(
-				diffs.addPrecondition, new BasicMonitor());
+		getMergerRegistry().getHighestRankingMerger(diffs.addPrecondition)
+				.copyRightToLeft(diffs.addPrecondition, new BasicMonitor());
 
 		comparison = compare(left, right);
 		diffs = getDiffs(comparison, TestKind.DELETE);
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 e0f1657c6..452a52c70 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
@@ -131,11 +131,11 @@ public class AddIncludeTest extends AbstractUMLTest {
 		assertEquals(1, count(differences, instanceOf(DirectedRelationshipChange.class)));
 		Diff addUMLExtend = null;
 		if (kind.equals(TestKind.ADD)) {
-			addUMLExtend = Iterators.find(differences.iterator(), and(
-					instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.ADD)));
+			addUMLExtend = Iterators.find(differences.iterator(),
+					and(instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.ADD)));
 		} else {
-			addUMLExtend = Iterators.find(differences.iterator(), and(
-					instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.DELETE)));
+			addUMLExtend = Iterators.find(differences.iterator(),
+					and(instanceOf(DirectedRelationshipChange.class), ofKind(DifferenceKind.DELETE)));
 		}
 		assertNotNull(addUMLExtend);
 		assertEquals(2, addUMLExtend.getRefinedBy().size());
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/merge/ExtensionMergeTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/merge/ExtensionMergeTest.java
index 2fe23bce0..ff4d2ebdb 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/merge/ExtensionMergeTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/merge/ExtensionMergeTest.java
@@ -89,8 +89,8 @@ public class ExtensionMergeTest extends AbstractUMLTest {
 			merger.copyRightToLeft(diff, null);
 		}
 		final Comparison comparisonAfter = getCompare().compare(scope);
-		assertTrue("Comparison#getDifferences() must be empty after copyAllRightToLeft", comparisonAfter
-				.getDifferences().isEmpty());
+		assertTrue("Comparison#getDifferences() must be empty after copyAllRightToLeft",
+				comparisonAfter.getDifferences().isEmpty());
 	}
 
 	@Override
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/merge/MergeDiffInvolvingRefineDiffTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/merge/MergeDiffInvolvingRefineDiffTest.java
index 5ff372d71..85bd66a04 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/merge/MergeDiffInvolvingRefineDiffTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/merge/MergeDiffInvolvingRefineDiffTest.java
@@ -70,9 +70,8 @@ public class MergeDiffInvolvingRefineDiffTest extends AbstractUMLTest {
 
 		assertEquals(6, differences.size());
 
-		Predicate<? super Diff> removedFromReference = removedFromReference(
-				"SysMLmodel.InternalBlock.Block1", "ownedConnector",
-				"SysMLmodel.InternalBlock.Block1.Connector2");
+		Predicate<? super Diff> removedFromReference = removedFromReference("SysMLmodel.InternalBlock.Block1",
+				"ownedConnector", "SysMLmodel.InternalBlock.Block1.Connector2");
 		final Diff diff = Iterators.find(differences.iterator(), removedFromReference);
 
 		IMerger merger = registry.getHighestRankingMerger(diff);
@@ -84,8 +83,8 @@ public class MergeDiffInvolvingRefineDiffTest extends AbstractUMLTest {
 
 		final Comparison comparisonAfter = getCompare().compare(scope);
 		// The subdiffs are merged with the selected diff (and the dependencies of these subdiffs)
-		assertTrue("Comparison#getDifferences() must be empty after copyRightToLeft", comparisonAfter
-				.getDifferences().isEmpty());
+		assertTrue("Comparison#getDifferences() must be empty after copyRightToLeft",
+				comparisonAfter.getDifferences().isEmpty());
 	}
 
 	@Test
@@ -102,9 +101,8 @@ public class MergeDiffInvolvingRefineDiffTest extends AbstractUMLTest {
 
 		assertEquals(6, differences.size());
 
-		Predicate<? super Diff> removedFromReference = removedFromReference(
-				"SysMLmodel.InternalBlock.Block1", "ownedConnector",
-				"SysMLmodel.InternalBlock.Block1.Connector2");
+		Predicate<? super Diff> removedFromReference = removedFromReference("SysMLmodel.InternalBlock.Block1",
+				"ownedConnector", "SysMLmodel.InternalBlock.Block1.Connector2");
 		final Diff diff = Iterators.find(differences.iterator(), removedFromReference);
 
 		IMerger merger = registry.getHighestRankingMerger(diff);
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/message/AddMessageTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/message/AddMessageTest.java
index d98e97270..2e4f03609 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/message/AddMessageTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/message/AddMessageTest.java
@@ -305,10 +305,10 @@ public class AddMessageTest extends AbstractUMLTest {
 					"receiveEvent", null, "model.interaction0.Message0Recv0");
 			addSendEventInMessageDescription = changedReference("model.interaction0.Message0", "sendEvent",
 					null, "model.interaction0.Message0Send0");
-			addCoveredByInLifeline0Description = addedToReference("model.interaction0.Lifeline0",
-					"coveredBy", "model.interaction0.Message0Send0");
-			addCoveredByInLifeline1Description = addedToReference("model.interaction0.Lifeline1",
-					"coveredBy", "model.interaction0.Message0Recv0");
+			addCoveredByInLifeline0Description = addedToReference("model.interaction0.Lifeline0", "coveredBy",
+					"model.interaction0.Message0Send0");
+			addCoveredByInLifeline1Description = addedToReference("model.interaction0.Lifeline1", "coveredBy",
+					"model.interaction0.Message0Recv0");
 		}
 
 		final Diff addMessage = Iterators.find(differences.iterator(), addMessageDescription);
@@ -347,11 +347,11 @@ public class AddMessageTest extends AbstractUMLTest {
 		assertEquals(1, count(differences, instanceOf(MessageChange.class)));
 		Diff addUMLMessage = null;
 		if (kind.equals(TestKind.ADD)) {
-			addUMLMessage = Iterators.find(differences.iterator(), and(instanceOf(MessageChange.class),
-					ofKind(DifferenceKind.ADD)));
+			addUMLMessage = Iterators.find(differences.iterator(),
+					and(instanceOf(MessageChange.class), ofKind(DifferenceKind.ADD)));
 		} else {
-			addUMLMessage = Iterators.find(differences.iterator(), and(instanceOf(MessageChange.class),
-					ofKind(DifferenceKind.DELETE)));
+			addUMLMessage = Iterators.find(differences.iterator(),
+					and(instanceOf(MessageChange.class), ofKind(DifferenceKind.DELETE)));
 		}
 		assertNotNull(addUMLMessage);
 		assertEquals(11, addUMLMessage.getRefinedBy().size());
@@ -447,17 +447,17 @@ public class AddMessageTest extends AbstractUMLTest {
 
 		assertNotNull(addCoveredInMessage0Send0.getEquivalence());
 		assertEquals(2, addCoveredInMessage0Send0.getEquivalence().getDifferences().size());
-		assertTrue(addCoveredInMessage0Send0.getEquivalence().getDifferences().contains(
-				addCoveredInMessage0Send0));
-		assertTrue(addCoveredInMessage0Send0.getEquivalence().getDifferences().contains(
-				addCoveredByInLifeline0));
+		assertTrue(addCoveredInMessage0Send0.getEquivalence().getDifferences()
+				.contains(addCoveredInMessage0Send0));
+		assertTrue(addCoveredInMessage0Send0.getEquivalence().getDifferences()
+				.contains(addCoveredByInLifeline0));
 
 		assertNotNull(addCoveredInMessage0Recv0.getEquivalence());
 		assertEquals(2, addCoveredInMessage0Recv0.getEquivalence().getDifferences().size());
-		assertTrue(addCoveredInMessage0Recv0.getEquivalence().getDifferences().contains(
-				addCoveredInMessage0Recv0));
-		assertTrue(addCoveredInMessage0Recv0.getEquivalence().getDifferences().contains(
-				addCoveredByInLifeline1));
+		assertTrue(addCoveredInMessage0Recv0.getEquivalence().getDifferences()
+				.contains(addCoveredInMessage0Recv0));
+		assertTrue(addCoveredInMessage0Recv0.getEquivalence().getDifferences()
+				.contains(addCoveredByInLifeline1));
 
 		testIntersections(comparison);
 
@@ -504,8 +504,8 @@ public class AddMessageTest extends AbstractUMLTest {
 					"message", null, "model.interaction0.Message0");
 			addReceiveEventInMessageDescription = changedReference("model.interaction0.Message0",
 					"receiveEvent", null, "model.interaction0.Message0Recv0");
-			addCoveredByInLifeline0Description = addedToReference("model.interaction0.Lifeline0",
-					"coveredBy", "model.interaction0.Message0Recv0");
+			addCoveredByInLifeline0Description = addedToReference("model.interaction0.Lifeline0", "coveredBy",
+					"model.interaction0.Message0Recv0");
 		}
 
 		final Diff addMessage = Iterators.find(useFullDiffs.iterator(), addMessageDescription);
@@ -530,11 +530,11 @@ public class AddMessageTest extends AbstractUMLTest {
 		assertEquals(1, count(useFullDiffs, instanceOf(MessageChange.class)));
 		Diff addUMLMessage = null;
 		if (kind.equals(TestKind.ADD)) {
-			addUMLMessage = Iterators.find(useFullDiffs.iterator(), and(instanceOf(MessageChange.class),
-					ofKind(DifferenceKind.ADD)));
+			addUMLMessage = Iterators.find(useFullDiffs.iterator(),
+					and(instanceOf(MessageChange.class), ofKind(DifferenceKind.ADD)));
 		} else {
-			addUMLMessage = Iterators.find(useFullDiffs.iterator(), and(instanceOf(MessageChange.class),
-					ofKind(DifferenceKind.DELETE)));
+			addUMLMessage = Iterators.find(useFullDiffs.iterator(),
+					and(instanceOf(MessageChange.class), ofKind(DifferenceKind.DELETE)));
 		}
 		assertNotNull(addUMLMessage);
 		assertEquals(6, addUMLMessage.getRefinedBy().size());
@@ -591,13 +591,13 @@ public class AddMessageTest extends AbstractUMLTest {
 
 		assertNotNull(addCoveredInMessage0Recv0.getEquivalence());
 		assertEquals(2, addCoveredInMessage0Recv0.getEquivalence().getDifferences().size());
-		assertTrue(addCoveredInMessage0Recv0.getEquivalence().getDifferences().contains(
-				addCoveredInMessage0Recv0));
-		assertTrue(addCoveredInMessage0Recv0.getEquivalence().getDifferences().contains(
-				addCoveredByInLifeline0));
+		assertTrue(addCoveredInMessage0Recv0.getEquivalence().getDifferences()
+				.contains(addCoveredInMessage0Recv0));
+		assertTrue(addCoveredInMessage0Recv0.getEquivalence().getDifferences()
+				.contains(addCoveredByInLifeline0));
 
-		assertFalse("No move expected", Iterators.filter(differences.iterator(), ofKind(DifferenceKind.MOVE))
-				.hasNext());
+		assertFalse("No move expected",
+				Iterators.filter(differences.iterator(), ofKind(DifferenceKind.MOVE)).hasNext());
 
 		testIntersections(comparison);
 	}
@@ -630,8 +630,8 @@ public class AddMessageTest extends AbstractUMLTest {
 					"covered", "model.interaction0.Lifeline1");
 			addMessageInMessage0Recv0Description = changedReference("model.interaction0.Message0Send0",
 					"message", "model.interaction0.Message0", null);
-			addReceiveEventInMessageDescription = changedReference("model.interaction0.Message0",
-					"sendEvent", "model.interaction0.Message0Send0", null);
+			addReceiveEventInMessageDescription = changedReference("model.interaction0.Message0", "sendEvent",
+					"model.interaction0.Message0Send0", null);
 			addCoveredByInLifeline0Description = removedFromReference("model.interaction0.Lifeline1",
 					"coveredBy", "model.interaction0.Message0Send0");
 		} else {
@@ -641,10 +641,10 @@ public class AddMessageTest extends AbstractUMLTest {
 					"covered", "model.interaction0.Lifeline1");
 			addMessageInMessage0Recv0Description = changedReference("model.interaction0.Message0Send0",
 					"message", null, "model.interaction0.Message0");
-			addReceiveEventInMessageDescription = changedReference("model.interaction0.Message0",
-					"sendEvent", null, "model.interaction0.Message0Send0");
-			addCoveredByInLifeline0Description = addedToReference("model.interaction0.Lifeline1",
-					"coveredBy", "model.interaction0.Message0Send0");
+			addReceiveEventInMessageDescription = changedReference("model.interaction0.Message0", "sendEvent",
+					null, "model.interaction0.Message0Send0");
+			addCoveredByInLifeline0Description = addedToReference("model.interaction0.Lifeline1", "coveredBy",
+					"model.interaction0.Message0Send0");
 		}
 
 		final Diff addMessage = Iterators.find(useFullDiffs.iterator(), addMessageDescription);
@@ -669,11 +669,11 @@ public class AddMessageTest extends AbstractUMLTest {
 		assertEquals(1, count(useFullDiffs, instanceOf(MessageChange.class)));
 		Diff addUMLMessage = null;
 		if (kind.equals(TestKind.ADD)) {
-			addUMLMessage = Iterators.find(useFullDiffs.iterator(), and(instanceOf(MessageChange.class),
-					ofKind(DifferenceKind.ADD)));
+			addUMLMessage = Iterators.find(useFullDiffs.iterator(),
+					and(instanceOf(MessageChange.class), ofKind(DifferenceKind.ADD)));
 		} else {
-			addUMLMessage = Iterators.find(useFullDiffs.iterator(), and(instanceOf(MessageChange.class),
-					ofKind(DifferenceKind.DELETE)));
+			addUMLMessage = Iterators.find(useFullDiffs.iterator(),
+					and(instanceOf(MessageChange.class), ofKind(DifferenceKind.DELETE)));
 		}
 		assertNotNull(addUMLMessage);
 		assertEquals(6, addUMLMessage.getRefinedBy().size());
@@ -730,13 +730,13 @@ public class AddMessageTest extends AbstractUMLTest {
 
 		assertNotNull(addCoveredInMessage0Recv0.getEquivalence());
 		assertEquals(2, addCoveredInMessage0Recv0.getEquivalence().getDifferences().size());
-		assertTrue(addCoveredInMessage0Recv0.getEquivalence().getDifferences().contains(
-				addCoveredInMessage0Recv0));
-		assertTrue(addCoveredInMessage0Recv0.getEquivalence().getDifferences().contains(
-				addCoveredByInLifeline0));
+		assertTrue(addCoveredInMessage0Recv0.getEquivalence().getDifferences()
+				.contains(addCoveredInMessage0Recv0));
+		assertTrue(addCoveredInMessage0Recv0.getEquivalence().getDifferences()
+				.contains(addCoveredByInLifeline0));
 
-		assertFalse("No move expected", Iterators.filter(differences.iterator(), ofKind(DifferenceKind.MOVE))
-				.hasNext());
+		assertFalse("No move expected",
+				Iterators.filter(differences.iterator(), ofKind(DifferenceKind.MOVE)).hasNext());
 
 		testIntersections(comparison);
 	}
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/multiplicitychanges/MultiplicityElementChangesTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/multiplicitychanges/MultiplicityElementChangesTest.java
index fd13628fd..ebc18cdba 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/multiplicitychanges/MultiplicityElementChangesTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/multiplicitychanges/MultiplicityElementChangesTest.java
@@ -153,10 +153,10 @@ public class MultiplicityElementChangesTest {
 	@Compare(left = "a2/left.uml", right = "a2/right.uml", ancestor = "a2/origin.uml")
 	public void testAdditionsWithPseudoconflict(Comparison comparison) throws IOException {
 		EList<Diff> diffs = comparison.getDifferences();
-		ArrayList<Diff> leftChanges = Lists.newArrayList(filter(diffs, and(IS_MULTIPLICITY_CHANGE,
-				fromSide(LEFT))));
-		ArrayList<Diff> rightChanges = Lists.newArrayList(filter(diffs, and(IS_MULTIPLICITY_CHANGE,
-				fromSide(RIGHT))));
+		ArrayList<Diff> leftChanges = Lists
+				.newArrayList(filter(diffs, and(IS_MULTIPLICITY_CHANGE, fromSide(LEFT))));
+		ArrayList<Diff> rightChanges = Lists
+				.newArrayList(filter(diffs, and(IS_MULTIPLICITY_CHANGE, fromSide(RIGHT))));
 
 		assertEquals(1, size(leftChanges));
 		assertEquals(2, size(rightChanges));
@@ -198,10 +198,10 @@ public class MultiplicityElementChangesTest {
 	@Compare(left = "a3/left.uml", right = "a3/right.uml", ancestor = "a3/origin.uml")
 	public void testAdditionsWithConflict(Comparison comparison) throws IOException {
 		EList<Diff> diffs = comparison.getDifferences();
-		ArrayList<Diff> leftChanges = Lists.newArrayList(filter(diffs, and(IS_MULTIPLICITY_CHANGE,
-				fromSide(LEFT))));
-		ArrayList<Diff> rightChanges = Lists.newArrayList(filter(diffs, and(IS_MULTIPLICITY_CHANGE,
-				fromSide(RIGHT))));
+		ArrayList<Diff> leftChanges = Lists
+				.newArrayList(filter(diffs, and(IS_MULTIPLICITY_CHANGE, fromSide(LEFT))));
+		ArrayList<Diff> rightChanges = Lists
+				.newArrayList(filter(diffs, and(IS_MULTIPLICITY_CHANGE, fromSide(RIGHT))));
 
 		assertEquals(1, size(leftChanges));
 		assertEquals(2, size(rightChanges));
@@ -302,10 +302,10 @@ public class MultiplicityElementChangesTest {
 	@Compare(left = "a6/left.uml", right = "a6/right.uml", ancestor = "a6/origin.uml")
 	public void testRemoveConflict(Comparison comparison) throws IOException {
 		EList<Diff> diffs = comparison.getDifferences();
-		ArrayList<Diff> leftChanges = Lists.newArrayList(filter(diffs, and(IS_MULTIPLICITY_CHANGE,
-				fromSide(LEFT))));
-		ArrayList<Diff> rightChanges = Lists.newArrayList(filter(diffs, and(IS_MULTIPLICITY_CHANGE,
-				fromSide(RIGHT))));
+		ArrayList<Diff> leftChanges = Lists
+				.newArrayList(filter(diffs, and(IS_MULTIPLICITY_CHANGE, fromSide(LEFT))));
+		ArrayList<Diff> rightChanges = Lists
+				.newArrayList(filter(diffs, and(IS_MULTIPLICITY_CHANGE, fromSide(RIGHT))));
 
 		assertEquals(1, size(leftChanges));
 		MultiplicityElementChange leftChange = (MultiplicityElementChange)leftChanges.iterator().next();
@@ -432,10 +432,10 @@ public class MultiplicityElementChangesTest {
 	@Compare(left = "a10/left.uml", right = "a10/right.uml", ancestor = "a10/origin.uml")
 	public void testRealAndPseudoConflict(Comparison comparison) throws IOException {
 		EList<Diff> diffs = comparison.getDifferences();
-		ArrayList<Diff> leftChanges = Lists.newArrayList(filter(diffs, and(IS_MULTIPLICITY_CHANGE,
-				fromSide(LEFT))));
-		ArrayList<Diff> rightChanges = Lists.newArrayList(filter(diffs, and(IS_MULTIPLICITY_CHANGE,
-				fromSide(RIGHT))));
+		ArrayList<Diff> leftChanges = Lists
+				.newArrayList(filter(diffs, and(IS_MULTIPLICITY_CHANGE, fromSide(LEFT))));
+		ArrayList<Diff> rightChanges = Lists
+				.newArrayList(filter(diffs, and(IS_MULTIPLICITY_CHANGE, fromSide(RIGHT))));
 
 		assertEquals(2, size(leftChanges));
 		assertEquals(2, size(rightChanges));
@@ -526,10 +526,10 @@ public class MultiplicityElementChangesTest {
 	@Compare(left = "a11/left.uml", right = "a11/right.uml", ancestor = "a11/origin.uml")
 	public void testRealAndPseudoConflictWithChangeAndDelete(Comparison comparison) throws IOException {
 		EList<Diff> diffs = comparison.getDifferences();
-		ArrayList<Diff> leftChanges = Lists.newArrayList(filter(diffs, and(IS_MULTIPLICITY_CHANGE,
-				fromSide(LEFT))));
-		ArrayList<Diff> rightChanges = Lists.newArrayList(filter(diffs, and(IS_MULTIPLICITY_CHANGE,
-				fromSide(RIGHT))));
+		ArrayList<Diff> leftChanges = Lists
+				.newArrayList(filter(diffs, and(IS_MULTIPLICITY_CHANGE, fromSide(LEFT))));
+		ArrayList<Diff> rightChanges = Lists
+				.newArrayList(filter(diffs, and(IS_MULTIPLICITY_CHANGE, fromSide(RIGHT))));
 
 		assertEquals(2, size(leftChanges));
 		assertEquals(2, size(rightChanges));
@@ -594,7 +594,7 @@ public class MultiplicityElementChangesTest {
 	// super.registerPostProcessors(postProcessorRegistry);
 	// postProcessorRegistry.put(MultiplicityElementChangePostProcessor.class.getName(),
 	// new TestPostProcessor.TestPostProcessorDescriptor(Pattern
-	//						.compile("http://www.eclipse.org/uml2/\\d\\.0\\.0/UML"), null, //$NON-NLS-1$
+	// .compile("http://www.eclipse.org/uml2/\\d\\.0\\.0/UML"), null, //$NON-NLS-1$
 	// new MultiplicityElementChangePostProcessor(), 25));
 	// }
 }
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/opaque/OpaqueElementBodyChangeMergeTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/opaque/OpaqueElementBodyChangeMergeTest.java
index b705e5ccb..2a94bc23a 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/opaque/OpaqueElementBodyChangeMergeTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/opaque/OpaqueElementBodyChangeMergeTest.java
@@ -668,8 +668,8 @@ public class OpaqueElementBodyChangeMergeTest extends AbstractUMLTest {
 
 	private void applyRightOpaqueElementBodyChangesToLeft(Comparison comparison) {
 		final EList<Diff> allDifferences = comparison.getDifferences();
-		final Iterable<Diff> rightOpaqueElementBodyChanges = filter(allDifferences, and(
-				IS_OPAQUE_ELEMENT_CHANGE, fromSide(RIGHT)));
+		final Iterable<Diff> rightOpaqueElementBodyChanges = filter(allDifferences,
+				and(IS_OPAQUE_ELEMENT_CHANGE, fromSide(RIGHT)));
 		for (Diff diff : rightOpaqueElementBodyChanges) {
 			IMerger merger = getMergerRegistry().getHighestRankingMerger(diff);
 			merger.copyRightToLeft(diff, new BasicMonitor());
@@ -678,8 +678,8 @@ public class OpaqueElementBodyChangeMergeTest extends AbstractUMLTest {
 
 	private void revertLeftOpaqueElementBodyChanges(Comparison comparison) {
 		final EList<Diff> allDifferences = comparison.getDifferences();
-		final Iterable<Diff> leftOpaqueElementBodyChanges = filter(allDifferences, and(
-				IS_OPAQUE_ELEMENT_CHANGE, fromSide(LEFT)));
+		final Iterable<Diff> leftOpaqueElementBodyChanges = filter(allDifferences,
+				and(IS_OPAQUE_ELEMENT_CHANGE, fromSide(LEFT)));
 		for (Diff diff : leftOpaqueElementBodyChanges) {
 			IMerger merger = getMergerRegistry().getHighestRankingMerger(diff);
 			merger.copyRightToLeft(diff, new BasicMonitor());
@@ -688,8 +688,8 @@ public class OpaqueElementBodyChangeMergeTest extends AbstractUMLTest {
 
 	private void revertRightOpaqueElementBodyChanges(Comparison comparison) {
 		final EList<Diff> allDifferences = comparison.getDifferences();
-		final Iterable<Diff> rightOpaqueElementBodyChanges = filter(allDifferences, and(
-				IS_OPAQUE_ELEMENT_CHANGE, fromSide(RIGHT)));
+		final Iterable<Diff> rightOpaqueElementBodyChanges = filter(allDifferences,
+				and(IS_OPAQUE_ELEMENT_CHANGE, fromSide(RIGHT)));
 		for (Diff diff : rightOpaqueElementBodyChanges) {
 			IMerger merger = getMergerRegistry().getHighestRankingMerger(diff);
 			merger.copyLeftToRight(diff, new BasicMonitor());
@@ -698,8 +698,8 @@ public class OpaqueElementBodyChangeMergeTest extends AbstractUMLTest {
 
 	private void applyLeftOpaqueElementBodyChangesToRight(Comparison comparison) {
 		final EList<Diff> allDifferences = comparison.getDifferences();
-		final Iterable<Diff> leftOpaqueElementBodyChanges = filter(allDifferences, and(
-				IS_OPAQUE_ELEMENT_CHANGE, fromSide(LEFT)));
+		final Iterable<Diff> leftOpaqueElementBodyChanges = filter(allDifferences,
+				and(IS_OPAQUE_ELEMENT_CHANGE, fromSide(LEFT)));
 		for (Diff diff : leftOpaqueElementBodyChanges) {
 			IMerger merger = getMergerRegistry().getHighestRankingMerger(diff);
 			merger.copyLeftToRight(diff, new BasicMonitor());
@@ -713,8 +713,8 @@ public class OpaqueElementBodyChangeMergeTest extends AbstractUMLTest {
 
 	private void assertOneRealConflictOnOpaqueElementBodyChange(Comparison comparison) {
 		assertEquals(1, size(filter(comparison.getConflicts(), IS_REAL_CONFLICT)));
-		assertEquals(1, size(filter(comparison.getConflicts(), and(IS_REAL_CONFLICT,
-				CONCERNS_OPAQUE_ELEMENT_BODY_CHANGE))));
+		assertEquals(1, size(filter(comparison.getConflicts(),
+				and(IS_REAL_CONFLICT, CONCERNS_OPAQUE_ELEMENT_BODY_CHANGE))));
 	}
 
 	@Override
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/DynamicProfileTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/DynamicProfileTest.java
index db7e86066..2aa78c697 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/DynamicProfileTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/DynamicProfileTest.java
@@ -228,11 +228,11 @@ public class DynamicProfileTest extends AbstractDynamicProfileTest {
 		assertEquals(1, count(differences, instanceOf(ProfileApplicationChange.class)));
 		Diff addUMLProfileApplication = null;
 		if (kind.equals(TestKind.ADD)) {
-			addUMLProfileApplication = Iterators.find(differences.iterator(), and(
-					instanceOf(ProfileApplicationChange.class), ofKind(DifferenceKind.ADD)));
+			addUMLProfileApplication = Iterators.find(differences.iterator(),
+					and(instanceOf(ProfileApplicationChange.class), ofKind(DifferenceKind.ADD)));
 		} else {
-			addUMLProfileApplication = Iterators.find(differences.iterator(), and(
-					instanceOf(ProfileApplicationChange.class), ofKind(DifferenceKind.DELETE)));
+			addUMLProfileApplication = Iterators.find(differences.iterator(),
+					and(instanceOf(ProfileApplicationChange.class), ofKind(DifferenceKind.DELETE)));
 		}
 		assertNotNull(addUMLProfileApplication);
 		assertEquals(4, addUMLProfileApplication.getRefinedBy().size());
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/StaticProfileTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/StaticProfileTest.java
index a6ab510dd..7f2ea7f67 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/StaticProfileTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/profiles/StaticProfileTest.java
@@ -218,11 +218,11 @@ public class StaticProfileTest extends AbstractStaticProfileTest {
 		assertEquals(1, count(differences, instanceOf(ProfileApplicationChange.class)));
 		Diff addUMLProfileApplication = null;
 		if (kind.equals(TestKind.ADD)) {
-			addUMLProfileApplication = Iterators.find(differences.iterator(), and(
-					instanceOf(ProfileApplicationChange.class), ofKind(DifferenceKind.ADD)));
+			addUMLProfileApplication = Iterators.find(differences.iterator(),
+					and(instanceOf(ProfileApplicationChange.class), ofKind(DifferenceKind.ADD)));
 		} else {
-			addUMLProfileApplication = Iterators.find(differences.iterator(), and(
-					instanceOf(ProfileApplicationChange.class), ofKind(DifferenceKind.DELETE)));
+			addUMLProfileApplication = Iterators.find(differences.iterator(),
+					and(instanceOf(ProfileApplicationChange.class), ofKind(DifferenceKind.DELETE)));
 		}
 		assertNotNull(addUMLProfileApplication);
 		assertEquals(4, addUMLProfileApplication.getRefinedBy().size());
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/AbstractStereotypedElementChangeTests.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/AbstractStereotypedElementChangeTests.java
index 149fe88d5..a952dbd0e 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/AbstractStereotypedElementChangeTests.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/AbstractStereotypedElementChangeTests.java
@@ -78,8 +78,8 @@ public abstract class AbstractStereotypedElementChangeTests extends AbstractUMLP
 			org.eclipse.emf.compare.postprocessor.IPostProcessor.Descriptor.Registry<String> postProcessorRegistry) {
 		super.registerPostProcessors(postProcessorRegistry);
 		postProcessorRegistry.put(StereotypedElementChangePostProcessor.class.getName(),
-				new TestPostProcessor.TestPostProcessorDescriptor(Pattern
-						.compile("http://www.eclipse.org/uml2/\\d\\.0\\.0/UML"), null, //$NON-NLS-1$
+				new TestPostProcessor.TestPostProcessorDescriptor(
+						Pattern.compile("http://www.eclipse.org/uml2/\\d\\.0\\.0/UML"), null, //$NON-NLS-1$
 						new StereotypedElementChangePostProcessor(), 25));
 	}
 
@@ -189,7 +189,6 @@ public abstract class AbstractStereotypedElementChangeTests extends AbstractUMLP
 	 * 		`-- UML
 	 * ACliche [base &lt;&lt;ACliche&gt;&gt; &lt;Class&gt; Class0]
 	 * </pre>
-	 * 
 	 * </p>
 	 * 
 	 * @throws IOException
@@ -254,7 +253,6 @@ public abstract class AbstractStereotypedElementChangeTests extends AbstractUMLP
 	 * 	`-- &lt;Profile Application&gt; UML2CompareTestProfile
 	 * 		`-- UML
 	 * </pre>
-	 * 
 	 * </p>
 	 * 
 	 * @throws IOException
@@ -318,7 +316,6 @@ public abstract class AbstractStereotypedElementChangeTests extends AbstractUMLP
 	 * 	`-- &lt;Profile Application&gt; UML2CompareTestProfile
 	 * 		`-- UML
 	 * </pre>
-	 * 
 	 * </p>
 	 * 
 	 * @throws IOException
@@ -383,7 +380,6 @@ public abstract class AbstractStereotypedElementChangeTests extends AbstractUMLP
 	 * 		`-- UML
 	 * ACliche [base &lt;&lt;ACliche&gt;&gt; &lt;Class&gt; Class0]
 	 * </pre>
-	 * 
 	 * </p>
 	 * 
 	 * @throws IOException
@@ -448,7 +444,6 @@ public abstract class AbstractStereotypedElementChangeTests extends AbstractUMLP
 	 * 			`-- UML
 	 * ACliche [base &lt;&lt;ACliche&gt;&gt; &lt;Class&gt; Class1]
 	 * </pre>
-	 * 
 	 * </p>
 	 * 
 	 * @throws IOException
@@ -514,7 +509,6 @@ public abstract class AbstractStereotypedElementChangeTests extends AbstractUMLP
 	 * 		`-- &lt;Profile Application&gt; UML2CompareTestProfile
 	 * 			`-- UML
 	 * </pre>
-	 * 
 	 * </p>
 	 * 
 	 * @throws IOException
@@ -549,11 +543,11 @@ public abstract class AbstractStereotypedElementChangeTests extends AbstractUMLP
 		// @formatter:off
 		EList<EObject> contents = right.getContents();
 		assertEquals(1, contents.size());
-			Model model = (Model)contents.get(0);
-				assertEquals(1, model.getPackagedElements().size());
-				Model subModel = (Model)model.getPackagedElements().get(0);
-					assertEquals(0, subModel.getPackagedElements().size());
-					assertEquals(1,subModel.getAppliedProfiles().size());
+		Model model = (Model)contents.get(0);
+		assertEquals(1, model.getPackagedElements().size());
+		Model subModel = (Model)model.getPackagedElements().get(0);
+		assertEquals(0, subModel.getPackagedElements().size());
+		assertEquals(1, subModel.getAppliedProfiles().size());
 		// @formatter:on
 
 		// Checks the content of the left model after merging
@@ -595,7 +589,6 @@ public abstract class AbstractStereotypedElementChangeTests extends AbstractUMLP
 	 * 		`-- &lt;Profile Application&gt; UML2CompareTestProfile
 	 * 			`-- UML
 	 * </pre>
-	 * 
 	 * </p>
 	 * 
 	 * @throws IOException
@@ -630,11 +623,11 @@ public abstract class AbstractStereotypedElementChangeTests extends AbstractUMLP
 		// @formatter:off
 		EList<EObject> contents = left.getContents();
 		assertEquals(1, contents.size());
-			Model model = (Model)contents.get(0);
-				assertEquals(1, model.getPackagedElements().size());
-				Model subModel = (Model)model.getPackagedElements().get(0);
-					assertEquals(0, subModel.getPackagedElements().size());
-					assertEquals(1,subModel.getAppliedProfiles().size());
+		Model model = (Model)contents.get(0);
+		assertEquals(1, model.getPackagedElements().size());
+		Model subModel = (Model)model.getPackagedElements().get(0);
+		assertEquals(0, subModel.getPackagedElements().size());
+		assertEquals(1, subModel.getAppliedProfiles().size());
 		// @formatter:on
 
 		// Checks right model content after merging
@@ -644,7 +637,8 @@ public abstract class AbstractStereotypedElementChangeTests extends AbstractUMLP
 	/**
 	 * Tests advanced use case:
 	 * <ol>
-	 * <li>Creates a {@link StereotypedElementChange} of kind {@link DifferenceKind#DELL} with dependencies</li>
+	 * <li>Creates a {@link StereotypedElementChange} of kind {@link DifferenceKind#DELL} with dependencies
+	 * </li>
 	 * <li>Merges it from right to left</li>
 	 * </ol>
 	 * <p>
@@ -676,7 +670,6 @@ public abstract class AbstractStereotypedElementChangeTests extends AbstractUMLP
 	 * 			`-- UML
 	 * ACliche [base &lt;&lt;ACliche&gt;&gt; &lt;Class&gt; Class1]
 	 * </pre>
-	 * 
 	 * </p>
 	 * 
 	 * @throws IOException
@@ -742,7 +735,6 @@ public abstract class AbstractStereotypedElementChangeTests extends AbstractUMLP
 	 * ACliche [base &lt;&lt;ACliche, ACliche3&gt;&gt; &lt;Class&gt; Class0]
 	 * ACliche3 [base &lt;&lt;ACliche, ACliche3&gt;&gt; &lt;Class&gt; Class0]
 	 * </pre>
-	 * 
 	 * </p>
 	 * 
 	 * @param left
@@ -877,7 +869,6 @@ public abstract class AbstractStereotypedElementChangeTests extends AbstractUMLP
 	 * 	`-- &lt;Profile Application&gt; UML2CompareTestProfile
 	 * 		`-- UML
 	 * </pre>
-	 * 
 	 * </p>
 	 * 
 	 * @param left
@@ -892,8 +883,8 @@ public abstract class AbstractStereotypedElementChangeTests extends AbstractUMLP
 		final StereotypedElementChange stereotypedElementChange = getStereotypedElementChange(differences,
 				DifferenceKind.DELETE, 3);
 
-		final ReferenceChange baseDiff = assertDeletedBaseElementDiff(differences,
-				"model.Class0", stereotypedElementChange); //$NON-NLS-1$
+		final ReferenceChange baseDiff = assertDeletedBaseElementDiff(differences, "model.Class0", //$NON-NLS-1$
+				stereotypedElementChange);
 
 		final Conflict conflict = stereotypedElementChange.getConflict();
 		assertNotNull(conflict);
@@ -966,7 +957,6 @@ public abstract class AbstractStereotypedElementChangeTests extends AbstractUMLP
 	 * ACliche [base &lt;&lt;ACliche, ACliche3&gt;&gt; &lt;Class&gt; Class0_newName]
 	 * ACliche3 [base &lt;&lt;ACliche, ACliche3&gt;&gt; &lt;Class&gt; Class0_newName]
 	 * </pre>
-	 * 
 	 * </p>
 	 * 
 	 * @param left
@@ -981,8 +971,8 @@ public abstract class AbstractStereotypedElementChangeTests extends AbstractUMLP
 		final StereotypedElementChange stereotypedElementChange = getStereotypedElementChange(differences,
 				DifferenceKind.DELETE, 3);
 
-		final ReferenceChange baseDiff = assertDeletedBaseElementDiff(differences,
-				"model.Class0", stereotypedElementChange); //$NON-NLS-1$
+		final ReferenceChange baseDiff = assertDeletedBaseElementDiff(differences, "model.Class0", //$NON-NLS-1$
+				stereotypedElementChange);
 
 		final Conflict conflict = stereotypedElementChange.getConflict();
 		assertNotNull(conflict);
@@ -1027,7 +1017,6 @@ public abstract class AbstractStereotypedElementChangeTests extends AbstractUMLP
 	 * 		`-- UML
 	 * ACliche [base &lt;&lt;ACliche&gt;&gt; &lt;Class&gt; Class0]
 	 * </pre>
-	 * 
 	 * </p>
 	 * 
 	 * @param input
@@ -1037,10 +1026,10 @@ public abstract class AbstractStereotypedElementChangeTests extends AbstractUMLP
 		EList<EObject> contents = input.getContents();
 		assertEquals(2, contents.size());
 		Model model = (Model)contents.get(0);
-			assertEquals(1, model.getPackagedElements().size());
-			Class clazz = (Class)model.getPackagedElements().get(0);
-			assertEquals(1, clazz.getAppliedStereotypes().size());
-			assertEquals(1,model.getAppliedProfiles().size());
+		assertEquals(1, model.getPackagedElements().size());
+		Class clazz = (Class)model.getPackagedElements().get(0);
+		assertEquals(1, clazz.getAppliedStereotypes().size());
+		assertEquals(1, model.getAppliedProfiles().size());
 		EObject stereotypeApplication = contents.get(1);
 		assertSame(clazz, UMLUtil.getBaseElement(stereotypeApplication));
 		// @formatter:on
@@ -1056,7 +1045,6 @@ public abstract class AbstractStereotypedElementChangeTests extends AbstractUMLP
 	 * 	`-- &lt;Profile Application&gt; UML2CompareTestProfile
 	 * 		`-- UML
 	 * </pre>
-	 * 
 	 * </p>
 	 * 
 	 * @param input
@@ -1066,8 +1054,8 @@ public abstract class AbstractStereotypedElementChangeTests extends AbstractUMLP
 		EList<EObject> contents = input.getContents();
 		assertEquals(1, contents.size());
 		Model model = (Model)contents.get(0);
-			assertEquals(0, model.getPackagedElements().size());
-			assertEquals(1,model.getAppliedProfiles().size());
+		assertEquals(0, model.getPackagedElements().size());
+		assertEquals(1, model.getAppliedProfiles().size());
 		// @formatter:on
 	}
 
@@ -1084,7 +1072,6 @@ public abstract class AbstractStereotypedElementChangeTests extends AbstractUMLP
 	 * 			`-- UML
 	 * ACliche [base &lt;&lt;ACliche&gt;&gt; &lt;Class&gt; Class1]
 	 * </pre>
-	 * 
 	 * </p>
 	 * 
 	 * @param input
@@ -1093,15 +1080,15 @@ public abstract class AbstractStereotypedElementChangeTests extends AbstractUMLP
 		// @formatter:off
 		EList<EObject> contents = input.getContents();
 		assertEquals(2, contents.size());
-			Model model = (Model)contents.get(0);
-				assertEquals(1, model.getPackagedElements().size());
-				Model subModel = (Model)model.getPackagedElements().get(0);
-					assertEquals(1, subModel.getPackagedElements().size());
-					Class clazz = (Class)subModel.getPackagedElements().get(0);
-					assertEquals(1, clazz.getAppliedStereotypes().size());
-					assertEquals(1,subModel.getAppliedProfiles().size());
+		Model model = (Model)contents.get(0);
+		assertEquals(1, model.getPackagedElements().size());
+		Model subModel = (Model)model.getPackagedElements().get(0);
+		assertEquals(1, subModel.getPackagedElements().size());
+		Class clazz = (Class)subModel.getPackagedElements().get(0);
+		assertEquals(1, clazz.getAppliedStereotypes().size());
+		assertEquals(1, subModel.getAppliedProfiles().size());
 		EObject stereotypeApplication = contents.get(1);
-		assertSame(clazz, UMLUtil.getBaseElement(stereotypeApplication)); 
+		assertSame(clazz, UMLUtil.getBaseElement(stereotypeApplication));
 		// @formatter:on
 	}
 
@@ -1118,26 +1105,25 @@ public abstract class AbstractStereotypedElementChangeTests extends AbstractUMLP
 	 * ACliche [base &lt;&lt;ACliche, ACliche3&gt;&gt; &lt;Class&gt; Class0_newName]
 	 * ACliche3 [base &lt;&lt;ACliche, ACliche3&gt;&gt; &lt;Class&gt; Class0_newName]
 	 * </pre>
-	 * 
 	 * </p>
 	 * 
 	 * @param input
 	 */
 	private void assertEqualsM4(Resource right) {
-		//@formatter:off
+		// @formatter:off
 		EList<EObject> contents = right.getContents();
 		assertEquals(3, contents.size());
-			Model model = (Model)contents.get(0);
-				assertEquals(1, model.getPackagedElements().size());
-				Class clazz = (Class)model.getPackagedElements().get(0);
-				assertEquals(2, clazz.getAppliedStereotypes().size());
-				assertEquals("Class0", clazz.getName()); //$NON-NLS-1$
-				assertEquals(1,model.getAppliedProfiles().size());
+		Model model = (Model)contents.get(0);
+		assertEquals(1, model.getPackagedElements().size());
+		Class clazz = (Class)model.getPackagedElements().get(0);
+		assertEquals(2, clazz.getAppliedStereotypes().size());
+		assertEquals("Class0", clazz.getName()); //$NON-NLS-1$
+		assertEquals(1, model.getAppliedProfiles().size());
 		EObject stereotypeApplication = contents.get(1);
-		assertSame(clazz, UMLUtil.getBaseElement(stereotypeApplication)); 
+		assertSame(clazz, UMLUtil.getBaseElement(stereotypeApplication));
 		EObject stereotypeApplication2 = contents.get(2);
-		assertSame(clazz, UMLUtil.getBaseElement(stereotypeApplication2)); 
-		//@formatter:on
+		assertSame(clazz, UMLUtil.getBaseElement(stereotypeApplication2));
+		// @formatter:on
 	}
 
 	/**
@@ -1153,26 +1139,25 @@ public abstract class AbstractStereotypedElementChangeTests extends AbstractUMLP
 	 * ACliche [base &lt;&lt;ACliche, ACliche3&gt;&gt; &lt;Class&gt; Class0_newName]
 	 * ACliche3 [base &lt;&lt;ACliche, ACliche3&gt;&gt; &lt;Class&gt; Class0_newName]
 	 * </pre>
-	 * 
 	 * </p>
 	 * 
 	 * @param input
 	 */
 	private void assertEqualsM5(Resource right) {
-		//@formatter:off
+		// @formatter:off
 		EList<EObject> contents = right.getContents();
 		assertEquals(3, contents.size());
-			Model model = (Model)contents.get(0);
-				assertEquals(1, model.getPackagedElements().size());
-				Class clazz = (Class)model.getPackagedElements().get(0);
-				assertEquals(2, clazz.getAppliedStereotypes().size());
-				assertEquals("Class0_newName", clazz.getName()); //$NON-NLS-1$
-				assertEquals(1,model.getAppliedProfiles().size());
+		Model model = (Model)contents.get(0);
+		assertEquals(1, model.getPackagedElements().size());
+		Class clazz = (Class)model.getPackagedElements().get(0);
+		assertEquals(2, clazz.getAppliedStereotypes().size());
+		assertEquals("Class0_newName", clazz.getName()); //$NON-NLS-1$
+		assertEquals(1, model.getAppliedProfiles().size());
 		EObject stereotypeApplication = contents.get(1);
-		assertSame(clazz, UMLUtil.getBaseElement(stereotypeApplication)); 
+		assertSame(clazz, UMLUtil.getBaseElement(stereotypeApplication));
 		EObject stereotypeApplication2 = contents.get(2);
-		assertSame(clazz, UMLUtil.getBaseElement(stereotypeApplication2)); 
-		//@formatter:on
+		assertSame(clazz, UMLUtil.getBaseElement(stereotypeApplication2));
+		// @formatter:on
 	}
 
 	/**
@@ -1183,7 +1168,6 @@ public abstract class AbstractStereotypedElementChangeTests extends AbstractUMLP
 	 * <pre>
 	 * &lt;Model&gt; model
 	 * </pre>
-	 * 
 	 * </p>
 	 * 
 	 * @param input
@@ -1192,9 +1176,9 @@ public abstract class AbstractStereotypedElementChangeTests extends AbstractUMLP
 		// @formatter:off
 		EList<EObject> leftContent = input.getContents();
 		assertEquals(1, leftContent.size());
-			Model leftModel = (Model)leftContent.get(0);
-				assertEquals(0, leftModel.getPackagedElements().size());
-				assertEquals(0,leftModel.getAppliedProfiles().size());
+		Model leftModel = (Model)leftContent.get(0);
+		assertEquals(0, leftModel.getPackagedElements().size());
+		assertEquals(0, leftModel.getAppliedProfiles().size());
 		// @formatter:on
 	}
 
@@ -1211,7 +1195,6 @@ public abstract class AbstractStereotypedElementChangeTests extends AbstractUMLP
 	 * ACliche [base &lt;&lt;ACliche, ACliche3&gt;&gt; &lt;Class&gt; Class0]
 	 * ACliche3 [base &lt;&lt;ACliche, ACliche3&gt;&gt; &lt;Class&gt; Class0]
 	 * </pre>
-	 * 
 	 * </p>
 	 * 
 	 * @param input
@@ -1220,15 +1203,15 @@ public abstract class AbstractStereotypedElementChangeTests extends AbstractUMLP
 		// @formatter:off
 		EList<EObject> contents = inputs.getContents();
 		assertEquals(3, contents.size());
-			Model model = (Model)contents.get(0);
-				assertEquals(1, model.getPackagedElements().size());
-				Class clazz = (Class)model.getPackagedElements().get(0);
-				assertEquals(2, clazz.getAppliedStereotypes().size());
-				assertEquals(1,model.getAppliedProfiles().size());
+		Model model = (Model)contents.get(0);
+		assertEquals(1, model.getPackagedElements().size());
+		Class clazz = (Class)model.getPackagedElements().get(0);
+		assertEquals(2, clazz.getAppliedStereotypes().size());
+		assertEquals(1, model.getAppliedProfiles().size());
 		EObject stereotypeApplication = contents.get(1);
-		assertSame(clazz, UMLUtil.getBaseElement(stereotypeApplication)); 
+		assertSame(clazz, UMLUtil.getBaseElement(stereotypeApplication));
 		EObject stereotypeApplication2 = contents.get(2);
-		assertSame(clazz, UMLUtil.getBaseElement(stereotypeApplication2)); 
+		assertSame(clazz, UMLUtil.getBaseElement(stereotypeApplication2));
 		// @formatter:on
 	}
 
@@ -1288,8 +1271,8 @@ public abstract class AbstractStereotypedElementChangeTests extends AbstractUMLP
 
 	private ReferenceChange assertDeletedBaseElementDiff(Iterable<Diff> differences, String qualifiedName,
 			StereotypedElementChange stereotypedElementChange) {
-		ReferenceChange referenceChange = (ReferenceChange)Iterables
-				.find(differences, removed(qualifiedName));
+		ReferenceChange referenceChange = (ReferenceChange)Iterables.find(differences,
+				removed(qualifiedName));
 		assertTrue(stereotypedElementChange.getRefinedBy().contains(referenceChange));
 		assertSame(referenceChange.getValue(), stereotypedElementChange.getDiscriminant());
 		return referenceChange;
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/DanglingStereotypeApplicationTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/DanglingStereotypeApplicationTest.java
index ab56f98c8..252a73ef8 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/DanglingStereotypeApplicationTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/DanglingStereotypeApplicationTest.java
@@ -52,9 +52,8 @@ public class DanglingStereotypeApplicationTest extends AbstractUMLProfileTest {
 			// It is required to link the EPackage to the UML package of the UML Profile
 			Map<String, URI> ePackageNsURIToProfileLocationMap = UMLPlugin
 					.getEPackageNsURIToProfileLocationMap();
-			ePackageNsURIToProfileLocationMap
-					.put(UML2CompareTestProfilePackage.eNS_URI,
-							URI.createURI("pathmap://UML_COMPARE_TESTS_PROFILE/uml2.compare.testprofile.profile.uml#_hZFTgIwkEeC_FYHMbTTxXw")); //$NON-NLS-1$
+			ePackageNsURIToProfileLocationMap.put(UML2CompareTestProfilePackage.eNS_URI, URI.createURI(
+					"pathmap://UML_COMPARE_TESTS_PROFILE/uml2.compare.testprofile.profile.uml#_hZFTgIwkEeC_FYHMbTTxXw")); //$NON-NLS-1$
 		}
 	}
 
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/DynamicStereotypeTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/DynamicStereotypeTest.java
index ebc68504c..f171c12ef 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/DynamicStereotypeTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/DynamicStereotypeTest.java
@@ -634,15 +634,15 @@ public class DynamicStereotypeTest extends AbstractDynamicProfileTest {
 		Diff addUMLProfileApplication = null;
 		Diff addUMLStereotypeApplication = null;
 		if (kind.equals(TestKind.ADD)) {
-			addUMLProfileApplication = Iterators.find(differences.iterator(), and(
-					instanceOf(ProfileApplicationChange.class), ofKind(DifferenceKind.ADD)));
-			addUMLStereotypeApplication = Iterators.find(differences.iterator(), and(
-					instanceOf(StereotypeApplicationChange.class), ofKind(DifferenceKind.ADD)));
+			addUMLProfileApplication = Iterators.find(differences.iterator(),
+					and(instanceOf(ProfileApplicationChange.class), ofKind(DifferenceKind.ADD)));
+			addUMLStereotypeApplication = Iterators.find(differences.iterator(),
+					and(instanceOf(StereotypeApplicationChange.class), ofKind(DifferenceKind.ADD)));
 		} else {
-			addUMLProfileApplication = Iterators.find(differences.iterator(), and(
-					instanceOf(ProfileApplicationChange.class), ofKind(DifferenceKind.DELETE)));
-			addUMLStereotypeApplication = Iterators.find(differences.iterator(), and(
-					instanceOf(StereotypeApplicationChange.class), ofKind(DifferenceKind.DELETE)));
+			addUMLProfileApplication = Iterators.find(differences.iterator(),
+					and(instanceOf(ProfileApplicationChange.class), ofKind(DifferenceKind.DELETE)));
+			addUMLStereotypeApplication = Iterators.find(differences.iterator(),
+					and(instanceOf(StereotypeApplicationChange.class), ofKind(DifferenceKind.DELETE)));
 		}
 		assertNotNull(addUMLProfileApplication);
 		assertEquals(4, addUMLProfileApplication.getRefinedBy().size());
@@ -806,15 +806,15 @@ public class DynamicStereotypeTest extends AbstractDynamicProfileTest {
 		Diff addUMLProfileApplication = null;
 		Diff addUMLStereotypeApplication = null;
 		if (kind.equals(TestKind.ADD)) {
-			addUMLProfileApplication = Iterators.find(differences.iterator(), and(
-					instanceOf(ProfileApplicationChange.class), ofKind(DifferenceKind.ADD)));
-			addUMLStereotypeApplication = Iterators.find(differences.iterator(), and(
-					instanceOf(StereotypeApplicationChange.class), ofKind(DifferenceKind.ADD)));
+			addUMLProfileApplication = Iterators.find(differences.iterator(),
+					and(instanceOf(ProfileApplicationChange.class), ofKind(DifferenceKind.ADD)));
+			addUMLStereotypeApplication = Iterators.find(differences.iterator(),
+					and(instanceOf(StereotypeApplicationChange.class), ofKind(DifferenceKind.ADD)));
 		} else {
-			addUMLProfileApplication = Iterators.find(differences.iterator(), and(
-					instanceOf(ProfileApplicationChange.class), ofKind(DifferenceKind.DELETE)));
-			addUMLStereotypeApplication = Iterators.find(differences.iterator(), and(
-					instanceOf(StereotypeApplicationChange.class), ofKind(DifferenceKind.DELETE)));
+			addUMLProfileApplication = Iterators.find(differences.iterator(),
+					and(instanceOf(ProfileApplicationChange.class), ofKind(DifferenceKind.DELETE)));
+			addUMLStereotypeApplication = Iterators.find(differences.iterator(),
+					and(instanceOf(StereotypeApplicationChange.class), ofKind(DifferenceKind.DELETE)));
 		}
 		assertNotNull(addUMLProfileApplication);
 		assertEquals(4, addUMLProfileApplication.getRefinedBy().size());
@@ -880,12 +880,12 @@ public class DynamicStereotypeTest extends AbstractDynamicProfileTest {
 		Diff addUMLStereotypeApplication = null;
 		if (kind.equals(TestKind.DELETE)) {
 			addClassDescription = removed("model.Class0");
-			addUMLStereotypeApplication = Iterators.find(differences.iterator(), and(
-					instanceOf(StereotypeApplicationChange.class), ofKind(DifferenceKind.DELETE)));
+			addUMLStereotypeApplication = Iterators.find(differences.iterator(),
+					and(instanceOf(StereotypeApplicationChange.class), ofKind(DifferenceKind.DELETE)));
 		} else {
 			addClassDescription = added("model.Class0");
-			addUMLStereotypeApplication = Iterators.find(differences.iterator(), and(
-					instanceOf(StereotypeApplicationChange.class), ofKind(DifferenceKind.ADD)));
+			addUMLStereotypeApplication = Iterators.find(differences.iterator(),
+					and(instanceOf(StereotypeApplicationChange.class), ofKind(DifferenceKind.ADD)));
 		}
 		addStereotypeApplicationDescription = instanceOf(ResourceAttachmentChange.class);
 
@@ -915,8 +915,9 @@ public class DynamicStereotypeTest extends AbstractDynamicProfileTest {
 
 		final Diff changeAttribute1 = Iterators.find(differences.iterator(), changeAttributeDescription1);
 		final Diff changeAttribute2 = Iterators.find(differences.iterator(), changeAttributeDescription2);
-		final UnmodifiableIterator<Diff> changeUMLStereotypeProperties = Iterators.filter(differences
-				.iterator(), and(instanceOf(StereotypeAttributeChange.class), ofKind(DifferenceKind.CHANGE)));
+		final UnmodifiableIterator<Diff> changeUMLStereotypeProperties = Iterators.filter(
+				differences.iterator(),
+				and(instanceOf(StereotypeAttributeChange.class), ofKind(DifferenceKind.CHANGE)));
 
 		assertTrue(changeUMLStereotypeProperties.hasNext());
 		final Diff changeUMLStereotypeProperty1 = changeUMLStereotypeProperties.next();
@@ -1042,8 +1043,8 @@ public class DynamicStereotypeTest extends AbstractDynamicProfileTest {
 		Predicate<? super Diff> changeStereotypeRefDescription = null;
 		Predicate<? super Diff> changeUMLStereotypeDescription = null;
 
-		changeStereotypeRefDescription = and(instanceOf(ReferenceChange.class),
-				ofKind(DifferenceKind.CHANGE), onFeature("singleValuedReference"), valueNameMatches("class0"));
+		changeStereotypeRefDescription = and(instanceOf(ReferenceChange.class), ofKind(DifferenceKind.CHANGE),
+				onFeature("singleValuedReference"), valueNameMatches("class0"));
 
 		changeUMLStereotypeDescription = and(instanceOf(StereotypeReferenceChange.class),
 				ofKind(DifferenceKind.CHANGE));
@@ -1104,7 +1105,8 @@ public class DynamicStereotypeTest extends AbstractDynamicProfileTest {
 		Predicate<? super Diff> changeStereotypeRefDescription = null;
 		Predicate<? super Diff> changeUMLStereotypeDescription = null;
 
-		changeStereotypeRefDescription = and(instanceOf(AttributeChange.class), ofKind(DifferenceKind.CHANGE));
+		changeStereotypeRefDescription = and(instanceOf(AttributeChange.class),
+				ofKind(DifferenceKind.CHANGE));
 		changeUMLStereotypeDescription = and(instanceOf(StereotypeAttributeChange.class),
 				ofKind(DifferenceKind.CHANGE));
 
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/DynamicStereotypedElementChangeTests.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/DynamicStereotypedElementChangeTests.java
index 908521e84..2b8e6e9be 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/DynamicStereotypedElementChangeTests.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/DynamicStereotypedElementChangeTests.java
@@ -49,13 +49,13 @@ public class DynamicStereotypedElementChangeTests extends AbstractStereotypedEle
 		beforeClass();
 		if (!EMFPlugin.IS_ECLIPSE_RUNNING) {
 			// It is required to link the EPackage to the UML package of the UML Profile
-			UMLPlugin
-					.getEPackageNsURIToProfileLocationMap()
-					.put("http://www.eclipse.org/emf/compare/uml2/1.0.0/testprofile", //$NON-NLS-1$
-							URI.createURI("pathmap://UML_COMPARE_TESTS_PROFILE/uml2.compare.testprofile.profile.uml#_hZFTgIwkEeC_FYHMbTTxXw")); //$NON-NLS-1$
+			UMLPlugin.getEPackageNsURIToProfileLocationMap().put(
+					"http://www.eclipse.org/emf/compare/uml2/1.0.0/testprofile", //$NON-NLS-1$
+					URI.createURI(
+							"pathmap://UML_COMPARE_TESTS_PROFILE/uml2.compare.testprofile.profile.uml#_hZFTgIwkEeC_FYHMbTTxXw")); //$NON-NLS-1$
 		} else {
-			registeredURI = UMLPlugin.getEPackageNsURIToProfileLocationMap().remove(
-					UML2CompareTestProfilePackage.eNS_URI);
+			registeredURI = UMLPlugin.getEPackageNsURIToProfileLocationMap()
+					.remove(UML2CompareTestProfilePackage.eNS_URI);
 			registeredPackage = EPackage.Registry.INSTANCE.remove(UML2CompareTestProfilePackage.eNS_URI);
 		}
 	}
@@ -63,8 +63,8 @@ public class DynamicStereotypedElementChangeTests extends AbstractStereotypedEle
 	@AfterClass
 	public static void resetEPackageNsURIToProfileLocationMap() {
 		if (!EMFPlugin.IS_ECLIPSE_RUNNING) {
-			UMLPlugin.getEPackageNsURIToProfileLocationMap().remove(
-					"http://www.eclipse.org/emf/compare/uml2/1.0.0/testprofile"); //$NON-NLS-1$
+			UMLPlugin.getEPackageNsURIToProfileLocationMap()
+					.remove("http://www.eclipse.org/emf/compare/uml2/1.0.0/testprofile"); //$NON-NLS-1$
 		} else {
 			UMLPlugin.getEPackageNsURIToProfileLocationMap().put(UML2CompareTestProfilePackage.eNS_URI,
 					registeredURI);
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/StaticStereotypeTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/StaticStereotypeTest.java
index 8855923e5..fd0c84c9a 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/StaticStereotypeTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/StaticStereotypeTest.java
@@ -777,15 +777,15 @@ public class StaticStereotypeTest extends AbstractStaticProfileTest {
 		Diff addUMLProfileApplication = null;
 		Diff addUMLStereotypeApplication = null;
 		if (kind.equals(TestKind.ADD)) {
-			addUMLProfileApplication = Iterators.find(differences.iterator(), and(
-					instanceOf(ProfileApplicationChange.class), ofKind(DifferenceKind.ADD)));
-			addUMLStereotypeApplication = Iterators.find(differences.iterator(), and(
-					instanceOf(StereotypeApplicationChange.class), ofKind(DifferenceKind.ADD)));
+			addUMLProfileApplication = Iterators.find(differences.iterator(),
+					and(instanceOf(ProfileApplicationChange.class), ofKind(DifferenceKind.ADD)));
+			addUMLStereotypeApplication = Iterators.find(differences.iterator(),
+					and(instanceOf(StereotypeApplicationChange.class), ofKind(DifferenceKind.ADD)));
 		} else {
-			addUMLProfileApplication = Iterators.find(differences.iterator(), and(
-					instanceOf(ProfileApplicationChange.class), ofKind(DifferenceKind.DELETE)));
-			addUMLStereotypeApplication = Iterators.find(differences.iterator(), and(
-					instanceOf(StereotypeApplicationChange.class), ofKind(DifferenceKind.DELETE)));
+			addUMLProfileApplication = Iterators.find(differences.iterator(),
+					and(instanceOf(ProfileApplicationChange.class), ofKind(DifferenceKind.DELETE)));
+			addUMLStereotypeApplication = Iterators.find(differences.iterator(),
+					and(instanceOf(StereotypeApplicationChange.class), ofKind(DifferenceKind.DELETE)));
 		}
 		assertNotNull(addUMLProfileApplication);
 		assertEquals(4, addUMLProfileApplication.getRefinedBy().size());
@@ -949,15 +949,15 @@ public class StaticStereotypeTest extends AbstractStaticProfileTest {
 		Diff addUMLProfileApplication = null;
 		Diff addUMLStereotypeApplication = null;
 		if (kind.equals(TestKind.ADD)) {
-			addUMLProfileApplication = Iterators.find(differences.iterator(), and(
-					instanceOf(ProfileApplicationChange.class), ofKind(DifferenceKind.ADD)));
-			addUMLStereotypeApplication = Iterators.find(differences.iterator(), and(
-					instanceOf(StereotypeApplicationChange.class), ofKind(DifferenceKind.ADD)));
+			addUMLProfileApplication = Iterators.find(differences.iterator(),
+					and(instanceOf(ProfileApplicationChange.class), ofKind(DifferenceKind.ADD)));
+			addUMLStereotypeApplication = Iterators.find(differences.iterator(),
+					and(instanceOf(StereotypeApplicationChange.class), ofKind(DifferenceKind.ADD)));
 		} else {
-			addUMLProfileApplication = Iterators.find(differences.iterator(), and(
-					instanceOf(ProfileApplicationChange.class), ofKind(DifferenceKind.DELETE)));
-			addUMLStereotypeApplication = Iterators.find(differences.iterator(), and(
-					instanceOf(StereotypeApplicationChange.class), ofKind(DifferenceKind.DELETE)));
+			addUMLProfileApplication = Iterators.find(differences.iterator(),
+					and(instanceOf(ProfileApplicationChange.class), ofKind(DifferenceKind.DELETE)));
+			addUMLStereotypeApplication = Iterators.find(differences.iterator(),
+					and(instanceOf(StereotypeApplicationChange.class), ofKind(DifferenceKind.DELETE)));
 		}
 		assertNotNull(addUMLProfileApplication);
 		assertEquals(4, addUMLProfileApplication.getRefinedBy().size());
@@ -1023,12 +1023,12 @@ public class StaticStereotypeTest extends AbstractStaticProfileTest {
 		Diff addUMLStereotypeApplication = null;
 		if (kind.equals(TestKind.DELETE)) {
 			addClassDescription = removed("model.Class0");
-			addUMLStereotypeApplication = Iterators.find(differences.iterator(), and(
-					instanceOf(StereotypeApplicationChange.class), ofKind(DifferenceKind.DELETE)));
+			addUMLStereotypeApplication = Iterators.find(differences.iterator(),
+					and(instanceOf(StereotypeApplicationChange.class), ofKind(DifferenceKind.DELETE)));
 		} else {
 			addClassDescription = added("model.Class0");
-			addUMLStereotypeApplication = Iterators.find(differences.iterator(), and(
-					instanceOf(StereotypeApplicationChange.class), ofKind(DifferenceKind.ADD)));
+			addUMLStereotypeApplication = Iterators.find(differences.iterator(),
+					and(instanceOf(StereotypeApplicationChange.class), ofKind(DifferenceKind.ADD)));
 		}
 		addStereotypeApplicationDescription = instanceOf(ResourceAttachmentChange.class);
 
@@ -1059,8 +1059,9 @@ public class StaticStereotypeTest extends AbstractStaticProfileTest {
 
 		final Diff changeAttribute1 = Iterators.find(differences.iterator(), changeAttributeDescription1);
 		final Diff changeAttribute2 = Iterators.find(differences.iterator(), changeAttributeDescription2);
-		final UnmodifiableIterator<Diff> changeUMLStereotypeProperties = Iterators.filter(differences
-				.iterator(), and(instanceOf(StereotypeAttributeChange.class), ofKind(DifferenceKind.CHANGE)));
+		final UnmodifiableIterator<Diff> changeUMLStereotypeProperties = Iterators.filter(
+				differences.iterator(),
+				and(instanceOf(StereotypeAttributeChange.class), ofKind(DifferenceKind.CHANGE)));
 
 		assertTrue(changeUMLStereotypeProperties.hasNext());
 		final Diff changeUMLStereotypeProperty1 = changeUMLStereotypeProperties.next();
@@ -1184,8 +1185,8 @@ public class StaticStereotypeTest extends AbstractStaticProfileTest {
 		Predicate<? super Diff> changeStereotypeRefDescription = null;
 		Predicate<? super Diff> changeUMLStereotypeDescription = null;
 
-		changeStereotypeRefDescription = and(instanceOf(ReferenceChange.class),
-				ofKind(DifferenceKind.CHANGE), onFeature("singleValuedReference"), valueNameMatches("class0"));
+		changeStereotypeRefDescription = and(instanceOf(ReferenceChange.class), ofKind(DifferenceKind.CHANGE),
+				onFeature("singleValuedReference"), valueNameMatches("class0"));
 
 		changeUMLStereotypeDescription = and(instanceOf(StereotypeReferenceChange.class),
 				ofKind(DifferenceKind.CHANGE));
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/StaticStereotypedElementChangeTests.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/StaticStereotypedElementChangeTests.java
index 5a7bc702a..eed35a846 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/StaticStereotypedElementChangeTests.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/StaticStereotypedElementChangeTests.java
@@ -52,9 +52,8 @@ public class StaticStereotypedElementChangeTests extends AbstractStereotypedElem
 			// It is required to link the EPackage to the UML package of the UML Profile
 			Map<String, URI> ePackageNsURIToProfileLocationMap = UMLPlugin
 					.getEPackageNsURIToProfileLocationMap();
-			ePackageNsURIToProfileLocationMap
-					.put(UML2CompareTestProfilePackage.eNS_URI,
-							URI.createURI("pathmap://UML_COMPARE_TESTS_PROFILE/uml2.compare.testprofile.profile.uml#_hZFTgIwkEeC_FYHMbTTxXw")); //$NON-NLS-1$
+			ePackageNsURIToProfileLocationMap.put(UML2CompareTestProfilePackage.eNS_URI, URI.createURI(
+					"pathmap://UML_COMPARE_TESTS_PROFILE/uml2.compare.testprofile.profile.uml#_hZFTgIwkEeC_FYHMbTTxXw")); //$NON-NLS-1$
 		}
 	}
 
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/data/dangling/DanglingStereotypeApplicationInputData.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/data/dangling/DanglingStereotypeApplicationInputData.java
index 8f0338893..648fb2e38 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/data/dangling/DanglingStereotypeApplicationInputData.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/data/dangling/DanglingStereotypeApplicationInputData.java
@@ -81,11 +81,12 @@ public class DanglingStereotypeApplicationInputData extends AbstractUMLInputData
 			UMLJarPath = UMLJarPath.substring(0, UMLJarPath.indexOf('!'));
 
 			final Map<URI, URI> uriMap = URIConverter.URI_MAP;
-			uriMap.put(URI.createURI(UMLResource.LIBRARIES_PATHMAP), URI.createURI(UMLJarPath
-					+ "!/libraries/"));
-			uriMap.put(URI.createURI(UMLResource.METAMODELS_PATHMAP), URI.createURI(UMLJarPath
-					+ "!/metamodels/"));
-			uriMap.put(URI.createURI(UMLResource.PROFILES_PATHMAP), URI.createURI(UMLJarPath + "!/profiles/"));
+			uriMap.put(URI.createURI(UMLResource.LIBRARIES_PATHMAP),
+					URI.createURI(UMLJarPath + "!/libraries/"));
+			uriMap.put(URI.createURI(UMLResource.METAMODELS_PATHMAP),
+					URI.createURI(UMLJarPath + "!/metamodels/"));
+			uriMap.put(URI.createURI(UMLResource.PROFILES_PATHMAP),
+					URI.createURI(UMLJarPath + "!/profiles/"));
 		}
 
 		Resource resource = resourceSet.createResource(uri);
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/timeConstraint/AddTimeConstraintTest.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/timeConstraint/AddTimeConstraintTest.java
index de0436982..a6921a6f2 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/timeConstraint/AddTimeConstraintTest.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/timeConstraint/AddTimeConstraintTest.java
@@ -178,11 +178,11 @@ public class AddTimeConstraintTest extends AbstractUMLTest {
 		assertEquals(1, count(differences, instanceOf(IntervalConstraintChange.class)));
 		Diff addUMLMessage = null;
 		if (kind.equals(TestKind.ADD)) {
-			addUMLMessage = Iterators.find(differences.iterator(), and(
-					instanceOf(IntervalConstraintChange.class), ofKind(DifferenceKind.ADD)));
+			addUMLMessage = Iterators.find(differences.iterator(),
+					and(instanceOf(IntervalConstraintChange.class), ofKind(DifferenceKind.ADD)));
 		} else {
-			addUMLMessage = Iterators.find(differences.iterator(), and(
-					instanceOf(IntervalConstraintChange.class), ofKind(DifferenceKind.DELETE)));
+			addUMLMessage = Iterators.find(differences.iterator(),
+					and(instanceOf(IntervalConstraintChange.class), ofKind(DifferenceKind.DELETE)));
 		}
 		assertNotNull(addUMLMessage);
 		assertEquals(9, addUMLMessage.getRefinedBy().size());