Make collections iteration order independent of Java version. Fix Pdf…

…CopyTest
itext · Dec 30, 2015 · 13d42c2 · 13d42c2
1 parent de29899
commit 13d42c2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/itext/src/main/java/com/itextpdf/text/pdf/PdfCopy.java b/itext/src/main/java/com/itextpdf/text/pdf/PdfCopy.java
@@ -119,7 +119,7 @@ protected Counter getCounter() {
     //remember to avoid coping
     protected PRIndirectReference structTreeRootReference;
     //to remove unused objects
-    protected HashMap<RefKey, PdfIndirectObject> indirectObjects;
+    protected LinkedHashMap<RefKey, PdfIndirectObject> indirectObjects;
     //PdfIndirectObjects, that generate PdfWriter.addToBody(PdfObject) method, already saved to PdfBody
     protected ArrayList<PdfIndirectObject> savedObjects;
     //imported pages from getImportedPage(PdfReader, int, boolean)
@@ -191,7 +191,7 @@ public PdfCopy(Document document, OutputStream os) throws DocumentException {
         parentObjects = new HashMap<PdfObject, PdfObject>();
         disableIndirects = new HashSet<PdfObject>();
 
-        indirectObjects = new HashMap<RefKey, PdfIndirectObject>();
+        indirectObjects = new LinkedHashMap<RefKey, PdfIndirectObject>();
         savedObjects = new ArrayList<PdfIndirectObject>();
         importedPages = new ArrayList<ImportedPage>();
     }

diff --git a/itext/src/main/java/com/itextpdf/text/pdf/PdfDictionary.java b/itext/src/main/java/com/itextpdf/text/pdf/PdfDictionary.java
@@ -48,7 +48,7 @@
 
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map.Entry;
 import java.util.Set;
 
@@ -99,7 +99,7 @@ public class PdfDictionary extends PdfObject {
     private PdfName dictionaryType = null;
 
     /** This is the hashmap that contains all the values and keys of the dictionary */
-    protected HashMap<PdfName, PdfObject> hashMap;
+    protected LinkedHashMap<PdfName, PdfObject> hashMap;
 
     // CONSTRUCTORS
 
@@ -108,12 +108,12 @@ public class PdfDictionary extends PdfObject {
      */
     public PdfDictionary() {
         super(DICTIONARY);
-        hashMap = new HashMap<PdfName, PdfObject>();
+        hashMap = new LinkedHashMap<PdfName, PdfObject>();
     }
 
     public PdfDictionary(int capacity) {
         super(DICTIONARY);
-        hashMap = new HashMap<PdfName, PdfObject>(capacity);
+        hashMap = new LinkedHashMap<PdfName, PdfObject>(capacity);
     }
 
     /**

diff --git a/itext/src/test/java/com/itextpdf/text/pdf/PdfCopyTest.java b/itext/src/test/java/com/itextpdf/text/pdf/PdfCopyTest.java
@@ -537,11 +537,11 @@ public void copySignedDocuments() throws IOException, DocumentException {
         pdfDocument.close();
 
         PdfReader reader = new PdfReader("./target/com/itextpdf/test/pdf/PdfCopyTest/CopySignedDocuments.pdf");
-        PdfDictionary sig = (PdfDictionary)reader.getPdfObject(5);
+        PdfDictionary sig = (PdfDictionary)reader.getPdfObject(9);
         PdfDictionary sigRef = sig.getAsArray(PdfName.REFERENCE).getAsDict(0);
         Assert.assertTrue(PdfName.SIGREF.equals(sigRef.getAsName(PdfName.TYPE)));
         Assert.assertFalse(sigRef.contains(PdfName.DATA));
-        sig = (PdfDictionary)reader.getPdfObject(17);
+        sig = (PdfDictionary)reader.getPdfObject(21);
         sigRef = sig.getAsArray(PdfName.REFERENCE).getAsDict(0);
         Assert.assertTrue(PdfName.SIGREF.equals(sigRef.getAsName(PdfName.TYPE)));
         Assert.assertFalse(sigRef.contains(PdfName.DATA));
@@ -566,7 +566,7 @@ public void smartCopySignedDocuments() throws IOException, DocumentException {
         pdfDocument.close();
 
         PdfReader reader = new PdfReader("./target/com/itextpdf/test/pdf/PdfCopyTest/SmartCopySignedDocuments.pdf");
-        PdfDictionary sig = (PdfDictionary)reader.getPdfObject(5);
+        PdfDictionary sig = (PdfDictionary)reader.getPdfObject(8);
         PdfDictionary sigRef = sig.getAsArray(PdfName.REFERENCE).getAsDict(0);
         Assert.assertTrue(PdfName.SIGREF.equals(sigRef.getAsName(PdfName.TYPE)));
         Assert.assertFalse(sigRef.contains(PdfName.DATA));