Author: msahyoun
Date: Sun May 22 15:27:48 2016
New Revision: 1745069
URL: http://svn.apache.org/viewvc?rev=1745069&view=rev
Log:
PDFBOX-3353: use PDAppearanceContentStream for PDPageContentStream
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/AppearanceGeneratorHelper.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDDefaultAppearanceString.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PlainTextFormatter.java
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/AppearanceGeneratorHelper.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/AppearanceGeneratorHelper.java?rev=1745069&r1=1745068&r2=1745069&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/AppearanceGeneratorHelper.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/AppearanceGeneratorHelper.java
Sun May 22 15:27:48 2016
@@ -26,13 +26,13 @@ import org.apache.pdfbox.contentstream.o
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.pdfparser.PDFStreamParser;
import org.apache.pdfbox.pdfwriter.ContentStreamWriter;
-import org.apache.pdfbox.pdmodel.PDPageContentStream;
import org.apache.pdfbox.pdmodel.common.PDRectangle;
import org.apache.pdfbox.pdmodel.font.PDFont;
import org.apache.pdfbox.pdmodel.graphics.color.PDColor;
import
org.apache.pdfbox.pdmodel.interactive.action.PDFormFieldAdditionalActions;
import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationWidget;
import
org.apache.pdfbox.pdmodel.interactive.annotation.PDAppearanceCharacteristicsDictionary;
+import
org.apache.pdfbox.pdmodel.interactive.annotation.PDAppearanceContentStream;
import org.apache.pdfbox.pdmodel.interactive.annotation.PDAppearanceDictionary;
import org.apache.pdfbox.pdmodel.interactive.annotation.PDAppearanceEntry;
import org.apache.pdfbox.pdmodel.interactive.annotation.PDAppearanceStream;
@@ -186,8 +186,7 @@ class AppearanceGeneratorHelper
private void initializeAppearanceContent(PDAnnotationWidget widget,
PDAppearanceStream appearanceStream) throws IOException
{
ByteArrayOutputStream output = new ByteArrayOutputStream();
- PDPageContentStream contents = new
PDPageContentStream(field.getAcroForm().getDocument(),
- appearanceStream, output);
+ PDAppearanceContentStream contents = new
PDAppearanceContentStream(appearanceStream, output);
PDAppearanceCharacteristicsDictionary appearanceCharacteristics =
widget.getAppearanceCharacteristics();
// TODO: support more entries like patterns, background color etc.
@@ -286,8 +285,7 @@ class AppearanceGeneratorHelper
PDAppearanceStream appearanceStream,
OutputStream output) throws
IOException
{
- PDPageContentStream contents = new
PDPageContentStream(field.getAcroForm().getDocument(),
-
appearanceStream, output);
+ PDAppearanceContentStream contents = new
PDAppearanceContentStream(appearanceStream, output);
PDRectangle bbox = resolveBoundingBox(widget, appearanceStream);
@@ -467,7 +465,7 @@ class AppearanceGeneratorHelper
* @param fontSize the font size to be used
* @throws IOException
*/
- private void insertGeneratedCombAppearance(PDPageContentStream contents,
PDAppearanceStream appearanceStream,
+ private void insertGeneratedCombAppearance(PDAppearanceContentStream
contents, PDAppearanceStream appearanceStream,
PDFont font, float fontSize) throws IOException
{
@@ -507,7 +505,7 @@ class AppearanceGeneratorHelper
}
}
- private void insertGeneratedSelectionHighlight(PDPageContentStream
contents, PDAppearanceStream appearanceStream,
+ private void insertGeneratedSelectionHighlight(PDAppearanceContentStream
contents, PDAppearanceStream appearanceStream,
PDFont font, float fontSize) throws IOException
{
List<Integer> indexEntries = ((PDListBox)
field).getSelectedOptionsIndex();
@@ -551,7 +549,7 @@ class AppearanceGeneratorHelper
}
- private void insertGeneratedListboxAppearance(PDPageContentStream
contents, PDAppearanceStream appearanceStream,
+ private void insertGeneratedListboxAppearance(PDAppearanceContentStream
contents, PDAppearanceStream appearanceStream,
PDRectangle contentRect, PDFont font, float fontSize) throws
IOException
{
contents.setNonStrokingColor(0);
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDDefaultAppearanceString.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDDefaultAppearanceString.java?rev=1745069&r1=1745068&r2=1745069&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDDefaultAppearanceString.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDDefaultAppearanceString.java
Sun May 22 15:27:48 2016
@@ -29,13 +29,13 @@ import org.apache.pdfbox.cos.COSNumber;
import org.apache.pdfbox.cos.COSObject;
import org.apache.pdfbox.cos.COSString;
import org.apache.pdfbox.pdfparser.PDFStreamParser;
-import org.apache.pdfbox.pdmodel.PDPageContentStream;
import org.apache.pdfbox.pdmodel.PDResources;
import org.apache.pdfbox.pdmodel.font.PDFont;
import org.apache.pdfbox.pdmodel.graphics.color.PDColor;
import org.apache.pdfbox.pdmodel.graphics.color.PDColorSpace;
import org.apache.pdfbox.pdmodel.graphics.color.PDDeviceColorSpace;
import org.apache.pdfbox.pdmodel.graphics.color.PDDeviceRGB;
+import
org.apache.pdfbox.pdmodel.interactive.annotation.PDAppearanceContentStream;
import org.apache.pdfbox.pdmodel.interactive.annotation.PDAppearanceStream;
/**
@@ -272,7 +272,7 @@ class PDDefaultAppearanceString
/**
* Writes the DA string to the given content stream.
*/
- void writeTo(PDPageContentStream contents, float zeroFontSize) throws
IOException
+ void writeTo(PDAppearanceContentStream contents, float zeroFontSize)
throws IOException
{
float fontSize = getFontSize();
if (fontSize == 0)
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PlainTextFormatter.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PlainTextFormatter.java?rev=1745069&r1=1745068&r2=1745069&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PlainTextFormatter.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PlainTextFormatter.java
Sun May 22 15:27:48 2016
@@ -19,7 +19,7 @@ package org.apache.pdfbox.pdmodel.intera
import java.io.IOException;
import java.util.List;
-import org.apache.pdfbox.pdmodel.PDPageContentStream;
+import
org.apache.pdfbox.pdmodel.interactive.annotation.PDAppearanceContentStream;
import org.apache.pdfbox.pdmodel.interactive.form.PlainText.Line;
import org.apache.pdfbox.pdmodel.interactive.form.PlainText.Paragraph;
import org.apache.pdfbox.pdmodel.interactive.form.PlainText.TextAttribute;
@@ -73,7 +73,7 @@ class PlainTextFormatter
private final boolean wrapLines;
private final float width;
- private final PDPageContentStream contents;
+ private final PDAppearanceContentStream contents;
private final PlainText textContent;
private final TextAlign textAlignment;
@@ -84,7 +84,7 @@ class PlainTextFormatter
{
// required parameters
- private PDPageContentStream contents;
+ private PDAppearanceContentStream contents;
// optional parameters
private AppearanceStyle appearanceStyle;
@@ -98,7 +98,7 @@ class PlainTextFormatter
private float horizontalOffset = 0f;
private float verticalOffset = 0f;
- Builder(PDPageContentStream contents)
+ Builder(PDAppearanceContentStream contents)
{
this.contents = contents;
}
