Modify EMFCompareUtils code to create MatchEngineFactoryRegistries
diff --git a/plugins/org.eclipse.mylyn.docs.intent.collab.ide/src/org/eclipse/mylyn/docs/intent/collab/ide/adapters/WorkspaceAdapter.java b/plugins/org.eclipse.mylyn.docs.intent.collab.ide/src/org/eclipse/mylyn/docs/intent/collab/ide/adapters/WorkspaceAdapter.java
index 3214527..ec4a14b 100644
--- a/plugins/org.eclipse.mylyn.docs.intent.collab.ide/src/org/eclipse/mylyn/docs/intent/collab/ide/adapters/WorkspaceAdapter.java
+++ b/plugins/org.eclipse.mylyn.docs.intent.collab.ide/src/org/eclipse/mylyn/docs/intent/collab/ide/adapters/WorkspaceAdapter.java
@@ -633,17 +633,17 @@
if (commandStack != null) {
// Check that change recorder is not already recording
long timeout = System.currentTimeMillis();
- while (((InternalTransactionalEditingDomain)editingDomain).getChangeRecorder().isRecording()
- && System.currentTimeMillis() < timeout + TIMEOUT) {
- try {
- Thread.sleep(TIME_TO_WAIT_BEFORE_CHECKING_SESSIONDELTA);
- } catch (InterruptedException e) {
- // Command will be executed
- }
- }
-
- // Step 3: execute command
try {
+ while (((InternalTransactionalEditingDomain)editingDomain).getChangeRecorder().isRecording()
+ && System.currentTimeMillis() < timeout + TIMEOUT) {
+ try {
+ Thread.sleep(TIME_TO_WAIT_BEFORE_CHECKING_SESSIONDELTA);
+ } catch (InterruptedException e) {
+ // Command will be executed
+ }
+ }
+
+ // Step 3: execute command
commandStack.execute(recordingCommand);
} catch (NullPointerException e) {
// can happen when TED is disposed
diff --git a/plugins/org.eclipse.mylyn.docs.intent.compare/src/org/eclipse/mylyn/docs/intent/compare/utils/EMFCompareUtils.java b/plugins/org.eclipse.mylyn.docs.intent.compare/src/org/eclipse/mylyn/docs/intent/compare/utils/EMFCompareUtils.java
index a482993..a397987 100644
--- a/plugins/org.eclipse.mylyn.docs.intent.compare/src/org/eclipse/mylyn/docs/intent/compare/utils/EMFCompareUtils.java
+++ b/plugins/org.eclipse.mylyn.docs.intent.compare/src/org/eclipse/mylyn/docs/intent/compare/utils/EMFCompareUtils.java
@@ -150,13 +150,18 @@
* the {@link IMatchEngine} to return
* @return a {@link Registry} always returning the given {@link IMatchEngine}
*/
- private static Registry createMatchEngineRegistryFromMatchEngine(final IMatchEngine matchEngine) {
+ private static Registry createMatchEngineRegistryFromMatchEngine(final IMatchEngine matchEngineToUse) {
Registry matchEngineFactoryRegistry = MatchEngineFactoryRegistryImpl.createStandaloneInstance();
MatchEngineFactoryImpl matchEngineFactory = new MatchEngineFactoryImpl() {
@Override
+ public int getRanking() {
+ return 99;
+ }
+
+ @Override
public IMatchEngine getMatchEngine() {
- return matchEngine;
+ return matchEngineToUse;
}
@Override
diff --git a/plugins/org.eclipse.mylyn.docs.intent/dev/target platform/kepler_eef-sdk.target b/plugins/org.eclipse.mylyn.docs.intent/dev/target platform/kepler_eef-sdk.target
index b7e5c74..74bf5c1 100644
--- a/plugins/org.eclipse.mylyn.docs.intent/dev/target platform/kepler_eef-sdk.target
+++ b/plugins/org.eclipse.mylyn.docs.intent/dev/target platform/kepler_eef-sdk.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
-<target name="Kepler - EEF SDK" sequenceNumber="6">
+<target name="Kepler - EEF SDK" sequenceNumber="8">
<locations>
<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.mylyn.wikitext_feature.feature.group" version="1.8.0.I20130205-1655"/>
@@ -41,8 +41,9 @@
<repository location="http://download.eclipse.org/eclipse/updates/3.8"/>
</location>
<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.emf.compare.source.feature.group" version="2.1.0.201303181730"/>
-<unit id="org.eclipse.emf.compare.ide.ui.source.feature.group" version="2.1.0.201303181730"/>
+<unit id="org.eclipse.emf.compare.feature.group" version="2.1.0.201303191211"/>
+<unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="2.1.0.201303191211"/>
+<unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="2.1.0.201303191211"/>
<repository location="https://hudson.eclipse.org/hudson/job/emf-compare-master/lastSuccessfulBuild/artifact/packaging/org.eclipse.emf.compare.update/target/repository/"/>
</location>
</locations>