Skip to content

extract setCOSValue in PDField.importFDF #291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

extract setCOSValue in PDField.importFDF #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDChoice.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,19 @@ public void setSelectedOptionsIndex(List<Integer> values)
}
}

@Override
protected void setCOSValue(COSBase fieldValue) throws IOException
{
if (fieldValue instanceof COSArray)
{
setValue(((COSArray) fieldValue).toCOSStringStringList());
}
else
{
super.setCOSValue(fieldValue);
}
}

/**
* Determines if Sort is set.
*
Expand Down
42 changes: 10 additions & 32 deletions pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDField.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSDictionary;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.cos.COSStream;
import org.apache.pdfbox.cos.COSString;
import org.apache.pdfbox.pdmodel.common.COSObjectable;
import org.apache.pdfbox.pdmodel.fdf.FDFField;
import org.apache.pdfbox.pdmodel.interactive.action.PDFormFieldAdditionalActions;
Expand Down Expand Up @@ -227,6 +225,14 @@ public PDFormFieldAdditionalActions getActions()
return aa != null ? new PDFormFieldAdditionalActions(aa) : null;
}

protected void setCOSValue(COSBase fieldValue) throws IOException
{
if (fieldValue != null)
{
dictionary.setItem(COSName.V, fieldValue);
}
}

/**
* This will import a fdf field from a fdf document.
*
Expand All @@ -236,36 +242,8 @@ public PDFormFieldAdditionalActions getActions()
void importFDF(FDFField fdfField) throws IOException
{
COSBase fieldValue = fdfField.getCOSValue();

if (fieldValue != null && this instanceof PDTerminalField)
{
PDTerminalField currentField = (PDTerminalField) this;

if (fieldValue instanceof COSName)
{
currentField.setValue(((COSName) fieldValue).getName());
}
else if (fieldValue instanceof COSString)
{
currentField.setValue(((COSString) fieldValue).getString());
}
else if (fieldValue instanceof COSStream)
{
currentField.setValue(((COSStream) fieldValue).toTextString());
}
else if (fieldValue instanceof COSArray && this instanceof PDChoice)
{
((PDChoice) this).setValue(((COSArray) fieldValue).toCOSStringStringList());
}
else
{
throw new IOException("Error:Unknown type for field import" + fieldValue);
}
}
else if (fieldValue != null)
{
dictionary.setItem(COSName.V, fieldValue);
}

setCOSValue(fieldValue);

Integer ff = fdfField.getFieldFlags();
if (ff != null)
Expand Down
26 changes: 26 additions & 0 deletions pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDTerminalField.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSDictionary;
import org.apache.pdfbox.cos.COSInteger;
import org.apache.pdfbox.cos.COSString;
import org.apache.pdfbox.cos.COSStream;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.pdmodel.fdf.FDFField;
import org.apache.pdfbox.pdmodel.interactive.action.PDFormFieldAdditionalActions;
Expand Down Expand Up @@ -95,6 +97,30 @@ public String getFieldType()
return fieldType;
}

@Override
protected void setCOSValue(COSBase fieldValue) throws IOException
{
if (fieldValue != null)
{
if (fieldValue instanceof COSName)
{
setValue(((COSName) fieldValue).getName());
}
else if (fieldValue instanceof COSString)
{
setValue(((COSString) fieldValue).getString());
}
else if (fieldValue instanceof COSStream)
{
setValue(((COSStream) fieldValue).toTextString());
}
else
{
throw new IOException("Error:Unknown type for field import" + fieldValue);
}
}
}

@Override
public void importFDF(FDFField fdfField) throws IOException
{
Expand Down