Cleanup - utilize the new ExcludingIterator

Author: jisedlac

visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/java/impl/JavaFieldsPlugin.java

@@ -64,6 +64,7 @@
 import org.graalvm.visualvm.heapviewer.ui.TreeTableView;
 import org.graalvm.visualvm.heapviewer.ui.TreeTableViewColumn;
 import org.graalvm.visualvm.heapviewer.ui.UIThresholds;
+import org.graalvm.visualvm.heapviewer.utils.ExcludingIterator;
 import org.graalvm.visualvm.heapviewer.utils.NodesComputer;
 import org.graalvm.visualvm.heapviewer.utils.ProgressIterator;
 import org.graalvm.visualvm.heapviewer.utils.counters.InstanceCounter;
@@ -564,7 +565,7 @@ public boolean isLeaf() {
                     };
                 }
                 protected ProgressIterator<Instance> objectsIterator(int index, Progress progress) {
-                    Iterator<Instance> fieldInstanceIterator = new ExcludingInstancesIterator(instancesIterator()) {
+                    Iterator<Instance> fieldInstanceIterator = new ExcludingIterator<Instance>(instancesIterator()) {
                         @Override
                         protected boolean exclude(Instance instance) {
                             FieldValue value = getValueOfField(instance, fieldName);
@@ -670,7 +671,7 @@ public boolean isLeaf() {
                 }
                 protected ProgressIterator<Instance> objectsIterator(int index, Progress progress) {
                     final Instance _instance = getInstance();
-                    Iterator<Instance> fieldInstanceIterator = new ExcludingInstancesIterator(instancesIterator()) {
+                    Iterator<Instance> fieldInstanceIterator = new ExcludingIterator<Instance>(instancesIterator()) {
                         @Override
                         protected boolean exclude(Instance instance) {
                             FieldValue value = getValueOfField(instance, fieldName);
@@ -777,40 +778,6 @@ public String getShortName() {
 
     }
 
-    // copied from org.graalvm.visualvm.heapviewer.truffle.TruffleLanguageHeapFragment
-    // might become a public API in VisualVM-HeapViewer
-    protected static abstract class ExcludingInstancesIterator implements Iterator<Instance> {
-        private final Iterator<Instance> instancesIt;
-        private Instance next;
-
-        protected ExcludingInstancesIterator(Iterator<Instance> it) {
-            instancesIt = it;
-            computeNext();
-        }
-
-        @Override
-        public boolean hasNext() {
-            return next != null;
-        }
-
-        @Override
-        public Instance next() {
-            Instance ret = next;
-            computeNext();
-            return ret;
-        }
-
-        private void computeNext() {
-            while (instancesIt.hasNext()) {
-                next = instancesIt.next();
-                if (!exclude(next)) return;
-            }
-            next = null;
-        }
-
-        protected abstract boolean exclude(Instance instance);
-    }
-    
 
     @ServiceProvider(service=HeapViewerRenderer.Provider.class)
     public static class FieldsHistogramRendererProvider extends HeapViewerRenderer.Provider {

visualvm/heapviewer/src/org/graalvm/visualvm/heapviewer/java/impl/JavaReferencesPlugin.java

@@ -63,6 +63,7 @@
 import org.graalvm.visualvm.heapviewer.ui.TreeTableView;
 import org.graalvm.visualvm.heapviewer.ui.TreeTableViewColumn;
 import org.graalvm.visualvm.heapviewer.ui.UIThresholds;
+import org.graalvm.visualvm.heapviewer.utils.ExcludingIterator;
 import org.graalvm.visualvm.heapviewer.utils.NodesComputer;
 import org.graalvm.visualvm.heapviewer.utils.ProgressIterator;
 import org.graalvm.visualvm.lib.jfluid.heap.JavaClass;
@@ -380,7 +381,7 @@ protected HeapViewerNode createNode(Instance object) {
                 }
                 protected ProgressIterator<Instance> objectsIterator(int index, Progress _progress) {
                     final Instance _instance = getInstance();
-                    Iterator<Instance> fieldInstanceIterator = new ExcludingInstancesIterator(instancesIterator()) {
+                    Iterator<Instance> fieldInstanceIterator = new ExcludingIterator<Instance>(instancesIterator()) {
                         @Override
                         protected boolean exclude(Instance instance) {
                             List<Value> references = instance.getReferences();
@@ -505,41 +506,6 @@ private static Value getDirectReferrer(Instance instance) {
     }
 
 
-    // copied from org.graalvm.visualvm.heapviewer.truffle.TruffleLanguageHeapFragment
-    // might become a public API in VisualVM-HeapViewer
-    protected static abstract class ExcludingInstancesIterator implements Iterator<Instance> {
-        private final Iterator<Instance> instancesIt;
-        private Instance next;
-
-        protected ExcludingInstancesIterator(Iterator<Instance> it) {
-            instancesIt = it;
-            computeNext();
-        }
-
-        @Override
-        public boolean hasNext() {
-            return next != null;
-        }
-
-        @Override
-        public Instance next() {
-            Instance ret = next;
-            computeNext();
-            return ret;
-        }
-
-        private void computeNext() {
-            while (instancesIt.hasNext()) {
-                next = instancesIt.next();
-                if (!exclude(next)) return;
-            }
-            next = null;
-        }
-
-        protected abstract boolean exclude(Instance instance);
-    }
-    
-    
     @ServiceProvider(service=HeapViewerRenderer.Provider.class)
     public static class JavaReferencesRendererProvider extends HeapViewerRenderer.Provider {