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/02 13:31:45 UTC

svn commit: r1677306 - in /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/documentnavigation/outline: PDDocumentOutline.java PDOutlineItem.java PDOutlineNode.java

Author: tilman
Date: Sat May  2 11:31:45 2015
New Revision: 1677306

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

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/documentnavigation/outline/PDDocumentOutline.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/documentnavigation/outline/PDOutlineItem.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/documentnavigation/outline/PDDocumentOutline.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/documentnavigation/outline/PDDocumentOutline.java?rev=1677306&r1=1677305&r2=1677306&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/documentnavigation/outline/PDDocumentOutline.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/documentnavigation/outline/PDDocumentOutline.java Sat May  2 11:31:45 2015
@@ -32,7 +32,7 @@ public final class PDDocumentOutline ext
      */
     public PDDocumentOutline()
     {
-        getCOSDictionary().setName(COSName.TYPE, COSName.OUTLINES.getName());
+        getCOSObject().setName(COSName.TYPE, COSName.OUTLINES.getName());
     }
 
     /**
@@ -43,7 +43,7 @@ public final class PDDocumentOutline ext
     public PDDocumentOutline( COSDictionary dic )
     {
         super( dic );
-        getCOSDictionary().setName(COSName.TYPE, COSName.OUTLINES.getName());
+        getCOSObject().setName(COSName.TYPE, COSName.OUTLINES.getName());
     }
 
     @Override

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/documentnavigation/outline/PDOutlineItem.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/documentnavigation/outline/PDOutlineItem.java?rev=1677306&r1=1677305&r2=1677306&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/documentnavigation/outline/PDOutlineItem.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/documentnavigation/outline/PDOutlineItem.java Sat May  2 11:31:45 2015
@@ -138,7 +138,7 @@ public final class PDOutlineItem extends
      */
     void setPreviousSibling(PDOutlineNode outlineNode)
     {
-        getCOSDictionary().setItem(COSName.PREV, outlineNode);
+        getCOSObject().setItem(COSName.PREV, outlineNode);
     }
 
     /**
@@ -156,7 +156,7 @@ public final class PDOutlineItem extends
      */
     void setNextSibling(PDOutlineNode outlineNode)
     {
-        getCOSDictionary().setItem(COSName.NEXT, outlineNode);
+        getCOSObject().setItem(COSName.NEXT, outlineNode);
     }
 
     /**
@@ -166,7 +166,7 @@ public final class PDOutlineItem extends
      */
     public String getTitle()
     {
-        return getCOSDictionary().getString(COSName.TITLE);
+        return getCOSObject().getString(COSName.TITLE);
     }
 
     /**
@@ -176,7 +176,7 @@ public final class PDOutlineItem extends
      */
     public void setTitle(String title)
     {
-        getCOSDictionary().setString(COSName.TITLE, title);
+        getCOSObject().setString(COSName.TITLE, title);
     }
 
     /**
@@ -187,7 +187,7 @@ public final class PDOutlineItem extends
      */
     public PDDestination getDestination() throws IOException
     {
-        return PDDestination.create(getCOSDictionary().getDictionaryObject(COSName.DEST));
+        return PDDestination.create(getCOSObject().getDictionaryObject(COSName.DEST));
     }
 
     /**
@@ -197,7 +197,7 @@ public final class PDOutlineItem extends
      */
     public void setDestination(PDDestination dest)
     {
-        getCOSDictionary().setItem(COSName.DEST, dest);
+        getCOSObject().setItem(COSName.DEST, dest);
     }
 
     /**
@@ -298,7 +298,7 @@ public final class PDOutlineItem extends
      */
     public PDAction getAction()
     {
-        return PDActionFactory.createAction((COSDictionary) getCOSDictionary().getDictionaryObject(COSName.A));
+        return PDActionFactory.createAction((COSDictionary) getCOSObject().getDictionaryObject(COSName.A));
     }
 
     /**
@@ -308,7 +308,7 @@ public final class PDOutlineItem extends
      */
     public void setAction( PDAction action )
     {
-        getCOSDictionary().setItem(COSName.A, action);
+        getCOSObject().setItem(COSName.A, action);
     }
 
     /**
@@ -319,7 +319,7 @@ public final class PDOutlineItem extends
     public PDStructureElement getStructureElement()
     {
         PDStructureElement se = null;
-        COSDictionary dic = (COSDictionary) getCOSDictionary().getDictionaryObject(COSName.SE);
+        COSDictionary dic = (COSDictionary) getCOSObject().getDictionaryObject(COSName.SE);
         if( dic != null )
         {
             se = new PDStructureElement( dic );
@@ -334,7 +334,7 @@ public final class PDOutlineItem extends
      */
     public void setStructuredElement( PDStructureElement structureElement )
     {
-        getCOSDictionary().setItem(COSName.SE, structureElement);
+        getCOSObject().setItem(COSName.SE, structureElement);
     }
 
     /**
@@ -345,12 +345,12 @@ public final class PDOutlineItem extends
      */
     public PDColor getTextColor()
     {
-        COSArray csValues = (COSArray) getCOSDictionary().getDictionaryObject(COSName.C);
+        COSArray csValues = (COSArray) getCOSObject().getDictionaryObject(COSName.C);
         if( csValues == null )
         {
             csValues = new COSArray();
             csValues.growToSize( 3, new COSFloat( 0 ) );
-            getCOSDictionary().setItem( COSName.C, csValues );
+            getCOSObject().setItem( COSName.C, csValues );
         }
         return new PDColor(csValues, PDDeviceRGB.INSTANCE);
     }
