PdfArrayDirectIterator: separate class

DEVSIX-828

Author: pavel-alay

kernel/src/main/java/com/itextpdf/kernel/pdf/PdfArray.java

@@ -208,7 +208,7 @@ public boolean contains(PdfObject o) {
      * @return an Iterator.
      */
     public Iterator<PdfObject> iterator() {
-        return new PdfArrayDirectIterator();
+        return new PdfArrayDirectIterator(list.iterator());
     }
 
     /**
@@ -218,7 +218,7 @@ public Iterator<PdfObject> iterator() {
      */
     @Deprecated
     public Iterator<PdfObject> directIterator() {
-        return new PdfArrayDirectIterator();
+        return new PdfArrayDirectIterator(list.iterator());
     }
 
     public void add(PdfObject pdfObject) {
@@ -558,27 +558,4 @@ protected void copyContent(PdfObject from, PdfDocument document) {
     protected void releaseContent() {
         list = null;
     }
-
-    private class PdfArrayDirectIterator implements Iterator<PdfObject> {
-        Iterator<PdfObject> parentIterator = list.iterator();
-
-        @Override
-        public boolean hasNext() {
-            return parentIterator.hasNext();
-        }
-
-        @Override
-        public PdfObject next() {
-            PdfObject obj = parentIterator.next();
-            if (obj.isIndirectReference()) {
-                obj = ((PdfIndirectReference) obj).getRefersTo(true);
-            }
-            return obj;
-        }
-
-        @Override
-        public void remove() {
-            parentIterator.remove();
-        }
-    }
 }

kernel/src/main/java/com/itextpdf/kernel/pdf/PdfArrayDirectIterator.java

@@ -0,0 +1,31 @@
+package com.itextpdf.kernel.pdf;
+
+import java.util.Iterator;
+
+class PdfArrayDirectIterator implements Iterator<PdfObject> {
+    Iterator<PdfObject> array;
+
+    PdfArrayDirectIterator(Iterator<PdfObject> array) {
+        this.array = array;
+    }
+
+    @Override
+    public boolean hasNext() {
+        return array.hasNext();
+    }
+
+    @Override
+    public PdfObject next() {
+        PdfObject obj = array.next();
+        if (obj.isIndirectReference()) {
+            obj = ((PdfIndirectReference) obj).getRefersTo(true);
+        }
+        return obj;
+    }
+
+    @Override
+    public void remove() {
+        array.remove();
+    }
+}
+