From 9cc18900e87f9ae921396569338365485f9a067a Mon Sep 17 00:00:00 2001 From: Laurent Delaigue Date: Fri, 11 Dec 2015 09:56:26 +0100 Subject: Fix performance tests Change-Id: I8a687e2b56884b12450008db1335fe1cb576dd12 Signed-off-by: Laurent Delaigue --- .../src/data/models/DataGit.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'performance') 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 753e54ae5..d7036461b 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 @@ -98,6 +98,17 @@ 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(); @@ -161,10 +172,7 @@ 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 ThreadedModelResolver resolver = new ThreadedModelResolver(); - EMFCompareRCPPlugin.getDefault().register(resolver); - resolver.initialize(); - final ComparisonScopeBuilder scopeBuilder = new ComparisonScopeBuilder(resolver, + final ComparisonScopeBuilder scopeBuilder = new ComparisonScopeBuilder(getModelResolver(), new IdenticalResourceMinimizer(), storageAccessor); scope = scopeBuilder.build(left, right, origin, m); -- cgit v1.2.3