You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2015/05/07 19:26:04 UTC

svn commit: r1678241 - in /pdfbox/trunk: pdfbox/src/main/java/org/apache/pdfbox/multipdf/ pdfbox/src/main/java/org/apache/pdfbox/pdmodel/ pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/visible/ pdfbox/src/main/java/org/apac...

Author: tilman
Date: Thu May  7 17:26:03 2015
New Revision: 1678241

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

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
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/visible/PDVisibleSigBuilder.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroForm.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDFieldTreeNode.java
    pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/AcroFormValidationProcess.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=1678241&r1=1678240&r2=1678241&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 May  7 17:26:03 2015
@@ -278,7 +278,7 @@ public class PDFMergerUtility
             if (destAcroForm == null && srcAcroForm != null)
             {
                 destCatalog.getCOSObject().setItem(COSName.ACRO_FORM,
-                        cloner.cloneForNewDocument(srcAcroForm.getDictionary()));       
+                        cloner.cloneForNewDocument(srcAcroForm.getCOSObject()));       
                 
             }
             else

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=1678241&r1=1678240&r2=1678241&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 Thu May  7 17:26:03 2015
@@ -211,7 +211,7 @@ public class PDDocument implements Close
         }
         else
         {
-            acroForm.getDictionary().setNeedToBeUpdated(true);
+            acroForm.getCOSObject().setNeedToBeUpdated(true);
         }
 
         // For invisible signatures, the annotation has a rectangle array with values [ 0 0 0 0 ]. This annotation is
@@ -236,7 +236,7 @@ public class PDDocument implements Close
 
         // Set the AcroForm Fields
         List<PDFieldTreeNode> acroFormFields = acroForm.getFields();
-        acroForm.getDictionary().setDirect(true);
+        acroForm.getCOSObject().setDirect(true);
         acroForm.setSignaturesExist(true);
         acroForm.setAppendOnly(true);
 
@@ -386,7 +386,7 @@ public class PDDocument implements Close
         {
             dr.setDirect(true);
             dr.setNeedToBeUpdated(true);
-            COSDictionary acroFormDict = acroForm.getDictionary();
+            COSDictionary acroFormDict = acroForm.getCOSObject();
             acroFormDict.setItem(COSName.DR, dr);
         }
     }
@@ -434,7 +434,7 @@ public class PDDocument implements Close
             acroForm = new PDAcroForm(this);
             catalog.setAcroForm(acroForm);
         }
