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 2020/08/11 17:10:28 UTC

svn commit: r1880780 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDNameTreeNode.java

Author: tilman
Date: Tue Aug 11 17:10:28 2020
New Revision: 1880780

URL: http://svn.apache.org/viewvc?rev=1880780&view=rev
Log:
PDFBOX-4892: avoid ClassCastException; use jdk8 syntax

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDNameTreeNode.java

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDNameTreeNode.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDNameTreeNode.java?rev=1880780&r1=1880779&r2=1880780&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDNameTreeNode.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDNameTreeNode.java Tue Aug 11 17:10:28 2020
@@ -114,7 +114,7 @@ public abstract class PDNameTreeNode<T e
     public List<PDNameTreeNode<T>> getKids()
     {
         List<PDNameTreeNode<T>> retval = null;
-        COSArray kids = (COSArray)node.getDictionaryObject( COSName.KIDS );
+        COSArray kids = node.getCOSArray(COSName.KIDS);
         if( kids != null )
         {
             List<PDNameTreeNode<T>> pdObjects = new ArrayList<>();
@@ -137,10 +137,7 @@ public abstract class PDNameTreeNode<T e
     {
         if (kids != null && !kids.isEmpty())
         {
-            for (PDNameTreeNode<T> kidsNode : kids)
-            {
-                kidsNode.setParent(this);
-            }
+            kids.forEach(kidsNode -> kidsNode.setParent(this));
             node.setItem( COSName.KIDS, COSArrayList.converterToCOSArray( kids ) );
             // root nodes with kids don't have Names
             if (isRootNode())
@@ -257,13 +254,18 @@ public abstract class PDNameTreeNode<T e
      */
     public Map<String, T> getNames() throws IOException
     {
-        COSArray namesArray = (COSArray)node.getDictionaryObject( COSName.NAMES );
+        COSArray namesArray = node.getCOSArray(COSName.NAMES);
         if( namesArray != null )
         {
             Map<String, T> names = new LinkedHashMap<>();
             for( int i=0; i<namesArray.size(); i+=2 )
             {
-                COSString key = (COSString)namesArray.getObject(i);
+                COSBase base = namesArray.getObject(i);
+                if (!(base instanceof COSString))
+                {
+                    throw new IOException("Expected string, found " + base + " in name tree at index " + i);
+                }
+                COSString key = (COSString) base;
                 COSBase cosValue = namesArray.getObject( i+1 );
                 names.put( key.getString(), convertCOSToPD(cosValue) );
             }
@@ -330,7 +332,7 @@ public abstract class PDNameTreeNode<T e
     public String getUpperLimit()
     {
         String retval = null;
-        COSArray arr = (COSArray)node.getDictionaryObject( COSName.LIMITS );
+        COSArray arr = node.getCOSArray(COSName.LIMITS);
         if( arr != null )
         {
             retval = arr.getString( 1 );
@@ -345,7 +347,7 @@ public abstract class PDNameTreeNode<T e
      */
     private void setUpperLimit( String upper )
     {
-        COSArray arr = (COSArray)node.getDictionaryObject( COSName.LIMITS );
+        COSArray arr = node.getCOSArray(COSName.LIMITS);
         if( arr == null )
         {
             arr = new COSArray();
@@ -364,7 +366,7 @@ public abstract class PDNameTreeNode<T e
     public String getLowerLimit()
     {
         String retval = null;
-        COSArray arr = (COSArray)node.getDictionaryObject( COSName.LIMITS );
+        COSArray arr = node.getCOSArray(COSName.LIMITS);
         if( arr != null )
         {
             retval = arr.getString( 0 );
@@ -379,7 +381,7 @@ public abstract class PDNameTreeNode<T e
      */
     private void setLowerLimit( String lower )
     {
-        COSArray arr = (COSArray)node.getDictionaryObject( COSName.LIMITS );
+        COSArray arr = node.getCOSArray(COSName.LIMITS);
         if( arr == null )
         {
             arr = new COSArray();