Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikaël Barbero2013-03-11 15:44:14 +0000
committerMikaël Barbero2013-03-11 15:45:21 +0000
commit25cd174359204b77eb639cd5287732159c352791 (patch)
tree3623d02738eb8d54642063b81a5ed3ff6489f5fa
parent1b2872bb53b35ee52787b59d2402cfb35a8a1912 (diff)
downloadorg.eclipse.emf.compare-25cd174359204b77eb639cd5287732159c352791.tar.gz
org.eclipse.emf.compare-25cd174359204b77eb639cd5287732159c352791.tar.xz
org.eclipse.emf.compare-25cd174359204b77eb639cd5287732159c352791.zip
fix monitor issue.
o.e.emf.common.util.BasicMonitor.Delegating does not implement o.e.emf.common.util.Monitor until EMF 2.8
-rw-r--r--plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/ProximityEObjectMatcher.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/ProximityEObjectMatcher.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/ProximityEObjectMatcher.java
index 5d947b5e3..f335e806b 100644
--- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/ProximityEObjectMatcher.java
+++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/match/eobject/ProximityEObjectMatcher.java
@@ -21,7 +21,6 @@ import java.util.Map;
import org.eclipse.emf.common.util.BasicEList;
import org.eclipse.emf.common.util.BasicMonitor;
-import org.eclipse.emf.common.util.BasicMonitor.Delegating;
import org.eclipse.emf.common.util.Monitor;
import org.eclipse.emf.compare.CompareFactory;
import org.eclipse.emf.compare.Comparison;
@@ -75,7 +74,8 @@ public class ProximityEObjectMatcher implements IEObjectMatcher, ScopeQuery {
Iterator<? extends EObject> rightEObjects, Iterator<? extends EObject> originEObjects,
Monitor monitor) {
- Delegating subMonitor = new BasicMonitor.Delegating(monitor);
+ // FIXME: how to create an EMF submonitor
+ Monitor subMonitor = new BasicMonitor();
subMonitor.beginTask("indexing objects", 1);
int nbElements = 0;
/*
@@ -109,7 +109,8 @@ public class ProximityEObjectMatcher implements IEObjectMatcher, ScopeQuery {
subMonitor.worked(1);
subMonitor.done();
- subMonitor = new BasicMonitor.Delegating(monitor);
+ // FIXME: how to create an EMF submonitor
+ subMonitor = new BasicMonitor();
subMonitor.beginTask("matching objects", nbElements);
Iterator<EObject> todo = index.getValuesStillThere(Side.LEFT).iterator();

Back to the top