Merge pull request #623 from veraPDF/tree_iterators

Fix iterators for NameTree and NumberTree

src/main/java/org/verapdf/pd/PDNameTreeNode.java

@@ -26,7 +26,6 @@
 import org.verapdf.cos.COSObjType;
 import org.verapdf.cos.COSObject;
 import org.verapdf.exceptions.LoopedException;
-import org.verapdf.pd.structure.NameTreeIterator;
 
 import java.util.*;
 
@@ -165,14 +164,22 @@ private COSObject getObject(String key, Set<COSKey> visitedKeys) {
 		return null;
 	}
 
+	private List<COSObject> getObjects() {
+		List<COSObject> result = new LinkedList<>(getNames().values());
+		for (PDNameTreeNode kid : getKids()) {
+			result.addAll(kid.getObjects());
+		}
+		return result;
+	}
+
 	@Override
-	public NameTreeIterator iterator() {
-		return new NameTreeIterator(this);
+	public Iterator<COSObject> iterator() {
+		return getObjects().iterator();
 	}
 
 	public Long size() {
 		long i = 0;
-		NameTreeIterator iterator = iterator();
+		Iterator<COSObject> iterator = iterator();
 		for (; iterator.hasNext(); i++) {
 			iterator.next();
 		}

src/main/java/org/verapdf/pd/structure/PDNumberTreeNode.java

@@ -100,6 +100,14 @@ public Map<Long, COSObject> getNums() {
         return Collections.emptyMap();
     }
 
+    private List<COSObject> getObjects() {
+        List<COSObject> result = new LinkedList<>(getNums().values());
+        for (PDNumberTreeNode kid : getKids()) {
+            result.addAll(kid.getObjects());
+        }
+        return result;
+    }
+
     /**
      * Gets object with given key from this node and it's kids recursively.
      *
@@ -157,13 +165,13 @@ private COSObject getObject(Long key, Set<COSKey> visitedKeys) {
     }
 
     @Override
-    public NumberTreeIterator iterator() {
-        return new NumberTreeIterator(this);
+    public Iterator<COSObject> iterator() {
+        return getObjects().iterator();
     }
 
     public Long size() {
         long i = 0;
-        NumberTreeIterator iterator = iterator();
+        Iterator<COSObject> iterator = iterator();
         for (; iterator.hasNext(); i++) {
             iterator.next();
         }