From 575f682f9b081c6d881d85c8bb5b4237054ec763 Mon Sep 17 00:00:00 2001 From: Tobias Ortmayr Date: Tue, 22 Jan 2019 18:30:54 +0100 Subject: 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 --- .../accessorfactory/PapyrusAccessorFactoryWrapper.java | 10 ++++++++++ 1 file changed, 10 insertions(+) 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 25ab3b97..8a842001 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; -- cgit v1.2.3