Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2012-10-02 05:13:36 +0000
committerEike Stepper2012-10-02 05:13:36 +0000
commit973c58e4c37dd772a32c2107e89c9c184a1ce81d (patch)
treefbbd0979767c8dec080271d8fe0099c65452582e /plugins
parent42dbac2f1928a45c479ec91a7b8c57ddcef9c784 (diff)
downloadcdo-973c58e4c37dd772a32c2107e89c9c184a1ce81d.tar.gz
cdo-973c58e4c37dd772a32c2107e89c9c184a1ce81d.tar.xz
cdo-973c58e4c37dd772a32c2107e89c9c184a1ce81d.zip
[390808] Integrate CDO with EMF Compare
https://bugs.eclipse.org/bugs/show_bug.cgi?id=390808
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOCompareUtil.java12
1 files changed, 11 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOCompareUtil.java b/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOCompareUtil.java
index 7d134e97ee..361a401886 100644
--- a/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOCompareUtil.java
+++ b/plugins/org.eclipse.emf.cdo.compare/src/org/eclipse/emf/cdo/compare/CDOCompareUtil.java
@@ -28,6 +28,7 @@ import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.common.util.AbstractTreeIterator;
import org.eclipse.emf.common.util.BasicMonitor;
import org.eclipse.emf.common.util.Monitor;
import org.eclipse.emf.common.util.URI;
@@ -305,7 +306,16 @@ public final class CDOCompareUtil
public Iterator<? extends EObject> getChildren(EObject eObject)
{
- return Iterators.filter(eObject.eAllContents(), this);
+ return new AbstractTreeIterator<EObject>(eObject, false)
+ {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Iterator<EObject> getChildren(Object object)
+ {
+ return Iterators.filter(((EObject)object).eContents().iterator(), Minimal.this);
+ }
+ };
}
public boolean apply(EObject input)

Back to the top