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/15 07:09:55 UTC
svn commit: r1887664 -
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/
Author: lehmi
Date: Mon Mar 15 07:09:55 2021
New Revision: 1887664
URL: http://svn.apache.org/viewvc?rev=1887664&view=rev
Log:
PDFBOX-4892: use convenience methods to simplify code
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotation.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationCaret.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationCircle.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationFreeText.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationInk.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationLine.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationPolygon.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationPolyline.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationSquare.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFCatalog.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFDictionary.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFField.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFIconFit.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFJavaScript.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFPage.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFTemplate.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotation.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotation.java?rev=1887664&r1=1887663&r2=1887664&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotation.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotation.java Mon Mar 15 07:09:55 2021
@@ -446,7 +446,7 @@ public abstract class FDFAnnotation impl
public Color getColor()
{
Color retval = null;
- COSArray array = (COSArray) annot.getDictionaryObject(COSName.C);
+ COSArray array = annot.getCOSArray(COSName.C);
if (array != null)
{
float[] rgb = array.toFloatArray();
@@ -732,13 +732,8 @@ public abstract class FDFAnnotation impl
*/
public PDRectangle getRectangle()
{
- PDRectangle retval = null;
- COSArray rectArray = (COSArray) annot.getDictionaryObject(COSName.RECT);
- if (rectArray != null)
- {
- retval = new PDRectangle(rectArray);
- }
- return retval;
+ COSArray rectArray = (COSArray) annot.getCOSArray(COSName.RECT);
+ return rectArray != null ? new PDRectangle(rectArray) : null;
}
/**
@@ -903,15 +898,8 @@ public abstract class FDFAnnotation impl
*/
public PDBorderStyleDictionary getBorderStyle()
{
- COSDictionary bs = (COSDictionary) annot.getDictionaryObject(COSName.BS);
- if (bs != null)
- {
- return new PDBorderStyleDictionary(bs);
- }
- else
- {
- return null;
- }
+ COSDictionary bs = annot.getCOSDictionary(COSName.BS);
+ return bs != null ? new PDBorderStyleDictionary(bs) : null;
}
/**
@@ -934,15 +922,8 @@ public abstract class FDFAnnotation impl
*/
public PDBorderEffectDictionary getBorderEffect()
{
- COSDictionary be = (COSDictionary) annot.getDictionaryObject(COSName.BE);
- if (be != null)
- {
- return new PDBorderEffectDictionary(be);
- }
- else
- {
- return null;
- }
+ COSDictionary be = (COSDictionary) annot.getCOSDictionary(COSName.BE);
+ return be != null ? new PDBorderEffectDictionary(be) : null;
}
/**
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationCaret.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationCaret.java?rev=1887664&r1=1887663&r2=1887664&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationCaret.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationCaret.java Mon Mar 15 07:09:55 2021
@@ -114,15 +114,8 @@ public class FDFAnnotationCaret extends
*/
public PDRectangle getFringe()
{
- COSArray rd = (COSArray) annot.getDictionaryObject(COSName.RD);
- if (rd != null)
- {
- return new PDRectangle(rd);
- }
- else
- {
- return null;
- }
+ COSArray rd = annot.getCOSArray(COSName.RD);
+ return rd != null ? new PDRectangle(rd) : null;
}
/**
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationCircle.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationCircle.java?rev=1887664&r1=1887663&r2=1887664&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationCircle.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationCircle.java Mon Mar 15 07:09:55 2021
@@ -122,7 +122,7 @@ public class FDFAnnotationCircle extends
public Color getInteriorColor()
{
Color retval = null;
- COSArray array = (COSArray) annot.getDictionaryObject(COSName.IC);
+ COSArray array = annot.getCOSArray(COSName.IC);
if (array != null)
{
float[] rgb = array.toFloatArray();
@@ -153,14 +153,7 @@ public class FDFAnnotationCircle extends
*/
public PDRectangle getFringe()
{
- COSArray rd = (COSArray) annot.getDictionaryObject(COSName.RD);
- if (rd != null)
- {
- return new PDRectangle(rd);
- }
- else
- {
- return null;
- }
+ COSArray rd = annot.getCOSArray(COSName.RD);
+ return rd != null ? new PDRectangle(rd) : null;
}
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationFreeText.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationFreeText.java?rev=1887664&r1=1887663&r2=1887664&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationFreeText.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationFreeText.java Mon Mar 15 07:09:55 2021
@@ -158,15 +158,8 @@ public class FDFAnnotationFreeText exten
*/
public float[] getCallout()
{
- COSArray array = (COSArray) annot.getDictionaryObject(COSName.CL);
- if (array != null)
- {
- return array.toFloatArray();
- }
- else
- {
- return null;
- }
+ COSArray array = annot.getCOSArray(COSName.CL);
+ return array != null ? array.toFloatArray() : null;
}
/**
@@ -279,15 +272,8 @@ public class FDFAnnotationFreeText exten
*/
public PDRectangle getFringe()
{
- COSArray rd = (COSArray) annot.getDictionaryObject(COSName.RD);
- if (rd != null)
- {
- return new PDRectangle(rd);
- }
- else
- {
- return null;
- }
+ COSArray rd = annot.getCOSArray(COSName.RD);
+ return rd != null ? new PDRectangle(rd) : null;
}
/**
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationInk.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationInk.java?rev=1887664&r1=1887663&r2=1887664&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationInk.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationInk.java Mon Mar 15 07:09:55 2021
@@ -140,7 +140,7 @@ public class FDFAnnotationInk extends FD
*/
public List<float[]> getInkList()
{
- COSArray array = (COSArray) annot.getDictionaryObject(COSName.INKLIST);
+ COSArray array = annot.getCOSArray(COSName.INKLIST);
if (array != null)
{
List<float[]> retval = new ArrayList<>();
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationLine.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationLine.java?rev=1887664&r1=1887663&r2=1887664&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationLine.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationLine.java Mon Mar 15 07:09:55 2021
@@ -173,15 +173,8 @@ public class FDFAnnotationLine extends F
*/
public float[] getLine()
{
- COSArray array = (COSArray) annot.getDictionaryObject(COSName.L);
- if (array != null)
- {
- return array.toFloatArray();
- }
- else
- {
- return null; // Should never happen as this is a required item
- }
+ COSArray array = annot.getCOSArray(COSName.L);
+ return array != null ? array.toFloatArray() : null;
}
/**
@@ -192,7 +185,7 @@ public class FDFAnnotationLine extends F
public final void setStartPointEndingStyle(String style)
{
String actualStyle = style == null ? PDAnnotationLine.LE_NONE : style;
- COSArray array = (COSArray) annot.getDictionaryObject(COSName.LE);
+ COSArray array = annot.getCOSArray(COSName.LE);
if (array == null)
{
array = new COSArray();
@@ -213,14 +206,8 @@ public class FDFAnnotationLine extends F
*/
public String getStartPointEndingStyle()
{
- String retval = PDAnnotationLine.LE_NONE;
- COSArray array = (COSArray) annot.getDictionaryObject(COSName.LE);
- if (array != null)
- {
- retval = array.getName(0);
- }
-
- return retval;
+ COSArray array = annot.getCOSArray(COSName.LE);
+ return array != null ? array.getName(0) : PDAnnotationLine.LE_NONE;
}
/**
@@ -231,7 +218,7 @@ public class FDFAnnotationLine extends F
public final void setEndPointEndingStyle(String style)
{
String actualStyle = style == null ? PDAnnotationLine.LE_NONE : style;
- COSArray array = (COSArray) annot.getDictionaryObject(COSName.LE);
+ COSArray array = annot.getCOSArray(COSName.LE);
if (array == null)
{
array = new COSArray();
@@ -252,14 +239,8 @@ public class FDFAnnotationLine extends F
*/
public String getEndPointEndingStyle()
{
- String retval = PDAnnotationLine.LE_NONE;
- COSArray array = (COSArray) annot.getDictionaryObject(COSName.LE);
- if (array != null)
- {
- retval = array.getName(1);
- }
-
- return retval;
+ COSArray array = annot.getCOSArray(COSName.LE);
+ return array != null ? array.getName(1) : PDAnnotationLine.LE_NONE;
}
/**
@@ -287,7 +268,7 @@ public class FDFAnnotationLine extends F
public Color getInteriorColor()
{
Color retval = null;
- COSArray array = (COSArray) annot.getDictionaryObject(COSName.IC);
+ COSArray array = annot.getCOSArray(COSName.IC);
if (array != null)
{
float[] rgb = array.toFloatArray();
@@ -406,7 +387,7 @@ public class FDFAnnotationLine extends F
*/
public final void setCaptionHorizontalOffset(float offset)
{
- COSArray array = (COSArray) annot.getDictionaryObject(COSName.CO);
+ COSArray array = annot.getCOSArray(COSName.CO);
if (array == null)
{
array = new COSArray();
@@ -426,14 +407,8 @@ public class FDFAnnotationLine extends F
*/
public float getCaptionHorizontalOffset()
{
- float retval = 0.f;
- COSArray array = (COSArray) annot.getDictionaryObject(COSName.CO);
- if (array != null)
- {
- retval = array.toFloatArray()[0];
- }
-
- return retval;
+ COSArray array = annot.getCOSArray(COSName.CO);
+ return array != null ? array.toFloatArray()[0] : 0.f;
}
/**
@@ -443,7 +418,7 @@ public class FDFAnnotationLine extends F
*/
public final void setCaptionVerticalOffset(float offset)
{
- COSArray array = (COSArray) annot.getDictionaryObject(COSName.CO);
+ COSArray array = annot.getCOSArray(COSName.CO);
if (array == null)
{
array = new COSArray();
@@ -463,12 +438,7 @@ public class FDFAnnotationLine extends F
*/
public float getCaptionVerticalOffset()
{
- float retval = 0.f;
- COSArray array = (COSArray) annot.getDictionaryObject(COSName.CO);
- if (array != null)
- {
- retval = array.toFloatArray()[1];
- }
- return retval;
+ COSArray array = annot.getCOSArray(COSName.CO);
+ return array != null ? array.toFloatArray()[1] : 0.f;
}
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationPolygon.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationPolygon.java?rev=1887664&r1=1887663&r2=1887664&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationPolygon.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationPolygon.java Mon Mar 15 07:09:55 2021
@@ -127,15 +127,8 @@ public class FDFAnnotationPolygon extend
*/
public float[] getVertices()
{
- COSArray array = (COSArray) annot.getDictionaryObject(COSName.VERTICES);
- if (array != null)
- {
- return array.toFloatArray();
- }
- else
- {
- return null; // Should never happen as this is a required item
- }
+ COSArray array = annot.getCOSArray(COSName.VERTICES);
+ return array != null ? array.toFloatArray() : null;
}
/**
@@ -163,7 +156,7 @@ public class FDFAnnotationPolygon extend
public Color getInteriorColor()
{
Color retval = null;
- COSArray array = (COSArray) annot.getDictionaryObject(COSName.IC);
+ COSArray array = annot.getCOSArray(COSName.IC);
if (array != null)
{
float[] rgb = array.toFloatArray();
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationPolyline.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationPolyline.java?rev=1887664&r1=1887663&r2=1887664&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationPolyline.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationPolyline.java Mon Mar 15 07:09:55 2021
@@ -144,15 +144,8 @@ public class FDFAnnotationPolyline exten
*/
public float[] getVertices()
{
- COSArray array = (COSArray) annot.getDictionaryObject(COSName.VERTICES);
- if (array != null)
- {
- return array.toFloatArray();
- }
- else
- {
- return null; // Should never happen as this is a required item
- }
+ COSArray array = annot.getCOSArray(COSName.VERTICES);
+ return array != null ? array.toFloatArray() : null;
}
/**
@@ -163,7 +156,7 @@ public class FDFAnnotationPolyline exten
public void setStartPointEndingStyle(String style)
{
String actualStyle = style == null ? PDAnnotationLine.LE_NONE : style;
- COSArray array = (COSArray) annot.getDictionaryObject(COSName.LE);
+ COSArray array = annot.getCOSArray(COSName.LE);
if (array == null)
{
array = new COSArray();
@@ -184,14 +177,8 @@ public class FDFAnnotationPolyline exten
*/
public String getStartPointEndingStyle()
{
- String retval = PDAnnotationLine.LE_NONE;
- COSArray array = (COSArray) annot.getDictionaryObject(COSName.LE);
- if (array != null)
- {
- retval = array.getName(0);
- }
-
- return retval;
+ COSArray array = annot.getCOSArray(COSName.LE);
+ return array != null ? array.getName(0) : PDAnnotationLine.LE_NONE;
}
/**
@@ -202,7 +189,7 @@ public class FDFAnnotationPolyline exten
public void setEndPointEndingStyle(String style)
{
String actualStyle = style == null ? PDAnnotationLine.LE_NONE : style;
- COSArray array = (COSArray) annot.getDictionaryObject(COSName.LE);
+ COSArray array = annot.getCOSArray(COSName.LE);
if (array == null)
{
array = new COSArray();
@@ -223,14 +210,8 @@ public class FDFAnnotationPolyline exten
*/
public String getEndPointEndingStyle()
{
- String retval = PDAnnotationLine.LE_NONE;
- COSArray array = (COSArray) annot.getDictionaryObject(COSName.LE);
- if (array != null)
- {
- retval = array.getName(1);
- }
-
- return retval;
+ COSArray array = annot.getCOSArray(COSName.LE);
+ return array != null ? array.getName(1) : PDAnnotationLine.LE_NONE;
}
/**
@@ -258,7 +239,7 @@ public class FDFAnnotationPolyline exten
public Color getInteriorColor()
{
Color retval = null;
- COSArray array = (COSArray) annot.getDictionaryObject(COSName.IC);
+ COSArray array = annot.getCOSArray(COSName.IC);
if (array != null)
{
float[] rgb = array.toFloatArray();
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationSquare.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationSquare.java?rev=1887664&r1=1887663&r2=1887664&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationSquare.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationSquare.java Mon Mar 15 07:09:55 2021
@@ -123,7 +123,7 @@ public class FDFAnnotationSquare extends
public Color getInteriorColor()
{
Color retval = null;
- COSArray array = (COSArray) annot.getDictionaryObject(COSName.IC);
+ COSArray array = annot.getCOSArray(COSName.IC);
if (array != null)
{
float[] rgb = array.toFloatArray();
@@ -154,14 +154,7 @@ public class FDFAnnotationSquare extends
*/
public PDRectangle getFringe()
{
- COSArray rd = (COSArray) annot.getDictionaryObject(COSName.RD);
- if (rd != null)
- {
- return new PDRectangle(rd);
- }
- else
- {
- return null;
- }
+ COSArray rd = annot.getCOSArray(COSName.RD);
+ return rd != null ? new PDRectangle(rd) : null;
}
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFCatalog.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFCatalog.java?rev=1887664&r1=1887663&r2=1887664&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFCatalog.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFCatalog.java Mon Mar 15 07:09:55 2021
@@ -115,7 +115,7 @@ public class FDFCatalog implements COSOb
*/
public FDFDictionary getFDF()
{
- COSDictionary fdf = (COSDictionary) catalog.getDictionaryObject(COSName.FDF);
+ COSDictionary fdf = catalog.getCOSDictionary(COSName.FDF);
FDFDictionary retval;
if (fdf != null)
{
@@ -146,13 +146,8 @@ public class FDFCatalog implements COSOb
*/
public PDSignature getSignature()
{
- PDSignature signature = null;
- COSDictionary sig = (COSDictionary) catalog.getDictionaryObject(COSName.SIG);
- if (sig != null)
- {
- signature = new PDSignature(sig);
- }
- return signature;
+ COSDictionary sig = catalog.getCOSDictionary(COSName.SIG);
+ return sig != null ? new PDSignature(sig) : null;
}
/**
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFDictionary.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFDictionary.java?rev=1887664&r1=1887663&r2=1887664&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFDictionary.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFDictionary.java Mon Mar 15 07:09:55 2021
@@ -297,7 +297,7 @@ public class FDFDictionary implements CO
*/
public COSArray getID()
{
- return (COSArray) fdf.getDictionaryObject(COSName.ID);
+ return fdf.getCOSArray(COSName.ID);
}
/**
@@ -318,7 +318,7 @@ public class FDFDictionary implements CO
public List<FDFField> getFields()
{
List<FDFField> retval = null;
- COSArray fieldArray = (COSArray) fdf.getDictionaryObject(COSName.FIELDS);
+ COSArray fieldArray = fdf.getCOSArray(COSName.FIELDS);
if (fieldArray != null)
{
List<FDFField> fields = new ArrayList<>();
@@ -369,7 +369,7 @@ public class FDFDictionary implements CO
public List<FDFPage> getPages()
{
List<FDFPage> retval = null;
- COSArray pageArray = (COSArray) fdf.getDictionaryObject(COSName.PAGES);
+ COSArray pageArray = fdf.getCOSArray(COSName.PAGES);
if (pageArray != null)
{
List<FDFPage> pages = new ArrayList<>();
@@ -430,7 +430,7 @@ public class FDFDictionary implements CO
public List<FDFAnnotation> getAnnotations() throws IOException
{
List<FDFAnnotation> retval = null;
- COSArray annotArray = (COSArray) fdf.getDictionaryObject(COSName.ANNOTS);
+ COSArray annotArray = fdf.getCOSArray(COSName.ANNOTS);
if (annotArray != null)
{
List<FDFAnnotation> annots = new ArrayList<>();
@@ -461,7 +461,7 @@ public class FDFDictionary implements CO
*/
public COSStream getDifferences()
{
- return (COSStream) fdf.getDictionaryObject(COSName.DIFFERENCES);
+ return fdf.getCOSStream(COSName.DIFFERENCES);
}
/**
@@ -505,7 +505,7 @@ public class FDFDictionary implements CO
public List<PDFileSpecification> getEmbeddedFDFs() throws IOException
{
List<PDFileSpecification> retval = null;
- COSArray embeddedArray = (COSArray) fdf.getDictionaryObject(COSName.EMBEDDED_FDFS);
+ COSArray embeddedArray = fdf.getCOSArray(COSName.EMBEDDED_FDFS);
if (embeddedArray != null)
{
List<PDFileSpecification> embedded = new ArrayList<>();
@@ -536,13 +536,8 @@ public class FDFDictionary implements CO
*/
public FDFJavaScript getJavaScript()
{
- FDFJavaScript fs = null;
- COSDictionary dic = (COSDictionary) fdf.getDictionaryObject(COSName.JAVA_SCRIPT);
- if (dic != null)
- {
- fs = new FDFJavaScript(dic);
- }
- return fs;
+ COSDictionary dic = fdf.getCOSDictionary(COSName.JAVA_SCRIPT);
+ return dic != null ? new FDFJavaScript(dic) : null;
}
/**
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFField.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFField.java?rev=1887664&r1=1887663&r2=1887664&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFField.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFField.java Mon Mar 15 07:09:55 2021
@@ -167,8 +167,7 @@ public class FDFField implements COSObje
*/
public List<FDFField> getKids()
{
- COSArray kids = (COSArray) field.getDictionaryObject(COSName.KIDS);
- List<FDFField> retval = null;
+ COSArray kids = field.getCOSArray(COSName.KIDS);
if (kids != null)
{
List<FDFField> actuals = new ArrayList<>();
@@ -176,9 +175,9 @@ public class FDFField implements COSObje
{
actuals.add(new FDFField((COSDictionary) kids.getObject(i)));
}
- retval = new COSArrayList<>(actuals, kids);
+ return new COSArrayList<>(actuals, kids);
}
- return retval;
+ return null;
}
/**
@@ -260,27 +259,18 @@ public class FDFField implements COSObje
public COSBase getCOSValue() throws IOException
{
COSBase value = field.getDictionaryObject(COSName.V);
-
- if (value instanceof COSName)
- {
- return value;
- }
- else if (value instanceof COSArray)
- {
- return value;
- }
- else if (value instanceof COSString || value instanceof COSStream)
+ if (value instanceof COSName //
+ || value instanceof COSArray //
+ || value instanceof COSString //
+ || value instanceof COSStream)
{
return value;
}
- else if (value != null)
+ if (value != null)
{
throw new IOException("Error:Unknown type for field import" + value);
}
- else
- {
- return null;
- }
+ return null;
}
/**
@@ -578,13 +568,8 @@ public class FDFField implements COSObje
*/
public PDAppearanceDictionary getAppearanceDictionary()
{
- PDAppearanceDictionary retval = null;
- COSDictionary dict = (COSDictionary) field.getDictionaryObject(COSName.AP);
- if (dict != null)
- {
- retval = new PDAppearanceDictionary(dict);
- }
- return retval;
+ COSDictionary dict = field.getCOSDictionary(COSName.AP);
+ return dict != null ? new PDAppearanceDictionary(dict) : null;
}
/**
@@ -604,13 +589,8 @@ public class FDFField implements COSObje
*/
public FDFNamedPageReference getAppearanceStreamReference()
{
- FDFNamedPageReference retval = null;
- COSDictionary ref = (COSDictionary) field.getDictionaryObject(COSName.AP_REF);
- if (ref != null)
- {
- retval = new FDFNamedPageReference(ref);
- }
- return retval;
+ COSDictionary ref = field.getCOSDictionary(COSName.AP_REF);
+ return ref != null ? new FDFNamedPageReference(ref) : null;
}
/**
@@ -630,13 +610,8 @@ public class FDFField implements COSObje
*/
public FDFIconFit getIconFit()
{
- FDFIconFit retval = null;
- COSDictionary dic = (COSDictionary) field.getDictionaryObject(COSName.IF);
- if (dic != null)
- {
- retval = new FDFIconFit(dic);
- }
- return retval;
+ COSDictionary dic = field.getCOSDictionary(COSName.IF);
+ return dic != null ? new FDFIconFit(dic) : null;
}
/**
@@ -657,8 +632,7 @@ public class FDFField implements COSObje
*/
public List<Object> getOptions()
{
- List<Object> retval = null;
- COSArray array = (COSArray) field.getDictionaryObject(COSName.OPT);
+ COSArray array = field.getCOSArray(COSName.OPT);
if (array != null)
{
List<Object> objects = new ArrayList<>(array.size());
@@ -675,9 +649,9 @@ public class FDFField implements COSObje
objects.add(new FDFOptionElement(value));
}
}
- retval = new COSArrayList<>(objects, array);
+ return new COSArrayList<>(objects, array);
}
- return retval;
+ return null;
}
/**
@@ -699,7 +673,7 @@ public class FDFField implements COSObje
*/
public PDAction getAction()
{
- return PDActionFactory.createAction((COSDictionary) field.getDictionaryObject(COSName.A));
+ return PDActionFactory.createAction(field.getCOSDictionary(COSName.A));
}
/**
@@ -719,14 +693,8 @@ public class FDFField implements COSObje
*/
public PDAdditionalActions getAdditionalActions()
{
- PDAdditionalActions retval = null;
- COSDictionary dict = (COSDictionary) field.getDictionaryObject(COSName.AA);
- if (dict != null)
- {
- retval = new PDAdditionalActions(dict);
- }
-
- return retval;
+ COSDictionary dict = field.getCOSDictionary(COSName.AA);
+ return dict != null ? new PDAdditionalActions(dict) : null;
}
/**
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFIconFit.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFIconFit.java?rev=1887664&r1=1887663&r2=1887664&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFIconFit.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFIconFit.java Mon Mar 15 07:09:55 2021
@@ -151,7 +151,7 @@ public class FDFIconFit implements COSOb
public PDRange getFractionalSpaceToAllocate()
{
PDRange retval = null;
- COSArray array = (COSArray) fit.getDictionaryObject(COSName.A);
+ COSArray array = fit.getCOSArray(COSName.A);
if (array == null)
{
retval = new PDRange();
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFJavaScript.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFJavaScript.java?rev=1887664&r1=1887663&r2=1887664&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFJavaScript.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFJavaScript.java Mon Mar 15 07:09:55 2021
@@ -139,7 +139,7 @@ public class FDFJavaScript implements CO
public Map<String, PDActionJavaScript> getDoc()
{
Map<String, PDActionJavaScript> map = new LinkedHashMap<>();
- COSArray array = (COSArray) dictionary.getDictionaryObject(COSName.DOC);
+ COSArray array = dictionary.getCOSArray(COSName.DOC);
if (array == null)
{
return null;
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFPage.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFPage.java?rev=1887664&r1=1887663&r2=1887664&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFPage.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFPage.java Mon Mar 15 07:09:55 2021
@@ -70,8 +70,7 @@ public class FDFPage implements COSObjec
*/
public List<FDFTemplate> getTemplates()
{
- List<FDFTemplate> retval = null;
- COSArray array = (COSArray) page.getDictionaryObject(COSName.TEMPLATES);
+ COSArray array = page.getCOSArray(COSName.TEMPLATES);
if (array != null)
{
List<FDFTemplate> objects = new ArrayList<>(array.size());
@@ -79,9 +78,9 @@ public class FDFPage implements COSObjec
{
objects.add(new FDFTemplate((COSDictionary) array.getObject(i)));
}
- retval = new COSArrayList<>(objects, array);
+ return new COSArrayList<>(objects, array);
}
- return retval;
+ return null;
}
/**
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFTemplate.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFTemplate.java?rev=1887664&r1=1887663&r2=1887664&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFTemplate.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFTemplate.java Mon Mar 15 07:09:55 2021
@@ -70,13 +70,8 @@ public class FDFTemplate implements COSO
*/
public FDFNamedPageReference getTemplateReference()
{
- FDFNamedPageReference retval = null;
- COSDictionary dict = (COSDictionary) template.getDictionaryObject(COSName.TREF);
- if (dict != null)
- {
- retval = new FDFNamedPageReference(dict);
- }
- return retval;
+ COSDictionary dict = template.getCOSDictionary(COSName.TREF);
+ return dict != null ? new FDFNamedPageReference(dict) : null;
}
/**
@@ -96,8 +91,7 @@ public class FDFTemplate implements COSO
*/
public List<FDFField> getFields()
{
- List<FDFField> retval = null;
- COSArray array = (COSArray) template.getDictionaryObject(COSName.FIELDS);
+ COSArray array = template.getCOSArray(COSName.FIELDS);
if (array != null)
{
List<FDFField> fields = new ArrayList<>();
@@ -105,9 +99,9 @@ public class FDFTemplate implements COSO
{
fields.add(new FDFField((COSDictionary) array.getObject(i)));
}
- retval = new COSArrayList<>(fields, array);
+ return new COSArrayList<>(fields, array);
}
- return retval;
+ return null;
}
/**