Use filter in during the iteration whenever the iterator implements the

Filterable interface.

Author: rubenporras

com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/persistence/ProxyAwareSerializationConversionContext.java

@@ -19,6 +19,7 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.util.EContentsEList.FeatureIterator;
+import org.eclipse.emf.ecore.util.EContentsEList.Filterable;
 import org.eclipse.xtext.nodemodel.serialization.SerializationConversionContext;
 import org.eclipse.xtext.resource.XtextResource;
 
@@ -80,10 +81,19 @@ static void fillIdToEObjectMap(final Resource resource, final List<EObject> map)
   static void fillIdToEObjectMap(final EObject eObject, final List<EObject> map) {
     map.add(eObject);
 
-    for (FeatureIterator<EObject> it = (FeatureIterator<EObject>) eObject.eContents().iterator(); it.hasNext();) {
-      EObject child = it.next();
-      if (!it.feature().isTransient()) {
-        fillIdToEObjectMap(child, map);
+    FeatureIterator<EObject> iterator = (FeatureIterator<EObject>) eObject.eContents().iterator();
+    if (iterator instanceof Filterable filterable) {
+      filterable.filter(f -> !f.isTransient());
+      for (FeatureIterator<EObject> it = iterator; it.hasNext();) {
+        fillIdToEObjectMap(it.next(), map);
+      }
+    } else {
+      // post-filter the iterator, which is extra work
+      for (FeatureIterator<EObject> it = iterator; it.hasNext();) {
+        EObject child = it.next();
+        if (!it.feature().isTransient()) {
+          fillIdToEObjectMap(child, map);
+        }
       }
     }
   }

com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/persistence/ProxyCompositeNode.java

@@ -23,6 +23,7 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.util.EContentsEList.FeatureIterator;
+import org.eclipse.emf.ecore.util.EContentsEList.Filterable;
 import org.eclipse.xtext.nodemodel.BidiIterable;
 import org.eclipse.xtext.nodemodel.BidiTreeIterable;
 import org.eclipse.xtext.nodemodel.BidiTreeIterator;
@@ -91,10 +92,19 @@ private static ProxyCompositeNode installProxyNodeModel(final EObject eObject, f
     eObject.eAdapters().add(result);
     map.add(eObject);
 
-    for (FeatureIterator<EObject> it = (FeatureIterator<EObject>) eObject.eContents().iterator(); it.hasNext();) {
-      EObject child = it.next();
-      if (!it.feature().isTransient()) {
-        installProxyNodeModel(child, map);
+    FeatureIterator<EObject> iterator = (FeatureIterator<EObject>) eObject.eContents().iterator();
+    if (iterator instanceof Filterable filterable) {
+      filterable.filter(f -> !f.isTransient());
+      for (FeatureIterator<EObject> it = iterator; it.hasNext();) {
+        installProxyNodeModel(it.next(), map);
+      }
+    } else {
+      // post-filter the iterator, which is extra work
+      for (FeatureIterator<EObject> it = iterator; it.hasNext();) {
+        EObject child = it.next();
+        if (!it.feature().isTransient()) {
+          installProxyNodeModel(child, map);
+        }
       }
     }
     return result;