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 2014/11/18 18:37:20 UTC
svn commit: r1640397 - in
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form:
PDField.java PDFieldTreeNode.java
Author: tilman
Date: Tue Nov 18 17:37:19 2014
New Revision: 1640397
URL: http://svn.apache.org/r1640397
Log:
PDFBOX-2486: move getActions() method from PDField to PDFieldTreeNode as suggested by Maruan Sahyoun; minor code cleanup
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDField.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDFieldTreeNode.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDField.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDField.java?rev=1640397&r1=1640396&r2=1640397&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDField.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDField.java Tue Nov 18 17:37:19 2014
@@ -64,23 +64,6 @@ public abstract class PDField extends PD
}
/**
- * Get the additional actions for this field. This will return null if there are no additional actions for this
- * field.
- *
- * @return The actions of the field.
- */
- public PDFormFieldAdditionalActions getActions()
- {
- COSDictionary aa = (COSDictionary) getDictionary().getDictionaryObject(COSName.AA);
- PDFormFieldAdditionalActions retval = null;
- if (aa != null)
- {
- retval = new PDFormFieldAdditionalActions(aa);
- }
- return retval;
- }
-
- /**
* Set the actions of the field.
*
* @param actions The field actions.
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDFieldTreeNode.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDFieldTreeNode.java?rev=1640397&r1=1640396&r2=1640397&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDFieldTreeNode.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDFieldTreeNode.java Tue Nov 18 17:37:19 2014
@@ -28,6 +28,7 @@ import org.apache.pdfbox.pdmodel.common.
import org.apache.pdfbox.pdmodel.common.COSObjectable;
import org.apache.pdfbox.pdmodel.common.PDTextStream;
import org.apache.pdfbox.pdmodel.fdf.FDFField;
+import org.apache.pdfbox.pdmodel.interactive.action.PDFormFieldAdditionalActions;
import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationWidget;
/**
@@ -208,6 +209,23 @@ public abstract class PDFieldTreeNode im
}
/**
+ * Get the additional actions for this field. This will return null if there
+ * are no additional actions for this field.
+ *
+ * @return The actions of the field.
+ */
+ public PDFormFieldAdditionalActions getActions()
+ {
+ COSDictionary aa = (COSDictionary) getDictionary().getDictionaryObject(COSName.AA);
+ PDFormFieldAdditionalActions retval = null;
+ if (aa != null)
+ {
+ retval = new PDFormFieldAdditionalActions(aa);
+ }
+ return retval;
+ }
+
+ /**
* This will import a fdf field from a fdf document.
*
* @param fdfField The fdf field to import.
@@ -274,7 +292,7 @@ public abstract class PDFieldTreeNode im
{
int annotFlags = widget.getAnnotationFlags();
Integer f = fdfField.getWidgetFieldFlags();
- if (f != null && widget != null)
+ if (f != null)
{
widget.setAnnotationFlags(f);
}
@@ -353,10 +371,6 @@ public abstract class PDFieldTreeNode im
retval = ((PDFieldTreeNode) firstKid).getWidget();
}
}
- else
- {
- retval = null;
- }
return retval;
}
@@ -526,6 +540,7 @@ public abstract class PDFieldTreeNode im
*
* @return The cos object that matches this Java object.
*/
+ @Override
public COSBase getCOSObject()
{
return dictionary;