pdfbox-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From msahy...@apache.org
Subject svn commit: r1855539 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java
Date Thu, 14 Mar 2019 16:58:59 GMT
Author: msahyoun
Date: Thu Mar 14 16:58:59 2019
New Revision: 1855539

URL: http://svn.apache.org/viewvc?rev=1855539&view=rev
Log:
PDFBOX-4487: add missing getter for DocumentMergeMode; move method declaration for AcroFormMergeMode
up

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java?rev=1855539&r1=1855538&r2=1855539&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java Thu
Mar 14 16:58:59 2019
@@ -143,9 +143,29 @@ public class PDFMergerUtility
     {
         sources = new ArrayList<>();
     }
+
+    /**
+     * Get the merge mode to be used for merging AcroForms between documents
+     * 
+     * {@link AcroFormMergeMode}
+     */
+    public AcroFormMergeMode getAcroFormMergeMode()
+    {
+        return acroFormMergeMode;
+    }
+
+    /**
+     * Set the merge mode to be used for merging AcroForms between documents
+     * 
+     * {@link AcroFormMergeMode}
+     */
+    public void setAcroFormMergeMode(AcroFormMergeMode theAcroFormMergeMode)
+    {
+        this.acroFormMergeMode = theAcroFormMergeMode;
+    }
     
     /**
-     * Get the mode to be used for merging the documents
+     * Get the merge mode to be used for merging documents
      * 
      * {@link DocumentMergeMode}
      */
@@ -153,6 +173,17 @@ public class PDFMergerUtility
     {
         return documentMergeMode;
     }
+
+    /**
+     * Set the merge mode to be used for merging documents
+     * 
+     * {@link DocumentMergeMode}
+     */
+    public void setDocumentMergeMode(DocumentMergeMode theDocumentMergeMode)
+    {
+        this.documentMergeMode = theDocumentMergeMode;
+    }
+
     
     /**
      * Set the mode to be used for merging the documents
@@ -1241,26 +1272,6 @@ public class PDFMergerUtility
     }
 
     /**
-     * Get the merge mode to be used for merging AcroForms between documents
-     * 
-     * {@link AcroFormMergeMode}
-     */
-    public AcroFormMergeMode getAcroFormMergeMode()
-    {
-        return acroFormMergeMode;
-    }
-    
-    /**
-     * Set the merge mode to be used for merging AcroForms between documents
-     * 
-     * {@link AcroFormMergeMode}
-     */
-    public void setAcroFormMergeMode(AcroFormMergeMode theAcroFormMergeMode)
-    {
-        this.acroFormMergeMode = theAcroFormMergeMode;
-    }
-
-    /**
      * Update the Pg and Obj references to the new (merged) page.
      */
     private void updatePageReferences(PDFCloneUtility cloner,



Mime
View raw message