FOP-3122 Copy bookmarks

Author: joao12021996

fop-core/src/main/java/org/apache/fop/pdf/PDFDocument.java

@@ -27,7 +27,6 @@
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
@@ -1043,26 +1042,30 @@ public PDFReference resolveExtensionReference(String id) {
      * @throws IOException if there is an exception writing to the output stream
      */
     public void output(OutputStream stream) throws IOException {
+        output(stream, objects);
+    }
+
+    private void output(OutputStream stream, List<? extends PDFObject> objs) throws IOException {
         outputStarted = true;
         //Write out objects until the list is empty. This approach (used with a
         //LinkedList) allows for output() methods to create and register objects
         //on the fly even during serialization.
 
         if (objectStreamsEnabled) {
-            List<PDFObject> indirectObjects = new ArrayList<>();
-            while (objects.size() > 0) {
-                PDFObject object = objects.remove(0);
+            List indirectObjects = new ArrayList<>();
+            while (!objs.isEmpty()) {
+                PDFObject object = objs.remove(0);
                 if (object.supportsObjectStream()) {
                     addToObjectStream(object);
                 } else {
                     indirectObjects.add(object);
                 }
             }
-            objects.addAll(indirectObjects);
+            objs.addAll(indirectObjects);
         }
 
-        while (objects.size() > 0) {
-            PDFObject object = objects.remove(0);
+        while (!objs.isEmpty()) {
+            PDFObject object = objs.remove(0);
             streamIndirectObject(object, stream);
         }
     }
@@ -1099,13 +1102,6 @@ protected int streamIndirectObject(PDFObject o, OutputStream stream) throws IOEx
         return len;
     }
 
-    private void streamIndirectObjects(Collection<? extends PDFObject> objects, OutputStream stream)
-            throws IOException {
-        for (PDFObject o : objects) {
-            streamIndirectObject(o, stream);
-        }
-    }
-
     private void recordObjectOffset(PDFObject object) {
         int index = object.getObjectNumber().getNumber() - 1;
         while (indirectObjectOffsets.size() <= index) {
@@ -1174,6 +1170,7 @@ public void outputHeader(OutputStream stream) throws IOException {
     public void outputTrailer(OutputStream stream) throws IOException {
         createDestinations();
         output(stream);
+        objects = trailerObjects;
         outputTrailerObjectsAndXref(stream);
     }
 
@@ -1203,7 +1200,7 @@ private void outputTrailerObjectsAndXref(OutputStream stream) throws IOException
             }
             trailerOutputHelper.outputStructureTreeElements(stream);
         }
-        streamIndirectObjects(trailerObjects, stream);
+        output(stream, trailerObjects);
         TrailerDictionary trailerDictionary = createTrailerDictionary(true);
         long startxref = trailerOutputHelper.outputCrossReferenceObject(stream, trailerDictionary, 0,
                 indirectObjectOffsets.size(), indirectObjectOffsets.size());
@@ -1267,7 +1264,7 @@ private class UncompressedTrailerOutputHelper implements TrailerOutputHelper {
 
         public void outputStructureTreeElements(OutputStream stream)
                 throws IOException {
-            streamIndirectObjects(structureTreeElements, stream);
+            output(stream, structureTreeElements);
         }
 
         public long outputCrossReferenceObject(OutputStream stream,

fop-core/src/test/java/org/apache/fop/pdf/PDFObjectStreamTestCase.java

@@ -37,16 +37,16 @@ public class PDFObjectStreamTestCase {
     public void testObjectStreamsEnabled() throws IOException {
         PDFDocument doc = new PDFDocument("");
         String out = buildObjectStreamsPDF(doc);
-        Assert.assertTrue(out, out.contains("<<\n  /Type /ObjStm\n  /N 3\n  /First 15\n  /Length 260\n>>\n"
-                + "stream\n8 0\n9 52\n4 121\n<<\n/Producer"));
+        Assert.assertTrue(out, out.contains("<<\n  /Type /ObjStm\n  /N 6\n  /First 33\n  /Length 446\n>>\n"
+                + "stream\n4 0\n5 52\n6 121\n7 245\n8 287\n9 344\n<<\n/Producer"));
     }
 
     @Test
     public void testObjectStreamsWithEncryption() throws IOException {
         PDFDocument doc = new PDFDocument("");
         doc.setEncryption(new PDFEncryptionParams());
         String out = buildObjectStreamsPDF(doc);
-        Assert.assertTrue(out, out.contains("<<\n  /Type /ObjStm\n  /N 3\n  /First 16\n  /Length"));
+        Assert.assertTrue(out, out.contains("<<\n  /Type /ObjStm\n  /N 5\n  /First 28\n  /Length"));
     }
 
     private String buildObjectStreamsPDF(PDFDocument doc) throws IOException {