svn commit: r1677640 - in /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox: multipdf/PDFMergerUtility.java pdmodel/PDDocument.java

[tilman]

Author: tilman
Date: Mon May  4 17:40:44 2015
New Revision: 1677640

URL: http://svn.apache.org/r1677640
Log:
PDFBOX-2783: Use getCOSObject() instead of getCOSDictionary()

Modified:
    
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocument.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=1677640&r1=1677639&r2=1677640&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
 Mon May  4 17:40:44 2015
@@ -530,7 +530,7 @@ public class PDFMergerUtility
             {
                 PDFieldTreeNode srcField = srcFieldsIterator.next();
                 PDFieldTreeNode destFieldNode = 
PDFieldTreeNode.createField(destAcroForm,
-                        (COSDictionary) 
cloner.cloneForNewDocument(srcField.getDictionary()), null);
+                        (COSDictionary) 
cloner.cloneForNewDocument(srcField.getCOSObject()), null);
                 // if the form already has a field with this name then we need 
to rename this field
                 // to prevent merge conflicts.
                 if 
(destAcroForm.getField(destFieldNode.getFullyQualifiedName()) != null)

Modified: 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocument.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocument.java?rev=1677640&r1=1677639&r2=1677640&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocument.java 
(original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocument.java 
Mon May  4 17:40:44 2015
@@ -306,7 +306,7 @@ public class PDDocument implements Close
                     && 
field.getCOSObject().equals(signatureField.getCOSObject()))
             {
                 checkFields = true;
-                signatureField.getDictionary().setNeedToBeUpdated(true);
+                signatureField.getCOSObject().setNeedToBeUpdated(true);
                 break;
             }
         }
@@ -447,7 +447,7 @@ public class PDDocument implements Close
 
         for (PDSignatureField sigField : sigFields)
         {
-            sigField.getDictionary().setNeedToBeUpdated(true);
+            sigField.getCOSObject().setNeedToBeUpdated(true);
             
             // Check if the field already exists
             checkSignatureField(acroformFields, sigField);
@@ -455,7 +455,7 @@ public class PDDocument implements Close
             // Check if we need to add a signature
             if (sigField.getSignature() != null)
             {
-                sigField.getDictionary().setNeedToBeUpdated(true);
+                sigField.getCOSObject().setNeedToBeUpdated(true);
                 if (options == null)
                 {
                     // TODO ??