| commit | d6e545228918f5ea472ecb7e449875310821098d | [log] [tgz] |
|---|---|---|
| author | Mikael Barbero <mikael.barbero@obeo.fr> | Wed Jun 11 09:11:23 2014 -0400 |
| committer | Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> | Wed Jun 11 09:11:23 2014 -0400 |
| tree | f420fe9aa174bcb611f1c85613bfa20c82968920 | |
| parent | a2ddbeb7e18e9d3b8050dbdbbaeaff63274c4838 [diff] | |
| parent | 9f2311919c6322217b1e755122fa8e27c9b7faa3 [diff] |
Merge "Correct the order of processing post processors."
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 e3e0626..0407b96 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
@@ -39,7 +39,7 @@ */ public class EMFResourceMapping extends ResourceMapping { /** The physical resource underlying this mapping. */ - private IFile file; + private ForwardingFile file; /** The Model provider for which this mapping has been created. */ private String providerId; @@ -103,13 +103,13 @@ if (emfTraversal.getDiagnostic().getSeverity() >= Diagnostic.ERROR) { EMFCompareIDEUIPlugin.getDefault().getLog().log( BasicDiagnostic.toIStatus(emfTraversal.getDiagnostic())); - return createSingletonTraversal(file); + return createSingletonTraversal(file.getDelegate()); } cachedTraversals = convertCompareTraversal(emfTraversal); } catch (InterruptedException e) { Thread.currentThread().interrupt(); - return createSingletonTraversal(file); + return createSingletonTraversal(file.getDelegate()); } }
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/ForwardingFile.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/ForwardingFile.java index a24f8fa..0ca57c3 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/ForwardingFile.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/ForwardingFile.java
@@ -136,6 +136,10 @@ delegate().setContents(source, updateFlags, monitor); } + public IFile getDelegate() { + return delegate; + } + /** * {@inheritDoc} *