[463785] ResourceLocationChange: core changes.

Detects & creates ResourceLocationChanges in DiffEngine.
Add new merger for ResourceLocationChange and unit tests for implicit
renames detection.

Bug: 463785
Change-Id: Iea1ece422aeb194c268e94d0bcbad9c06a161954
Also-by: Laurent Delaigue <laurent.delaigue@obeo.fr>
Signed-off-by: Axel Richard <axel.richard@obeo.fr>
Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>

2 files changed, 6 insertions, 5 deletions

diff --git a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/domain/impl/EMFCompareEditingDomain.java b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/domain/impl/EMFCompareEditingDomain.java
index c55392d46..b6b282819 100644
--- a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/domain/impl/EMFCompareEditingDomain.java
+++ b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/domain/impl/EMFCompareEditingDomain.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2012, 2014 Obeo.
+ * Copyright (c) 2012, 2015 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -36,6 +36,7 @@ import org.eclipse.emf.compare.command.impl.TransactionalDualCompareCommandStack
 import org.eclipse.emf.compare.domain.ICompareEditingDomain;
 import org.eclipse.emf.compare.domain.IMergeRunnable;
 import org.eclipse.emf.compare.internal.domain.IMergeAllNonConflictingRunnable;
+import org.eclipse.emf.compare.internal.utils.ComparisonUtil;
 import org.eclipse.emf.compare.merge.BatchMerger;
 import org.eclipse.emf.compare.merge.IBatchMerger;
 import org.eclipse.emf.compare.merge.IMerger;
@@ -352,7 +353,7 @@ public class EMFCompareEditingDomain implements ICompareEditingDomain, IDisposab
 			Registry mergerRegistry, IMergeRunnable runnable) {
 		ImmutableSet.Builder<Notifier> notifiersBuilder = ImmutableSet.builder();
 		for (Diff diff : differences) {
-			notifiersBuilder.add(diff.getMatch().getComparison());
+			notifiersBuilder.add(ComparisonUtil.getComparison(diff));
 		}
 		ImmutableSet<Notifier> notifiers = notifiersBuilder.addAll(fNotifiers).build();
 
diff --git a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/OverlayImageProvider.java b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/OverlayImageProvider.java
index fdb5b4039..d0e5845ea 100644
--- a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/OverlayImageProvider.java
+++ b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/OverlayImageProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2012, 2014 Obeo.
+ * Copyright (c) 2012, 2015 Obeo.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -26,6 +26,7 @@ import org.eclipse.emf.compare.DifferenceSource;
 import org.eclipse.emf.compare.DifferenceState;
 import org.eclipse.emf.compare.Match;
 import org.eclipse.emf.compare.internal.merge.IMergeData;
+import org.eclipse.emf.compare.internal.utils.ComparisonUtil;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.provider.ComposedImage;
 
@@ -142,8 +143,7 @@ public class OverlayImageProvider {
 	// Nothing here has to be externalized
 	@SuppressWarnings("nls")
 	private String getImageOverlay(Diff diff) {
-		final Match match = diff.getMatch();
-		final Comparison comparison = match.getComparison();
+		final Comparison comparison = ComparisonUtil.getComparison(diff);
 		String path = "full/ovr16/";
 
 		if (diff.getState() == DifferenceState.MERGED) {