Extract isThreeWay method

Change-Id: I0eaf8ff16f6b4194b4819ebb915d27f9c9bf13b7

1 files changed, 20 insertions, 10 deletions

diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/CompareInputAdapter.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/CompareInputAdapter.java
index 94337b02c..78a19aef8 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/CompareInputAdapter.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/CompareInputAdapter.java
@@ -19,6 +19,7 @@ import org.eclipse.core.runtime.SafeRunner;
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notifier;
 import org.eclipse.emf.common.notify.impl.AdapterImpl;
+import org.eclipse.emf.compare.Comparison;
 import org.eclipse.emf.compare.Conflict;
 import org.eclipse.emf.compare.Diff;
 import org.eclipse.emf.compare.Match;
@@ -208,16 +209,7 @@ public abstract class CompareInputAdapter extends AdapterImpl implements ICompar
 	public ITypedElement getAncestor() {
 		final ITypedElement ret;
 		Notifier notifier = getComparisonObject();
-		boolean isThreeWay = false;
-		if (notifier instanceof Diff) {
-			isThreeWay = ((Diff)notifier).getMatch().getComparison().isThreeWay();
-		} else if (notifier instanceof Match) {
-			isThreeWay = ((Match)notifier).getComparison().isThreeWay();
-		} else if (notifier instanceof Conflict) {
-			isThreeWay = true;
-		} else if (notifier instanceof MatchResource) {
-			isThreeWay = ((MatchResource)notifier).getComparison().isThreeWay();
-		}
+		boolean isThreeWay = isThreeWay(notifier);
 		if (isThreeWay) {
 			IAccessorFactory accessorFactory = getAccessorFactoryForTarget();
 			if (accessorFactory != null) {
@@ -237,6 +229,24 @@ public abstract class CompareInputAdapter extends AdapterImpl implements ICompar
 		return ret;
 	}
 
+	protected boolean isThreeWay(Notifier notifier) {
+		final boolean isThreeWay;
+		if (notifier instanceof Diff) {
+			isThreeWay = ((Diff)notifier).getMatch().getComparison().isThreeWay();
+		} else if (notifier instanceof Match) {
+			isThreeWay = ((Match)notifier).getComparison().isThreeWay();
+		} else if (notifier instanceof Conflict) {
+			isThreeWay = true;
+		} else if (notifier instanceof MatchResource) {
+			isThreeWay = ((MatchResource)notifier).getComparison().isThreeWay();
+		} else if (notifier instanceof Comparison) {
+			isThreeWay = ((Comparison)notifier).isThreeWay();
+		} else {
+			isThreeWay = false;
+		}
+		return isThreeWay;
+	}
+
 	/**
 	 * {@inheritDoc}
 	 *