svn commit: r1677309 - /pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/BookmarkValidationProcess.java

[tilman]

Author: tilman
Date: Sat May  2 11:38:21 2015
New Revision: 1677309

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

Modified:
    
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/BookmarkValidationProcess.java

Modified: 
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/BookmarkValidationProcess.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/BookmarkValidationProcess.java?rev=1677309&r1=1677308&r2=1677309&view=diff
==============================================================================
--- 
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/BookmarkValidationProcess.java
 (original)
+++ 
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/BookmarkValidationProcess.java
 Sat May  2 11:38:21 2015
@@ -56,7 +56,7 @@ public class BookmarkValidationProcess e
             PDDocumentOutline outlineHierarchy = catalog.getDocumentOutline();
             if (outlineHierarchy != null)
             {
-                COSDictionary dict = outlineHierarchy.getCOSDictionary();
+                COSDictionary dict = outlineHierarchy.getCOSObject();
                 if (!checkIndirectObjects(ctx, dict))
                 {
                     return;
@@ -138,7 +138,7 @@ public class BookmarkValidationProcess e
         {
             addValidationError(ctx, new 
ValidationError(ERROR_SYNTAX_TRAILER_OUTLINES_INVALID,
                     "The value of /Prev of first object " + firstObj + " on a 
level is " 
-                            + 
inputItem.getCOSDictionary().getItem(COSName.PREV) 
+                            + inputItem.getCOSObject().getItem(COSName.PREV) 
                             + ", but shouldn't exist"));
             result = false;
         }
@@ -150,7 +150,7 @@ public class BookmarkValidationProcess e
             {
                 result = false;
             }
-            currentObj = 
toCOSObject(currentItem.getCOSDictionary().getItem(COSName.NEXT));
+            currentObj = 
toCOSObject(currentItem.getCOSObject().getItem(COSName.NEXT));
             if (levelObjects.contains(currentObj))
             {
                 addValidationError(ctx, new 
ValidationError(ERROR_SYNTAX_TRAILER_OUTLINES_INVALID,
@@ -171,7 +171,7 @@ public class BookmarkValidationProcess e
             }
             else 
             {
-                COSObject prevObject = 
toCOSObject(currentItem.getCOSDictionary().getItem(COSName.PREV));
+                COSObject prevObject = 
toCOSObject(currentItem.getCOSObject().getItem(COSName.PREV));
                 if (!realPrevObject.equals(prevObject))
                 {
                     addValidationError(ctx, new 
ValidationError(ERROR_SYNTAX_TRAILER_OUTLINES_INVALID,
@@ -200,7 +200,7 @@ public class BookmarkValidationProcess e
         // Dest entry isn't permitted if the A entry is present
         // A entry isn't permitted if the Dest entry is present
         // If the A entry is present, the referenced actions is validated
-        COSDictionary dictionary = inputItem.getCOSDictionary();
+        COSDictionary dictionary = inputItem.getCOSObject();
         COSBase dest = dictionary.getItem(COSName.DEST);
         COSBase action = dictionary.getItem(COSName.A);
         
@@ -228,7 +228,7 @@ public class BookmarkValidationProcess e
         PDOutlineItem fChild = inputItem.getFirstChild();
         if (fChild != null)
         {
-            if (!isCountEntryPresent(inputItem.getCOSDictionary()))
+            if (!isCountEntryPresent(inputItem.getCOSObject()))
             {
                 addValidationError(ctx, new 
ValidationError(ERROR_SYNTAX_TRAILER_OUTLINES_INVALID,
                         "Outline item doesn't have Count entry but has at 
least one descendant"));