[487306] Use only relevant diagnostic to compute traversals

The choice of creating a traversal or a singleton traversal is made
using the diagnostic of the whole synchronisation model.
This can lead to errors since it can contain errors on resources not
directly linked to the actual comparison.
To fix this issue, a correct traversal is always created, the potential
errors are managed later by EMFCompare.

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

1 files changed, 0 insertions, 8 deletions

diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/EMFResourceMapping.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/EMFResourceMapping.java
index ffa1e60ab..8749c2bd7 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/EMFResourceMapping.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/EMFResourceMapping.java
@@ -24,9 +24,7 @@ import org.eclipse.core.resources.mapping.ResourceMappingContext;
 import org.eclipse.core.resources.mapping.ResourceTraversal;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.common.util.BasicDiagnostic;
 import org.eclipse.emf.common.util.Diagnostic;
-import org.eclipse.emf.compare.ide.ui.internal.EMFCompareIDEUIPlugin;
 import org.eclipse.emf.compare.ide.ui.logical.SynchronizationModel;
 
 /**
@@ -118,12 +116,6 @@ public class EMFResourceMapping extends ResourceMapping {
 
 		latestModel = syncModel;
 
-		if (syncModel.getDiagnostic().getSeverity() >= Diagnostic.ERROR) {
-			EMFCompareIDEUIPlugin.getDefault().getLog().log(
-					BasicDiagnostic.toIStatus(syncModel.getDiagnostic()));
-			return createSingletonTraversal(resource);
-		}
-
 		return convertToTraversal(syncModel);
 	}