Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlgoubet2019-09-19 07:22:22 +0000
committerlgoubet2019-09-19 07:22:22 +0000
commit92fc0d18d0f3d89ae41ea1e72943b2288be0e2b4 (patch)
tree099a53adef64dff25d87a5769a7d6918fedb6c8b
parentf99bc23b43fee4d8fb38f9adeba566effe8ce2ed (diff)
downloadorg.eclipse.emf.compare-92fc0d18d0f3d89ae41ea1e72943b2288be0e2b4.tar.gz
org.eclipse.emf.compare-92fc0d18d0f3d89ae41ea1e72943b2288be0e2b4.tar.xz
org.eclipse.emf.compare-92fc0d18d0f3d89ae41ea1e72943b2288be0e2b4.zip
API compatibility
commit 89b43a837714f3b6315e07dd93a57617a9ce848c broke API compatibility by removing this constructor. Change-Id: Ibb940c3ca11fef14b6195147921d9b7ba2f3c140
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/impl/MatchEngineFactoryImpl.java27
1 files changed, 25 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/impl/MatchEngineFactoryImpl.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/impl/MatchEngineFactoryImpl.java
index 978df718a..4a4ac5ae3 100644
--- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/impl/MatchEngineFactoryImpl.java
+++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/impl/MatchEngineFactoryImpl.java
@@ -103,6 +103,21 @@ public class MatchEngineFactoryImpl implements IMatchEngine.Factory {
}
/**
+ * Constructor that instantiate a {@link DefaultMatchEngine} with the given parameters.
+ *
+ * @param matcher
+ * The matcher that will be in charge of pairing EObjects together for this comparison process.
+ * @param comparisonFactory
+ * factory that will be use to instantiate Comparison as return by match() methods.
+ * @deprecated Using this will ignore any weight provider or equality helper extension provided through
+ * extension points. Use another of the constructors if you need this functionality.
+ */
+ @Deprecated
+ public MatchEngineFactoryImpl(IEObjectMatcher matcher, IComparisonFactory comparisonFactory) {
+ matchEngine = new DefaultMatchEngine(matcher, comparisonFactory);
+ }
+
+ /**
* {@inheritDoc}
*
* @see org.eclipse.emf.compare.match.IMatchEngine.Factory#getMatchEngine()
@@ -153,7 +168,11 @@ public class MatchEngineFactoryImpl implements IMatchEngine.Factory {
*/
void setWeightProviderRegistry(WeightProvider.Descriptor.Registry registry) {
this.weightProviderRegistry = registry;
- this.matchEngine = null;
+ // TODO remove this condition once the deprecated MatchEngineFactoryImpl(IEObjectMatcher,
+ // IComparisonFactory) is removed
+ if (shouldUseIdentifiers != null) {
+ this.matchEngine = null;
+ }
}
/**
@@ -165,7 +184,11 @@ public class MatchEngineFactoryImpl implements IMatchEngine.Factory {
public void setEqualityHelperExtensionProviderRegistry(
EqualityHelperExtensionProvider.Descriptor.Registry equalityHelperExtensionProviderRegistry) {
this.equalityHelperExtensionProviderRegistry = equalityHelperExtensionProviderRegistry;
- this.matchEngine = null;
+ // TODO remove this condition once the deprecated MatchEngineFactoryImpl(IEObjectMatcher,
+ // IComparisonFactory) is removed
+ if (shouldUseIdentifiers != null) {
+ this.matchEngine = null;
+ }
}
}

Back to the top