@@ -362,7 +362,7 @@ public final class PDOutlineItem extends
      */
     public void setTextColor( PDColor textColor )
     {
-        getCOSDictionary().setItem( COSName.C, textColor.toCOSArray() );
+        getCOSObject().setItem( COSName.C, textColor.toCOSArray() );
     }
 
     /**
@@ -376,7 +376,7 @@ public final class PDOutlineItem extends
         array.add( new COSFloat( textColor.getRed()/255f));
         array.add( new COSFloat( textColor.getGreen()/255f));
         array.add( new COSFloat( textColor.getBlue()/255f));
-        getCOSDictionary().setItem( COSName.C, array );
+        getCOSObject().setItem( COSName.C, array );
     }
 
     /**
@@ -386,7 +386,7 @@ public final class PDOutlineItem extends
      */
     public boolean isItalic()
     {
-        return getCOSDictionary().getFlag( COSName.F, ITALIC_FLAG );
+        return getCOSObject().getFlag( COSName.F, ITALIC_FLAG );
     }
 
     /**
@@ -396,7 +396,7 @@ public final class PDOutlineItem extends
      */
     public void setItalic( boolean italic )
     {
-        getCOSDictionary().setFlag( COSName.F, ITALIC_FLAG, italic );
+        getCOSObject().setFlag( COSName.F, ITALIC_FLAG, italic );
     }
 
     /**
@@ -406,7 +406,7 @@ public final class PDOutlineItem extends
      */
     public boolean isBold()
     {
-        return getCOSDictionary().getFlag( COSName.F, BOLD_FLAG );
+        return getCOSObject().getFlag( COSName.F, BOLD_FLAG );
     }
 
     /**
@@ -416,7 +416,7 @@ public final class PDOutlineItem extends
      */
     public void setBold( boolean bold )
     {
-        getCOSDictionary().setFlag( COSName.F, BOLD_FLAG, bold );
+        getCOSObject().setFlag( COSName.F, BOLD_FLAG, bold );
     }
 
 }

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=1677306&r1=1677305&r2=1677306&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 Sat May  2 11:31:45 2015
@@ -51,7 +51,7 @@ public abstract class PDOutlineNode exte
      */
     PDOutlineNode getParent()
     {
-        COSDictionary item = (COSDictionary) getCOSDictionary().getDictionaryObject(COSName.PARENT);
+        COSDictionary item = (COSDictionary) getCOSObject().getDictionaryObject(COSName.PARENT);
         if (item != null)
         {
             if (COSName.OUTLINES.equals(item.getCOSName(COSName.TYPE)))
@@ -65,7 +65,7 @@ public abstract class PDOutlineNode exte
 
     void setParent(PDOutlineNode parent)
     {
-        getCOSDictionary().setItem(COSName.PARENT, parent);
+        getCOSObject().setItem(COSName.PARENT, parent);
     }
 
     /**
@@ -173,7 +173,7 @@ public abstract class PDOutlineNode exte
 
     PDOutlineItem getOutlineItem(COSName name)
     {
-        COSDictionary item = (COSDictionary) getCOSDictionary().getDictionaryObject(name);
+        COSDictionary item = (COSDictionary) getCOSObject().getDictionaryObject(name);
         if (item != null)
         {
             return new PDOutlineItem(item);
@@ -196,7 +196,7 @@ public abstract class PDOutlineNode exte
      */
     void setFirstChild(PDOutlineNode outlineNode)
     {
-        getCOSDictionary().setItem(COSName.FIRST, outlineNode);
+        getCOSObject().setItem(COSName.FIRST, outlineNode);
     }
 
     /**
@@ -214,7 +214,7 @@ public abstract class PDOutlineNode exte
      */
     void setLastChild(PDOutlineNode outlineNode)
     {
-        getCOSDictionary().setItem(COSName.LAST, outlineNode);
+        getCOSObject().setItem(COSName.LAST, outlineNode);
     }
 
     /**
@@ -226,7 +226,7 @@ public abstract class PDOutlineNode exte
      */
     public int getOpenCount()
     {
-        return getCOSDictionary().getInt(COSName.COUNT, 0);
+        return getCOSObject().getInt(COSName.COUNT, 0);
     }
 
     /**
@@ -236,7 +236,7 @@ public abstract class PDOutlineNode exte
      */
     void setOpenCount(int openCount)
     {
-        getCOSDictionary().setInt(COSName.COUNT, openCount);
+        getCOSObject().setInt(COSName.COUNT, openCount);
     }
 
     /**