Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Delaigue2015-12-11 08:22:40 -0500
committerLaurent Delaigue2015-12-11 08:23:23 -0500
commit68996ddfcf936391d0bed329aebf9ce960c78d79 (patch)
tree51aabc048f1f7e9673fe338e862ddee8c0e3669b /performance
parent9cc18900e87f9ae921396569338365485f9a067a (diff)
downloadorg.eclipse.emf.compare-68996ddfcf936391d0bed329aebf9ce960c78d79.tar.gz
org.eclipse.emf.compare-68996ddfcf936391d0bed329aebf9ce960c78d79.tar.xz
org.eclipse.emf.compare-68996ddfcf936391d0bed329aebf9ce960c78d79.zip
Fix performance tests, again3.2.0M4
Change-Id: I7d73b6d98dd160ec66258dab6a613caaaa2b4a75 Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>
Diffstat (limited to 'performance')
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/data/models/DataGit.java20
1 files changed, 6 insertions, 14 deletions
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/DataGit.java b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/DataGit.java
index d7036461b..55d64a710 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/DataGit.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/DataGit.java
@@ -47,17 +47,18 @@ import org.eclipse.emf.compare.diff.IDiffEngine;
import org.eclipse.emf.compare.diff.IDiffProcessor;
import org.eclipse.emf.compare.equi.DefaultEquiEngine;
import org.eclipse.emf.compare.equi.IEquiEngine;
+import org.eclipse.emf.compare.ide.ui.internal.EMFCompareIDEUIPlugin;
import org.eclipse.emf.compare.ide.ui.internal.logical.ComparisonScopeBuilder;
import org.eclipse.emf.compare.ide.ui.internal.logical.IdenticalResourceMinimizer;
import org.eclipse.emf.compare.ide.ui.internal.logical.StorageTypedElement;
import org.eclipse.emf.compare.ide.ui.internal.logical.SubscriberStorageAccessor;
-import org.eclipse.emf.compare.ide.ui.internal.logical.resolver.ThreadedModelResolver;
+import org.eclipse.emf.compare.ide.ui.internal.logical.resolver.registry.ModelResolverRegistry;
+import org.eclipse.emf.compare.ide.ui.logical.IModelResolver;
import org.eclipse.emf.compare.ide.ui.logical.IStorageProvider;
import org.eclipse.emf.compare.ide.ui.logical.IStorageProviderAccessor;
import org.eclipse.emf.compare.match.DefaultMatchEngine;
import org.eclipse.emf.compare.match.IMatchEngine;
import org.eclipse.emf.compare.postprocessor.IPostProcessor;
-import org.eclipse.emf.compare.rcp.EMFCompareRCPPlugin;
import org.eclipse.emf.compare.req.DefaultReqEngine;
import org.eclipse.emf.compare.req.IReqEngine;
import org.eclipse.emf.compare.scope.IComparisonScope;
@@ -98,17 +99,6 @@ public class DataGit {
private Repository repository;
- private static ThreadedModelResolver resolver;
-
- protected static synchronized ThreadedModelResolver getModelResolver() {
- if (resolver == null) {
- resolver = new ThreadedModelResolver();
- EMFCompareRCPPlugin.getDefault().register(resolver);
- resolver.initialize();
- }
- return resolver;
- }
-
public DataGit(String zippedRepoLocation, String repoName, String rootProjectName, String modelName) {
try {
this.disposers = new ArrayList<Runnable>();
@@ -172,7 +162,9 @@ public class DataGit {
final ITypedElement left = new StorageTypedElement(sourceProvider.getStorage(m), fullPath);
final ITypedElement right = new StorageTypedElement(remoteProvider.getStorage(m), fullPath);
final ITypedElement origin = new StorageTypedElement(ancestorProvider.getStorage(m), fullPath);
- final ComparisonScopeBuilder scopeBuilder = new ComparisonScopeBuilder(getModelResolver(),
+ ModelResolverRegistry mrr = EMFCompareIDEUIPlugin.getDefault().getModelResolverRegistry();
+ IModelResolver resolver = mrr.getBestResolverFor(sourceProvider.getStorage(m));
+ final ComparisonScopeBuilder scopeBuilder = new ComparisonScopeBuilder(resolver,
new IdenticalResourceMinimizer(), storageAccessor);
scope = scopeBuilder.build(left, right, origin, m);

Back to the top