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 08:40:04 UTC

svn commit: r1678135 - in /pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process: AcroFormValidationProcess.java reflect/SinglePageValidationProcess.java

Author: tilman
Date: Thu May  7 06:40:03 2015
New Revision: 1678135

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

Modified:
    pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/AcroFormValidationProcess.java
    pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/SinglePageValidationProcess.java

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=1678135&r1=1678134&r2=1678135&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 06:40:03 2015
@@ -117,7 +117,7 @@ public class AcroFormValidationProcess e
                 else if (obj instanceof PDAnnotationWidget)
                 {
                     // "A field's children in the hierarchy may also include widget annotations"
-                    ContextHelper.validateElement(ctx, ((PDAnnotationWidget) obj).getDictionary(), ANNOTATIONS_PROCESS);
+                    ContextHelper.validateElement(ctx, ((PDAnnotationWidget) obj).getCOSObject(), ANNOTATIONS_PROCESS);
                 }
                 else
                 {
@@ -158,8 +158,8 @@ public class AcroFormValidationProcess e
         PDAnnotationWidget widget = aField.getWidget();
         if (res && widget != null)
         {
-            ContextHelper.validateElement(ctx, widget.getDictionary(), ANNOTATIONS_PROCESS);
-            COSBase act = widget.getDictionary().getDictionaryObject(COSName.A);
+            ContextHelper.validateElement(ctx, widget.getCOSObject(), ANNOTATIONS_PROCESS);
+            COSBase act = widget.getCOSObject().getDictionaryObject(COSName.A);
             if (act != null)
             {
                 addValidationError(ctx, new ValidationError(ERROR_ACTION_FORBIDDEN_WIDGET_ACTION_FIELD,

Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/SinglePageValidationProcess.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/SinglePageValidationProcess.java?rev=1678135&r1=1678134&r2=1678135&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/SinglePageValidationProcess.java (original)
+++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/SinglePageValidationProcess.java Thu May  7 06:40:03 2015
@@ -204,7 +204,7 @@ public class SinglePageValidationProcess
             {
                 if (object instanceof PDAnnotation)
                 {
-                    COSDictionary cosAnnot = ((PDAnnotation) object).getDictionary();
+                    COSDictionary cosAnnot = ((PDAnnotation) object).getCOSObject();
                     ContextHelper.validateElement(context, cosAnnot, ANNOTATIONS_PROCESS);
                 }
             }