Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathieu Cartaud2015-10-07 04:52:31 -0400
committerMathieu Cartaud2015-10-15 08:57:59 -0400
commitc27c77330fcff474deaaebe5ef5e772cc72f299c (patch)
tree9604b47670700f3fcd3e1830db2400898f41ac0e /performance
parentf578950d9fd83d188eacd4c957967cbf411d4e5d (diff)
downloadorg.eclipse.emf.compare-c27c77330fcff474deaaebe5ef5e772cc72f299c.tar.gz
org.eclipse.emf.compare-c27c77330fcff474deaaebe5ef5e772cc72f299c.tar.xz
org.eclipse.emf.compare-c27c77330fcff474deaaebe5ef5e772cc72f299c.zip
Extract EMFCompareConfiguration from EMFCompareRCPUIPlugin
- Extract graphs from EMFCompareConfiguration - Extract EMFCompareConfiguration from RCPUIPlugin - Give the StructureMergeViewerFilter through the TreeItemAdapterFactorySpec - The new URI Graph instance is now created by EMFCompareRCPPlugin who passes it to the ThreadedModelResolver and holds the associated graph view Change-Id: I713ae5d2f10f1498433cd373d24636e93d3bb4cf Also-by: Laurent Delaigue <laurent.delaigue@obeo.fr> Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr> Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>
Diffstat (limited to 'performance')
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/META-INF/MANIFEST.MF3
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/data/models/DataGit.java2
2 files changed, 4 insertions, 1 deletions
diff --git a/performance/org.eclipse.emf.compare.tests.performance/META-INF/MANIFEST.MF b/performance/org.eclipse.emf.compare.tests.performance/META-INF/MANIFEST.MF
index 788ca9f31..902691258 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/META-INF/MANIFEST.MF
+++ b/performance/org.eclipse.emf.compare.tests.performance/META-INF/MANIFEST.MF
@@ -22,7 +22,8 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.jface,
org.eclipse.egit.core,
org.eclipse.jgit,
- org.eclipse.team.core
+ org.eclipse.team.core,
+ org.eclipse.emf.compare.rcp;bundle-version="2.4.0"
Import-Package: com.google.common.base;version="[11.0.0,16.0.0)",
com.google.common.collect;version="[11.0.0,16.0.0)",
com.google.common.io;version="[11.0.0,16.0.0)"
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 71f3dc960..753e54ae5 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
@@ -57,6 +57,7 @@ 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;
@@ -161,6 +162,7 @@ public class DataGit {
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,
new IdenticalResourceMinimizer(), storageAccessor);

Back to the top