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 2014/03/30 23:36:49 UTC
svn commit: r1583204 - in /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive: annotation/PDAnnotationPopup.java documentnavigation/destination/PDPageDestination.java documentnavigation/outline/PDOutlineNode.java

Author: tilman
Date: Sun Mar 30 21:36:49 2014
New Revision: 1583204

URL: http://svn.apache.org/r1583204
Log:
PDFBOX-2002: replaced deprecated getDictionaryObject() call with the current one

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationPopup.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/documentnavigation/destination/PDPageDestination.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/documentnavigation/outline/PDOutlineNode.java

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationPopup.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationPopup.java?rev=1583204&r1=1583203&r2=1583204&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationPopup.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationPopup.java Sun Mar 30 21:36:49 2014
@@ -101,8 +101,8 @@ public class PDAnnotationPopup extends P
         PDAnnotationMarkup am = null;
         try
         {
-            am = (PDAnnotationMarkup)
-                PDAnnotation.createAnnotation( getDictionary().getDictionaryObject( "Parent", "P" ) );
+            am = (PDAnnotationMarkup) PDAnnotation.createAnnotation(
+                    getDictionary().getDictionaryObject(COSName.PARENT, COSName.P));
         }
         catch (IOException ioe)
         {

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/documentnavigation/destination/PDPageDestination.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/documentnavigation/destination/PDPageDestination.java?rev=1583204&r1=1583203&r2=1583204&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/documentnavigation/destination/PDPageDestination.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/documentnavigation/destination/PDPageDestination.java Sun Mar 30 21:36:49 2014
@@ -22,6 +22,7 @@ import java.util.List;
 import org.apache.pdfbox.cos.COSArray;
 import org.apache.pdfbox.cos.COSBase;
 import org.apache.pdfbox.cos.COSDictionary;
+import org.apache.pdfbox.cos.COSName;
 import org.apache.pdfbox.cos.COSNumber;
 
 import org.apache.pdfbox.pdmodel.PDPage;
@@ -133,8 +134,9 @@ public abstract class PDPageDestination 
             else if (page instanceof COSDictionary)
             {
                 COSBase parent = page;
-                while (((COSDictionary) parent).getDictionaryObject("Parent", "P") != null) {
-                    parent = ((COSDictionary) parent).getDictionaryObject( "Parent", "P" );
+                while (((COSDictionary) parent).getDictionaryObject(COSName.PARENT, COSName.P) != null)
+                {
+                    parent = ((COSDictionary) parent).getDictionaryObject(COSName.PARENT, COSName.P);
                 }
                 // now parent is the pages node
                 PDPageNode pages = new PDPageNode((COSDictionary) parent);

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/documentnavigation/outline/PDOutlineNode.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/documentnavigation/outline/PDOutlineNode.java?rev=1583204&r1=1583203&r2=1583204&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/documentnavigation/outline/PDOutlineNode.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/documentnavigation/outline/PDOutlineNode.java Sun Mar 30 21:36:49 2014
@@ -18,6 +18,7 @@ package org.apache.pdfbox.pdmodel.intera
 
 import org.apache.pdfbox.cos.COSBase;
 import org.apache.pdfbox.cos.COSDictionary;
+import org.apache.pdfbox.cos.COSName;
 
 import org.apache.pdfbox.pdmodel.common.COSObjectable;
 
@@ -81,16 +82,16 @@ public class PDOutlineNode implements CO
     protected PDOutlineNode getParent()
     {
         PDOutlineNode retval = null;
-        COSDictionary parent = (COSDictionary)node.getDictionaryObject( "Parent", "P" );
-        if( parent != null )
+        COSDictionary parent = (COSDictionary) node.getDictionaryObject(COSName.PARENT, COSName.P);
+        if (parent != null)
         {
-            if( parent.getDictionaryObject( "Parent", "P" ) == null )
+            if (parent.getDictionaryObject(COSName.PARENT, COSName.P) == null)
             {
-                retval = new PDDocumentOutline( parent );
+                retval = new PDDocumentOutline(parent);
             }
             else
             {
-                retval = new PDOutlineItem( parent );
+                retval = new PDOutlineItem(parent);
             }
         }