[Releng] Remove org.eclipse.emf.cdo.compare.CDOCompare.ComparisonScopeAdapter
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/EMFUtil.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/EMFUtil.java
index 0b92f80..45b41b3 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/EMFUtil.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/EMFUtil.java
@@ -594,6 +594,7 @@
{
@SuppressWarnings("unchecked")
T adapter = (T)EcoreUtil.getAdapter(notifier.eAdapters(), type);
+
return adapter;
}
diff --git a/plugins/org.eclipse.emf.cdo.compare/.settings/.api_filters b/plugins/org.eclipse.emf.cdo.compare/.settings/.api_filters
index 539a705..96a6f6a 100644
--- a/plugins/org.eclipse.emf.cdo.compare/.settings/.api_filters
+++ b/plugins/org.eclipse.emf.cdo.compare/.settings/.api_filters
@@ -1,12 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.emf.cdo.compare" version="2">
- <resource path="src/org/eclipse/emf/cdo/compare/CDOCompare.java" type="org.eclipse.emf.cdo.compare.CDOCompare$CDOIDFunction">
- <filter id="337682486">
- <message_arguments>
- <message_argument value="org.eclipse.emf.cdo.compare.CDOCompare.CDOIDFunction"/>
- </message_arguments>
- </filter>
- </resource>
<resource path="src/org/eclipse/emf/cdo/compare/CDOComparisonScope.java" type="org.eclipse.emf.cdo.compare.CDOComparisonScope$Minimal">
<filter id="337682486">
<message_arguments>
diff --git a/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOCompare.java b/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOCompare.java
index 337dd62..4bb18c3 100644
--- a/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOCompare.java
+++ b/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOCompare.java
@@ -10,8 +10,6 @@
*/
package org.eclipse.emf.cdo.compare;
-import static org.eclipse.emf.compare.utils.EMFComparePredicates.IS_EGENERIC_TYPE_WITHOUT_PARAMETERS;
-
import org.eclipse.emf.cdo.CDOElement;
import org.eclipse.emf.cdo.CDOObject;
import org.eclipse.emf.cdo.common.id.CDOID;
@@ -22,7 +20,6 @@
import org.eclipse.net4j.util.ReflectUtil;
import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
import org.eclipse.emf.common.util.Monitor;
import org.eclipse.emf.compare.CompareFactory;
import org.eclipse.emf.compare.Comparison;
@@ -79,14 +76,9 @@
IEObjectMatcher matcher = createMatcher(idFunction);
IEqualityHelperFactory equalityHelperFactory = createEqualityHelperFactory();
IComparisonFactory comparisonFactory = createComparisonFactory(equalityHelperFactory);
+
EMFCompare comparator = createComparator(matcher, comparisonFactory);
-
- Comparison comparison = comparator.compare(scope);
-
- // TODO See EMFCompare.java, line 316
- comparison.eAdapters().add(new ComparisonScopeAdapter(scope));
-
- return comparison;
+ return comparator.compare(scope);
}
protected CDOIDFunction createIDFunction()
@@ -193,13 +185,7 @@
public static IComparisonScope getScope(Comparison comparison)
{
- ComparisonScopeAdapter adapter = EMFUtil.getAdapter(comparison, ComparisonScopeAdapter.class);
- if (adapter == null)
- {
- return null;
- }
-
- return adapter.getScope();
+ return EMFUtil.getAdapter(comparison, IComparisonScope.class);
}
/**
@@ -508,8 +494,10 @@
boolean isGenericType = reference.getEType() == EcorePackage.eINSTANCE.getEGenericType();
if (isGenericType)
{
- isGenericTypeWithoutArguments = IS_EGENERIC_TYPE_WITHOUT_PARAMETERS.apply(match.getLeft())
- && IS_EGENERIC_TYPE_WITHOUT_PARAMETERS.apply(match.getRight()) && IS_EGENERIC_TYPE_WITHOUT_PARAMETERS.apply(match.getOrigin());
+ isGenericTypeWithoutArguments = //
+ org.eclipse.emf.compare.utils.EMFComparePredicates.IS_EGENERIC_TYPE_WITHOUT_PARAMETERS.apply(match.getLeft()) && //
+ org.eclipse.emf.compare.utils.EMFComparePredicates.IS_EGENERIC_TYPE_WITHOUT_PARAMETERS.apply(match.getRight()) && //
+ org.eclipse.emf.compare.utils.EMFComparePredicates.IS_EGENERIC_TYPE_WITHOUT_PARAMETERS.apply(match.getOrigin());
}
toIgnore = isGenericTypeWithoutArguments || !referenceIsSet(reference, match);
}
@@ -543,28 +531,4 @@
return !EMFUtil.isPersistent(feature);
}
}
-
- /**
- * @author Eike Stepper
- */
- private static final class ComparisonScopeAdapter extends AdapterImpl
- {
- private IComparisonScope scope;
-
- public ComparisonScopeAdapter(IComparisonScope scope)
- {
- this.scope = scope;
- }
-
- public final IComparisonScope getScope()
- {
- return scope;
- }
-
- @Override
- public boolean isAdapterForType(Object type)
- {
- return type == ComparisonScopeAdapter.class;
- }
- }
}
