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 2019/08/13 18:11:00 UTC
svn commit: r1865063 -
/pdfbox/branches/issue4569/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDAbstractAppearanceHandler.java
Author: tilman
Date: Tue Aug 13 18:11:00 2019
New Revision: 1865063
URL: http://svn.apache.org/viewvc?rev=1865063&view=rev
Log:
PDFBOX-4080: pass PDDocument to construct appearances + use existing scratch file when possible, as suggested by Ghenadii Batalski
Modified:
pdfbox/branches/issue4569/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDAbstractAppearanceHandler.java
Modified: pdfbox/branches/issue4569/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDAbstractAppearanceHandler.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/issue4569/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDAbstractAppearanceHandler.java?rev=1865063&r1=1865062&r2=1865063&view=diff
==============================================================================
--- pdfbox/branches/issue4569/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDAbstractAppearanceHandler.java (original)
+++ pdfbox/branches/issue4569/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDAbstractAppearanceHandler.java Tue Aug 13 18:11:00 2019
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
+import org.apache.pdfbox.cos.COSDictionary;
import org.apache.pdfbox.cos.COSStream;
import org.apache.pdfbox.pdmodel.PDResources;
@@ -30,6 +31,7 @@ import org.apache.pdfbox.pdmodel.graphic
import org.apache.pdfbox.pdmodel.graphics.state.PDExtendedGraphicsState;
import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotation;
import org.apache.pdfbox.pdmodel.PDAppearanceContentStream;
+import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationLine;
import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationSquareCircle;
import org.apache.pdfbox.pdmodel.interactive.annotation.PDAppearanceDictionary;
@@ -46,6 +48,7 @@ import org.apache.pdfbox.pdmodel.interac
public abstract class PDAbstractAppearanceHandler implements PDAppearanceHandler
{
private final PDAnnotation annotation;
+ protected PDDocument document;
/**
* Line ending styles where the line has to be drawn shorter (minus line width).
@@ -66,7 +69,13 @@ public abstract class PDAbstractAppearan
public PDAbstractAppearanceHandler(PDAnnotation annotation)
{
+ this(annotation, null);
+ }
+
+ public PDAbstractAppearanceHandler(PDAnnotation annotation, PDDocument document)
+ {
this.annotation = annotation;
+ this.document = document;
}
@Override
@@ -92,6 +101,11 @@ public abstract class PDAbstractAppearan
{
return annotation.getRectangle();
}
+
+ protected COSDictionary getDictionary()
+ {
+ return document == null ? new COSStream() : document.getDocument().createCOSStream();
+ }
/**
* Get the annotations appearance dictionary.
@@ -161,8 +175,7 @@ public abstract class PDAbstractAppearan
if (downAppearanceEntry.isSubDictionary())
{
- //TODO replace with "document.getDocument().createCOSStream()"
- downAppearanceEntry = new PDAppearanceEntry(new COSStream());
+ downAppearanceEntry = new PDAppearanceEntry(getDictionary());
appearanceDictionary.setDownAppearance(downAppearanceEntry);
}
@@ -185,8 +198,7 @@ public abstract class PDAbstractAppearan
if (rolloverAppearanceEntry.isSubDictionary())
{
- //TODO replace with "document.getDocument().createCOSStream()"
- rolloverAppearanceEntry = new PDAppearanceEntry(new COSStream());
+ rolloverAppearanceEntry = new PDAppearanceEntry(getDictionary());
appearanceDictionary.setRolloverAppearance(rolloverAppearanceEntry);
}
@@ -465,8 +477,7 @@ public abstract class PDAbstractAppearan
if (normalAppearanceEntry == null || normalAppearanceEntry.isSubDictionary())
{
- //TODO replace with "document.getDocument().createCOSStream()"
- normalAppearanceEntry = new PDAppearanceEntry(new COSStream());
+ normalAppearanceEntry = new PDAppearanceEntry(getDictionary());
appearanceDictionary.setNormalAppearance(normalAppearanceEntry);
}