You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by le...@apache.org on 2021/03/18 07:13:59 UTC
svn commit: r1887773 - in
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common:
PDNumberTreeNode.java PDObjectStream.java
Author: lehmi
Date: Thu Mar 18 07:13:58 2021
New Revision: 1887773
URL: http://svn.apache.org/viewvc?rev=1887773&view=rev
Log:
PDFBOX-4892: use convenience methods to simplify code
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDNumberTreeNode.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDObjectStream.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDNumberTreeNode.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDNumberTreeNode.java?rev=1887773&r1=1887772&r2=1887773&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDNumberTreeNode.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDNumberTreeNode.java Thu Mar 18 07:13:58 2021
@@ -88,7 +88,7 @@ public class PDNumberTreeNode implements
public List<PDNumberTreeNode> getKids()
{
List<PDNumberTreeNode> retval = null;
- COSArray kids = (COSArray)node.getDictionaryObject( COSName.KIDS );
+ COSArray kids = node.getCOSArray(COSName.KIDS);
if( kids != null )
{
List<PDNumberTreeNode> pdObjects = new ArrayList<>();
@@ -175,10 +175,9 @@ public class PDNumberTreeNode implements
public Map<Integer,COSObjectable> getNumbers() throws IOException
{
Map<Integer, COSObjectable> indices = null;
- COSBase numBase = node.getDictionaryObject(COSName.NUMS);
- if (numBase instanceof COSArray)
+ COSArray numbersArray = node.getCOSArray(COSName.NUMS);
+ if (numbersArray != null)
{
- COSArray numbersArray = (COSArray) numBase;
indices = new HashMap<>();
if (numbersArray.size() % 2 != 0)
{
@@ -279,7 +278,7 @@ public class PDNumberTreeNode implements
public Integer getUpperLimit()
{
Integer retval = null;
- COSArray arr = (COSArray)node.getDictionaryObject( COSName.LIMITS );
+ COSArray arr = node.getCOSArray(COSName.LIMITS);
if( arr != null && arr.get(0) != null )
{
retval = arr.getInt( 1 );
@@ -294,7 +293,7 @@ public class PDNumberTreeNode implements
*/
private void setUpperLimit( Integer upper )
{
- COSArray arr = (COSArray)node.getDictionaryObject( COSName.LIMITS );
+ COSArray arr = node.getCOSArray(COSName.LIMITS);
if( arr == null )
{
arr = new COSArray();
@@ -320,7 +319,7 @@ public class PDNumberTreeNode implements
public Integer getLowerLimit()
{
Integer retval = null;
- COSArray arr = (COSArray)node.getDictionaryObject( COSName.LIMITS );
+ COSArray arr = node.getCOSArray(COSName.LIMITS);
if( arr != null && arr.get(0) != null )
{
retval = arr.getInt( 0 );
@@ -335,7 +334,7 @@ public class PDNumberTreeNode implements
*/
private void setLowerLimit( Integer lower )
{
- COSArray arr = (COSArray)node.getDictionaryObject( COSName.LIMITS );
+ COSArray arr = node.getCOSArray(COSName.LIMITS);
if( arr == null )
{
arr = new COSArray();
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDObjectStream.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDObjectStream.java?rev=1887773&r1=1887772&r2=1887773&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDObjectStream.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDObjectStream.java Thu Mar 18 07:13:58 2021
@@ -114,14 +114,8 @@ public class PDObjectStream extends PDSt
*/
public PDObjectStream getExtends()
{
- PDObjectStream retval = null;
- COSStream stream = (COSStream)getCOSObject().getDictionaryObject( COSName.EXTENDS );
- if( stream != null )
- {
- retval = new PDObjectStream( stream );
- }
- return retval;
-
+ COSStream stream = getCOSObject().getCOSStream(COSName.EXTENDS);
+ return stream != null ? new PDObjectStream(stream) : null;
}
/**