-        COSDictionary acroFormDict = acroForm.getDictionary();
+        COSDictionary acroFormDict = acroForm.getCOSObject();
         acroFormDict.setDirect(true);
         acroFormDict.setNeedToBeUpdated(true);
         if (!acroForm.isSignaturesExist())

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/visible/PDVisibleSigBuilder.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/visible/PDVisibleSigBuilder.java?rev=1678241&r1=1678240&r2=1678241&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/visible/PDVisibleSigBuilder.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/visible/PDVisibleSigBuilder.java Thu May  7 17:26:03 2015
@@ -119,7 +119,7 @@ public class PDVisibleSigBuilder impleme
     {
         @SuppressWarnings("unchecked")
         List<PDFieldTreeNode> acroFormFields = acroForm.getFields();
-        COSDictionary acroFormDict = acroForm.getDictionary();
+        COSDictionary acroFormDict = acroForm.getCOSObject();
         acroForm.setSignaturesExist(true);
         acroForm.setAppendOnly(true);
         acroFormDict.setDirect(true);

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroForm.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroForm.java?rev=1678241&r1=1678240&r2=1678241&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroForm.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroForm.java Thu May  7 17:26:03 2015
@@ -49,8 +49,8 @@ public final class PDAcroForm implements
     private static final int FLAG_SIGNATURES_EXIST = 1;
     private static final int FLAG_APPEND_ONLY = 1 << 1;
     
-    private COSDictionary acroForm;
-    private PDDocument document;
+    private final COSDictionary acroForm;
+    private final PDDocument document;
 
     private Map<String,PDFieldTreeNode> fieldCache;
 
@@ -94,7 +94,8 @@ public final class PDAcroForm implements
      *
      * @return The dictionary for this form.
      */
-    public COSDictionary getDictionary()
+    @Override
+    public COSDictionary getCOSObject()
     {
         return acroForm;
     }
@@ -325,7 +326,7 @@ public final class PDAcroForm implements
      */
     public String getDefaultAppearance()
     {
-        COSString defaultAppearance = (COSString) getDictionary().getItem(COSName.DA);
+        COSString defaultAppearance = (COSString) getCOSObject().getItem(COSName.DA);
         return defaultAppearance.getString();
     }
 
@@ -338,11 +339,11 @@ public final class PDAcroForm implements
     {
         if (daValue != null)
         {
-            getDictionary().setString(COSName.DA, daValue);
+            getCOSObject().setString(COSName.DA, daValue);
         }
         else
         {
-            getDictionary().removeItem(COSName.DA);
+            getCOSObject().removeItem(COSName.DA);
         }
     }
 
@@ -353,7 +354,7 @@ public final class PDAcroForm implements
      */
     public boolean isNeedAppearances()
     {
-        return getDictionary().getBoolean(COSName.NEED_APPEARANCES, false);
+        return getCOSObject().getBoolean(COSName.NEED_APPEARANCES, false);
     }
 
     /**
@@ -365,11 +366,11 @@ public final class PDAcroForm implements
     {
         if (value != null)
         {
-            getDictionary().setBoolean(COSName.NEED_APPEARANCES, value);
+            getCOSObject().setBoolean(COSName.NEED_APPEARANCES, value);
         }
         else
         {
-            getDictionary().removeItem(COSName.NEED_APPEARANCES);
+            getCOSObject().removeItem(COSName.NEED_APPEARANCES);
         }
     }
     
@@ -404,12 +405,6 @@ public final class PDAcroForm implements
         acroForm.setItem( COSName.DR, drDict );
     }
 
-    @Override
-    public COSBase getCOSObject()
-    {
-        return acroForm;
-    }
-
     /**
      * This will tell if the AcroForm has XFA content.
      *
@@ -469,7 +464,7 @@ public final class PDAcroForm implements
     public int getQ()
     {
         int retval = 0;
-        COSNumber number = (COSNumber)getDictionary().getDictionaryObject( COSName.Q );
+        COSNumber number = (COSNumber)getCOSObject().getDictionaryObject( COSName.Q );
         if( number != null )
         {
             retval = number.intValue();
@@ -484,7 +479,7 @@ public final class PDAcroForm implements
      */
     public void setQ( int q )
     {
-        getDictionary().setInt( COSName.Q, q );
+        getCOSObject().setInt( COSName.Q, q );
     }
 
     /**
@@ -494,7 +489,7 @@ public final class PDAcroForm implements
      */
     public boolean isSignaturesExist()
     {
-        return getDictionary().getFlag( COSName.SIG_FLAGS, FLAG_SIGNATURES_EXIST );
+        return getCOSObject().getFlag( COSName.SIG_FLAGS, FLAG_SIGNATURES_EXIST );
     }
 
     /**
@@ -504,7 +499,7 @@ public final class PDAcroForm implements
      */
     public void setSignaturesExist( boolean signaturesExist )
     {
-        getDictionary().setFlag( COSName.SIG_FLAGS, FLAG_SIGNATURES_EXIST, signaturesExist );
+        getCOSObject().setFlag( COSName.SIG_FLAGS, FLAG_SIGNATURES_EXIST, signaturesExist );
     }
 
     /**
@@ -514,7 +509,7 @@ public final class PDAcroForm implements
      */
     public boolean isAppendOnly()
     {
-        return getDictionary().getFlag( COSName.SIG_FLAGS, FLAG_APPEND_ONLY );
+        return getCOSObject().getFlag( COSName.SIG_FLAGS, FLAG_APPEND_ONLY );
     }
 
     /**
@@ -524,6 +519,6 @@ public final class PDAcroForm implements
      */
     public void setAppendOnly( boolean appendOnly )
     {
-        getDictionary().setFlag( COSName.SIG_FLAGS, FLAG_APPEND_ONLY, appendOnly );
+        getCOSObject().setFlag( COSName.SIG_FLAGS, FLAG_APPEND_ONLY, appendOnly );
     }
 }

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDFieldTreeNode.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDFieldTreeNode.java?rev=1678241&r1=1678240&r2=1678241&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDFieldTreeNode.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDFieldTreeNode.java Thu May  7 17:26:03 2015
@@ -126,11 +126,11 @@ public abstract class PDFieldTreeNode im
         PDFieldTreeNode attributesNode = getInheritableAttributesNode(this,key);
         if (attributesNode != null)
         {
-            return attributesNode.getDictionary().getDictionaryObject(key);
+            return attributesNode.getCOSObject().getDictionaryObject(key);
         }
         else
         {
-            return getAcroForm().getDictionary().getDictionaryObject(key);
+            return getAcroForm().getCOSObject().getDictionaryObject(key);
         }
     }    
     

Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/AcroFormValidationProcess.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/AcroFormValidationProcess.java?rev=1678241&r1=1678240&r2=1678241&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/AcroFormValidationProcess.java (original)
+++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/AcroFormValidationProcess.java Thu May  7 17:26:03 2015
@@ -83,7 +83,7 @@ public class AcroFormValidationProcess e
      */
     protected void checkNeedAppearences(PreflightContext ctx, PDAcroForm acroForm)
     {
-        if (acroForm.getDictionary().getBoolean(ACROFORM_DICTIONARY_KEY_NEED_APPEARANCES, false))
+        if (acroForm.getCOSObject().getBoolean(ACROFORM_DICTIONARY_KEY_NEED_APPEARANCES, false))
         {
             addValidationError(ctx, new ValidationError(ERROR_SYNTAX_DICT_INVALID,
                     "NeedAppearance is present with the value \"true\""));