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 2016/02/24 20:24:24 UTC
svn commit: r1732209 - in
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation:
PDAnnotationLine.java PDAnnotationLink.java PDAnnotationMarkup.java
PDAnnotationSquareCircle.java PDAnnotationWidget.java
Author: tilman
Date: Wed Feb 24 19:24:24 2016
New Revision: 1732209
URL: http://svn.apache.org/viewvc?rev=1732209&view=rev
Log:
PDFBOX-2852: avoid classcastexceptions
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationLine.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationLink.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationMarkup.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationSquareCircle.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationWidget.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationLine.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationLine.java?rev=1732209&r1=1732208&r2=1732209&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationLine.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationLine.java Wed Feb 24 19:24:24 2016
@@ -17,6 +17,7 @@
package org.apache.pdfbox.pdmodel.interactive.annotation;
import org.apache.pdfbox.cos.COSArray;
+import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSDictionary;
import org.apache.pdfbox.cos.COSFloat;
import org.apache.pdfbox.cos.COSName;
@@ -292,15 +293,12 @@ public class PDAnnotationLine extends PD
@Override
public PDBorderStyleDictionary getBorderStyle()
{
- COSDictionary bs = (COSDictionary) this.getCOSObject().getDictionaryObject(COSName.BS);
- if (bs != null)
+ COSBase bs = getCOSObject().getDictionaryObject(COSName.BS);
+ if (bs instanceof COSDictionary)
{
- return new PDBorderStyleDictionary(bs);
- }
- else
- {
- return null;
+ return new PDBorderStyleDictionary((COSDictionary) bs);
}
+ return null;
}
/**
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationLink.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationLink.java?rev=1732209&r1=1732208&r2=1732209&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationLink.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationLink.java Wed Feb 24 19:24:24 2016
@@ -119,7 +119,7 @@ public class PDAnnotationLink extends PD
*/
public PDBorderStyleDictionary getBorderStyle()
{
- COSBase bs = this.getCOSObject().getDictionaryObject(COSName.BS);
+ COSBase bs = getCOSObject().getDictionaryObject(COSName.BS);
if (bs instanceof COSDictionary)
{
return new PDBorderStyleDictionary((COSDictionary) bs);
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationMarkup.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationMarkup.java?rev=1732209&r1=1732208&r2=1732209&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationMarkup.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationMarkup.java Wed Feb 24 19:24:24 2016
@@ -343,15 +343,12 @@ public class PDAnnotationMarkup extends
*/
public PDBorderStyleDictionary getBorderStyle()
{
- COSDictionary bs = (COSDictionary) this.getCOSObject().getDictionaryObject(COSName.BS);
- if (bs != null)
+ COSBase bs = getCOSObject().getDictionaryObject(COSName.BS);
+ if (bs instanceof COSDictionary)
{
- return new PDBorderStyleDictionary(bs);
- }
- else
- {
- return null;
+ return new PDBorderStyleDictionary((COSDictionary) bs);
}
+ return null;
}
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationSquareCircle.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationSquareCircle.java?rev=1732209&r1=1732208&r2=1732209&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationSquareCircle.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationSquareCircle.java Wed Feb 24 19:24:24 2016
@@ -17,6 +17,7 @@
package org.apache.pdfbox.pdmodel.interactive.annotation;
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.pdmodel.common.PDRectangle;
@@ -183,15 +184,12 @@ public class PDAnnotationSquareCircle ex
@Override
public PDBorderStyleDictionary getBorderStyle()
{
- COSDictionary bs = (COSDictionary) this.getCOSObject().getDictionaryObject(COSName.BS);
- if (bs != null)
+ COSBase bs = getCOSObject().getDictionaryObject(COSName.BS);
+ if (bs instanceof COSDictionary)
{
- return new PDBorderStyleDictionary(bs);
- }
- else
- {
- return null;
+ return new PDBorderStyleDictionary((COSDictionary) bs);
}
+ return null;
}
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationWidget.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationWidget.java?rev=1732209&r1=1732208&r2=1732209&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationWidget.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationWidget.java Wed Feb 24 19:24:24 2016
@@ -203,15 +203,12 @@ public class PDAnnotationWidget extends
*/
public PDBorderStyleDictionary getBorderStyle()
{
- COSDictionary bs = (COSDictionary) this.getCOSObject().getDictionaryObject(COSName.BS);
- if (bs != null)
+ COSBase bs = getCOSObject().getDictionaryObject(COSName.BS);
+ if (bs instanceof COSDictionary)
{
- return new PDBorderStyleDictionary(bs);
- }
- else
- {
- return null;
+ return new PDBorderStyleDictionary((COSDictionary) bs);
}
+ return null;
}
// TODO where to get acroForm from?