You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ms...@apache.org on 2014/12/20 15:55:36 UTC
svn commit: r1646999 - in /pdfbox/trunk/pdfbox/src:
main/java/org/apache/pdfbox/pdmodel/interactive/form/PDCheckbox.java
main/java/org/apache/pdfbox/pdmodel/interactive/form/PDRadioButton.java
test/java/org/apache/pdfbox/pdmodel/TestFDF.java
Author: msahyoun
Date: Sat Dec 20 14:55:36 2014
New Revision: 1646999
URL: http://svn.apache.org/r1646999
Log:
PDFBOX-2516 use Java types instead of COS model types
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDCheckbox.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDRadioButton.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestFDF.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDCheckbox.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDCheckbox.java?rev=1646999&r1=1646998&r2=1646999&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDCheckbox.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDCheckbox.java Sat Dec 20 14:55:36 2014
@@ -138,7 +138,7 @@ public final class PDCheckbox extends PD
@Override
public COSName getDefaultValue() throws IOException
{
- COSBase attribute = getInheritableAttribute(getDictionary(), COSName.V);
+ COSBase attribute = getInheritableAttribute(COSName.V);
if (attribute instanceof COSName)
{
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDRadioButton.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDRadioButton.java?rev=1646999&r1=1646998&r2=1646999&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDRadioButton.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDRadioButton.java Sat Dec 20 14:55:36 2014
@@ -70,7 +70,7 @@ public final class PDRadioButton extends
@Override
public COSName getDefaultValue() throws IOException
{
- COSBase attribute = getInheritableAttribute(getDictionary(), COSName.DV);
+ COSBase attribute = getInheritableAttribute(COSName.DV);
if (attribute instanceof COSName)
{
@@ -98,22 +98,22 @@ public final class PDRadioButton extends
{
if (defaultValue == null)
{
- removeInheritableAttribute(getDictionary(),COSName.DV);
+ removeInheritableAttribute(COSName.DV);
}
else
{
- setInheritableAttribute(getDictionary(), COSName.DV, defaultValue);
+ setInheritableAttribute(COSName.DV, defaultValue);
}
}
@Override
- public COSName getValue() throws IOException
+ public String getValue() throws IOException
{
- COSBase attribute = getInheritableAttribute(getDictionary(), COSName.V);
+ COSBase attribute = getInheritableAttribute(COSName.V);
if (attribute instanceof COSName)
{
- return (COSName) attribute;
+ return ((COSName) attribute).getName();
}
else
{
@@ -131,15 +131,15 @@ public final class PDRadioButton extends
*
* @param value the COSName object to set the field value.
*/
- public void setValue(COSName value)
+ public void setValue(String value)
{
if (value == null)
{
- removeInheritableAttribute(getDictionary(),COSName.V);
+ removeInheritableAttribute(COSName.V);
}
else
{
- setInheritableAttribute(getDictionary(),COSName.V, value);
+ setInheritableAttribute(COSName.V, COSName.getPDFName(value));
List<COSObjectable> kids = getKids();
for (COSObjectable kid : kids)
{
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestFDF.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestFDF.java?rev=1646999&r1=1646998&r2=1646999&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestFDF.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/TestFDF.java Sat Dec 20 14:55:36 2014
@@ -182,8 +182,8 @@ public class TestFDF extends TestCase
testContentStreams( fdeb, feld2, expected );
PDRadioButton feld3 = (PDRadioButton)form.getField( "Feld.3" );
- feld3.setValue(COSName.getPDFName("RB1"));
- assertEquals( "RB1", feld3.getValue().getName() );
+ feld3.setValue("RB1");
+ assertEquals( "RB1", feld3.getValue());
}
finally
{