Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Ortmayr2019-01-22 12:30:54 -0500
committerTobias Ortmayr2019-01-22 12:30:54 -0500
commit575f682f9b081c6d881d85c8bb5b4237054ec763 (patch)
treef280d7364f17b8d47eb50720a7b84fd4cfed9059
parent8a79f97a540987ee337e56a0e516cd3a74c038e0 (diff)
downloadorg.eclipse.papyrus-collaborativemodeling-575f682f9b081c6d881d85c8bb5b4237054ec763.tar.gz
org.eclipse.papyrus-collaborativemodeling-575f682f9b081c6d881d85c8bb5b4237054ec763.tar.xz
org.eclipse.papyrus-collaborativemodeling-575f682f9b081c6d881d85c8bb5b4237054ec763.zip
Temporary fix to ensure that correct accessor factories are used
This is a temporary fix to ensure that PapyrusCompare is working alongside (Sirius) EMF Compare. see Bug 543707 Change-Id: Ia5a2aa441e1b4d7d606052145832439a0f134b59 Signed-off-by: Tobias Ortmayr <tortmayr@eclipsesource.com>
-rw-r--r--compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/accessorfactory/PapyrusAccessorFactoryWrapper.java10
1 files changed, 10 insertions, 0 deletions
diff --git a/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/accessorfactory/PapyrusAccessorFactoryWrapper.java b/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/accessorfactory/PapyrusAccessorFactoryWrapper.java
index 25ab3b9..8a84200 100644
--- a/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/accessorfactory/PapyrusAccessorFactoryWrapper.java
+++ b/compare/bundles/org.eclipse.papyrus.compare.diagram.ide.ui/src/org/eclipse/papyrus/compare/diagram/ide/ui/internal/accessorfactory/PapyrusAccessorFactoryWrapper.java
@@ -131,6 +131,16 @@ public class PapyrusAccessorFactoryWrapper extends AbstractAccessorFactory {
while (factories.hasNext()) {
IAccessorFactory factory = factories.next();
+
+ // Temporary fix for Bug 543707 (https://bugs.eclipse.org/bugs/show_bug.cgi?id=543707)
+ // Can be removed once Bug 543707 is resolved
+ if (factory.getClass().getName().equals(
+ "org.eclipse.emf.compare.diagram.ide.ui.sirius.internal.SiriusDiffAccessorFactory") //$NON-NLS-1$
+ || factory.getClass().getName().equals(
+ "org.eclipse.emf.compare.diagram.ide.ui.sirius.internal.SiriusMatchAccessorFactory")) { //$NON-NLS-1$
+ continue;
+ }
+
// Do not use this or another higher ranking factory to avoid endless loops
if (factory.getRanking() >= this.getRanking()) {
continue;

Back to the top