You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ja...@apache.org on 2014/02/25 23:31:57 UTC
svn commit: r1571845 - in
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox: cos/ pdmodel/fdf/
pdmodel/interactive/annotation/ pdmodel/interactive/digitalsignature/
pdmodel/interactive/documentnavigation/outline/ pdmodel/interactive/form/
util/
Author: jahewson
Date: Tue Feb 25 22:31:56 2014
New Revision: 1571845
URL: http://svn.apache.org/r1571845
Log:
Removed BitFlagHelper and moved its functionality into COSDictionary
Removed:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/BitFlagHelper.java
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotation.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotation.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/PDSeedValue.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/documentnavigation/outline/PDOutlineItem.java
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/PDRadioCollection.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDVariableText.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java?rev=1571845&r1=1571844&r2=1571845&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/COSDictionary.java Tue Feb 25 22:31:56 2014
@@ -565,6 +565,27 @@ public class COSDictionary extends COSBa
setItem( key, fltVal );
}
+ /**
+ * Sets the given boolean value at bitPos in the flags.
+ *
+ * @param field The COSName of the field to set the value into.
+ * @param bitFlag the bit position to set the value in.
+ * @param value the value the bit position should have.
+ */
+ public void setFlag(COSName field, int bitFlag, boolean value)
+ {
+ int currentFlags = getInt(field, 0);
+ if (value)
+ {
+ currentFlags = currentFlags | bitFlag;
+ }
+ else
+ {
+ currentFlags &= ~bitFlag;
+ }
+ setInt(field, currentFlags);
+ }
+
/**
* This is a convenience method that will get the dictionary object that
* is expected to be a name and convert it to a string. Null is returned
@@ -1249,6 +1270,20 @@ public class COSDictionary extends COSBa
return retval;
}
+ /**
+ * Gets the boolean value from the flags at the given bit position.
+ *
+ * @param field The COSName of the field to get the flag from.
+ * @param bitFlag the bitPosition to get the value from.
+ *
+ * @return true if the number at bitPos is '1'
+ */
+ public boolean getFlag(COSName field, int bitFlag)
+ {
+ int ff = getInt(field, 0);
+ return (ff & bitFlag) == bitFlag;
+ }
+
/**
* This will remove an item for the dictionary. This
* will do nothing of the object does not exist.
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotation.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotation.java?rev=1571845&r1=1571844&r2=1571845&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotation.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotation.java Tue Feb 25 22:31:56 2014
@@ -29,7 +29,6 @@ import org.apache.pdfbox.cos.COSNumber;
import org.apache.pdfbox.pdmodel.common.COSObjectable;
import org.apache.pdfbox.pdmodel.common.PDRectangle;
import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotation;
-import org.apache.pdfbox.util.BitFlagHelper;
import org.apache.pdfbox.util.DateConverter;
import org.w3c.dom.Element;
@@ -303,7 +302,7 @@ public abstract class FDFAnnotation impl
*/
public boolean isInvisible()
{
- return BitFlagHelper.getFlag( annot, COSName.F, PDAnnotation.FLAG_INVISIBLE );
+ return annot.getFlag( COSName.F, PDAnnotation.FLAG_INVISIBLE );
}
/**
@@ -313,7 +312,7 @@ public abstract class FDFAnnotation impl
*/
public void setInvisible( boolean invisible )
{
- BitFlagHelper.setFlag( annot, COSName.F, PDAnnotation.FLAG_INVISIBLE, invisible );
+ annot.setFlag( COSName.F, PDAnnotation.FLAG_INVISIBLE, invisible );
}
/**
@@ -323,7 +322,7 @@ public abstract class FDFAnnotation impl
*/
public boolean isHidden()
{
- return BitFlagHelper.getFlag( annot, COSName.F, PDAnnotation.FLAG_HIDDEN );
+ return annot.getFlag( COSName.F, PDAnnotation.FLAG_HIDDEN );
}
/**
@@ -333,7 +332,7 @@ public abstract class FDFAnnotation impl
*/
public void setHidden( boolean hidden )
{
- BitFlagHelper.setFlag( annot, COSName.F, PDAnnotation.FLAG_HIDDEN, hidden );
+ annot.setFlag( COSName.F, PDAnnotation.FLAG_HIDDEN, hidden );
}
/**
@@ -343,7 +342,7 @@ public abstract class FDFAnnotation impl
*/
public boolean isPrinted()
{
- return BitFlagHelper.getFlag( annot, COSName.F, PDAnnotation.FLAG_PRINTED );
+ return annot.getFlag( COSName.F, PDAnnotation.FLAG_PRINTED );
}
/**
@@ -353,7 +352,7 @@ public abstract class FDFAnnotation impl
*/
public void setPrinted( boolean printed )
{
- BitFlagHelper.setFlag( annot, COSName.F, PDAnnotation.FLAG_PRINTED, printed );
+ annot.setFlag( COSName.F, PDAnnotation.FLAG_PRINTED, printed );
}
/**
@@ -363,7 +362,7 @@ public abstract class FDFAnnotation impl
*/
public boolean isNoZoom()
{
- return BitFlagHelper.getFlag( annot, COSName.F, PDAnnotation.FLAG_NO_ZOOM );
+ return annot.getFlag( COSName.F, PDAnnotation.FLAG_NO_ZOOM );
}
/**
@@ -373,7 +372,7 @@ public abstract class FDFAnnotation impl
*/
public void setNoZoom( boolean noZoom )
{
- BitFlagHelper.setFlag( annot, COSName.F, PDAnnotation.FLAG_NO_ZOOM, noZoom );
+ annot.setFlag( COSName.F, PDAnnotation.FLAG_NO_ZOOM, noZoom );
}
/**
@@ -383,7 +382,7 @@ public abstract class FDFAnnotation impl
*/
public boolean isNoRotate()
{
- return BitFlagHelper.getFlag( annot, COSName.F, PDAnnotation.FLAG_NO_ROTATE );
+ return annot.getFlag( COSName.F, PDAnnotation.FLAG_NO_ROTATE );
}
/**
@@ -393,7 +392,7 @@ public abstract class FDFAnnotation impl
*/
public void setNoRotate( boolean noRotate )
{
- BitFlagHelper.setFlag( annot, COSName.F, PDAnnotation.FLAG_NO_ROTATE, noRotate );
+ annot.setFlag( COSName.F, PDAnnotation.FLAG_NO_ROTATE, noRotate );
}
/**
@@ -403,7 +402,7 @@ public abstract class FDFAnnotation impl
*/
public boolean isNoView()
{
- return BitFlagHelper.getFlag( annot, COSName.F, PDAnnotation.FLAG_NO_VIEW );
+ return annot.getFlag( COSName.F, PDAnnotation.FLAG_NO_VIEW );
}
/**
@@ -413,7 +412,7 @@ public abstract class FDFAnnotation impl
*/
public void setNoView( boolean noView )
{
- BitFlagHelper.setFlag( annot, COSName.F, PDAnnotation.FLAG_NO_VIEW, noView );
+ annot.setFlag( COSName.F, PDAnnotation.FLAG_NO_VIEW, noView );
}
/**
@@ -423,7 +422,7 @@ public abstract class FDFAnnotation impl
*/
public boolean isReadOnly()
{
- return BitFlagHelper.getFlag( annot, COSName.F, PDAnnotation.FLAG_READ_ONLY );
+ return annot.getFlag( COSName.F, PDAnnotation.FLAG_READ_ONLY );
}
/**
@@ -433,7 +432,7 @@ public abstract class FDFAnnotation impl
*/
public void setReadOnly( boolean readOnly )
{
- BitFlagHelper.setFlag( annot, COSName.F, PDAnnotation.FLAG_READ_ONLY, readOnly );
+ annot.setFlag( COSName.F, PDAnnotation.FLAG_READ_ONLY, readOnly );
}
/**
@@ -443,7 +442,7 @@ public abstract class FDFAnnotation impl
*/
public boolean isLocked()
{
- return BitFlagHelper.getFlag( annot, COSName.F, PDAnnotation.FLAG_LOCKED );
+ return annot.getFlag( COSName.F, PDAnnotation.FLAG_LOCKED );
}
/**
@@ -453,7 +452,7 @@ public abstract class FDFAnnotation impl
*/
public void setLocked( boolean locked )
{
- BitFlagHelper.setFlag( annot, COSName.F, PDAnnotation.FLAG_LOCKED, locked );
+ annot.setFlag( COSName.F, PDAnnotation.FLAG_LOCKED, locked );
}
/**
@@ -463,7 +462,7 @@ public abstract class FDFAnnotation impl
*/
public boolean isToggleNoView()
{
- return BitFlagHelper.getFlag( annot, COSName.F, PDAnnotation.FLAG_TOGGLE_NO_VIEW );
+ return annot.getFlag( COSName.F, PDAnnotation.FLAG_TOGGLE_NO_VIEW );
}
/**
@@ -473,7 +472,7 @@ public abstract class FDFAnnotation impl
*/
public void setToggleNoView( boolean toggleNoView )
{
- BitFlagHelper.setFlag( annot, COSName.F, PDAnnotation.FLAG_TOGGLE_NO_VIEW, toggleNoView );
+ annot.setFlag( COSName.F, PDAnnotation.FLAG_TOGGLE_NO_VIEW, toggleNoView );
}
/**
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotation.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotation.java?rev=1571845&r1=1571844&r2=1571845&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotation.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotation.java Tue Feb 25 22:31:56 2014
@@ -28,7 +28,6 @@ import org.apache.pdfbox.pdmodel.PDPage;
import org.apache.pdfbox.pdmodel.common.COSObjectable;
import org.apache.pdfbox.pdmodel.common.PDRectangle;
import org.apache.pdfbox.pdmodel.graphics.color.PDGamma;
-import org.apache.pdfbox.util.BitFlagHelper;
/**
* This class represents a PDF annotation.
@@ -323,7 +322,7 @@ public abstract class PDAnnotation imple
*/
public boolean isInvisible()
{
- return BitFlagHelper.getFlag(getDictionary(), COSName.F, FLAG_INVISIBLE);
+ return getDictionary().getFlag( COSName.F, FLAG_INVISIBLE);
}
/**
@@ -333,7 +332,7 @@ public abstract class PDAnnotation imple
*/
public void setInvisible(boolean invisible)
{
- BitFlagHelper.setFlag(getDictionary(), COSName.F, FLAG_INVISIBLE, invisible);
+ getDictionary().setFlag( COSName.F, FLAG_INVISIBLE, invisible);
}
/**
@@ -343,7 +342,7 @@ public abstract class PDAnnotation imple
*/
public boolean isHidden()
{
- return BitFlagHelper.getFlag(getDictionary(), COSName.F, FLAG_HIDDEN);
+ return getDictionary().getFlag( COSName.F, FLAG_HIDDEN);
}
/**
@@ -353,7 +352,7 @@ public abstract class PDAnnotation imple
*/
public void setHidden(boolean hidden)
{
- BitFlagHelper.setFlag(getDictionary(), COSName.F, FLAG_HIDDEN, hidden);
+ getDictionary().setFlag( COSName.F, FLAG_HIDDEN, hidden);
}
/**
@@ -363,7 +362,7 @@ public abstract class PDAnnotation imple
*/
public boolean isPrinted()
{
- return BitFlagHelper.getFlag(getDictionary(), COSName.F, FLAG_PRINTED);
+ return getDictionary().getFlag( COSName.F, FLAG_PRINTED);
}
/**
@@ -373,7 +372,7 @@ public abstract class PDAnnotation imple
*/
public void setPrinted(boolean printed)
{
- BitFlagHelper.setFlag(getDictionary(), COSName.F, FLAG_PRINTED, printed);
+ getDictionary().setFlag( COSName.F, FLAG_PRINTED, printed);
}
/**
@@ -383,7 +382,7 @@ public abstract class PDAnnotation imple
*/
public boolean isNoZoom()
{
- return BitFlagHelper.getFlag(getDictionary(), COSName.F, FLAG_NO_ZOOM);
+ return getDictionary().getFlag( COSName.F, FLAG_NO_ZOOM);
}
/**
@@ -393,7 +392,7 @@ public abstract class PDAnnotation imple
*/
public void setNoZoom(boolean noZoom)
{
- BitFlagHelper.setFlag(getDictionary(), COSName.F, FLAG_NO_ZOOM, noZoom);
+ getDictionary().setFlag( COSName.F, FLAG_NO_ZOOM, noZoom);
}
/**
@@ -403,7 +402,7 @@ public abstract class PDAnnotation imple
*/
public boolean isNoRotate()
{
- return BitFlagHelper.getFlag(getDictionary(), COSName.F, FLAG_NO_ROTATE);
+ return getDictionary().getFlag( COSName.F, FLAG_NO_ROTATE);
}
/**
@@ -413,7 +412,7 @@ public abstract class PDAnnotation imple
*/
public void setNoRotate(boolean noRotate)
{
- BitFlagHelper.setFlag(getDictionary(), COSName.F, FLAG_NO_ROTATE, noRotate);
+ getDictionary().setFlag( COSName.F, FLAG_NO_ROTATE, noRotate);
}
/**
@@ -423,7 +422,7 @@ public abstract class PDAnnotation imple
*/
public boolean isNoView()
{
- return BitFlagHelper.getFlag(getDictionary(), COSName.F, FLAG_NO_VIEW);
+ return getDictionary().getFlag( COSName.F, FLAG_NO_VIEW);
}
/**
@@ -433,7 +432,7 @@ public abstract class PDAnnotation imple
*/
public void setNoView(boolean noView)
{
- BitFlagHelper.setFlag(getDictionary(), COSName.F, FLAG_NO_VIEW, noView);
+ getDictionary().setFlag( COSName.F, FLAG_NO_VIEW, noView);
}
/**
@@ -443,7 +442,7 @@ public abstract class PDAnnotation imple
*/
public boolean isReadOnly()
{
- return BitFlagHelper.getFlag(getDictionary(), COSName.F, FLAG_READ_ONLY);
+ return getDictionary().getFlag( COSName.F, FLAG_READ_ONLY);
}
/**
@@ -453,7 +452,7 @@ public abstract class PDAnnotation imple
*/
public void setReadOnly(boolean readOnly)
{
- BitFlagHelper.setFlag(getDictionary(), COSName.F, FLAG_READ_ONLY, readOnly);
+ getDictionary().setFlag( COSName.F, FLAG_READ_ONLY, readOnly);
}
/**
@@ -463,7 +462,7 @@ public abstract class PDAnnotation imple
*/
public boolean isLocked()
{
- return BitFlagHelper.getFlag(getDictionary(), COSName.F, FLAG_LOCKED);
+ return getDictionary().getFlag( COSName.F, FLAG_LOCKED);
}
/**
@@ -473,7 +472,7 @@ public abstract class PDAnnotation imple
*/
public void setLocked(boolean locked)
{
- BitFlagHelper.setFlag(getDictionary(), COSName.F, FLAG_LOCKED, locked);
+ getDictionary().setFlag( COSName.F, FLAG_LOCKED, locked);
}
/**
@@ -483,7 +482,7 @@ public abstract class PDAnnotation imple
*/
public boolean isToggleNoView()
{
- return BitFlagHelper.getFlag(getDictionary(), COSName.F, FLAG_TOGGLE_NO_VIEW);
+ return getDictionary().getFlag( COSName.F, FLAG_TOGGLE_NO_VIEW);
}
/**
@@ -493,7 +492,7 @@ public abstract class PDAnnotation imple
*/
public void setToggleNoView(boolean toggleNoView)
{
- BitFlagHelper.setFlag(getDictionary(), COSName.F, FLAG_TOGGLE_NO_VIEW, toggleNoView);
+ getDictionary().setFlag( COSName.F, FLAG_TOGGLE_NO_VIEW, toggleNoView);
}
/**
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/PDSeedValue.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/PDSeedValue.java?rev=1571845&r1=1571844&r2=1571845&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/PDSeedValue.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/PDSeedValue.java Tue Feb 25 22:31:56 2014
@@ -25,7 +25,6 @@ import org.apache.pdfbox.cos.COSDictiona
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.pdmodel.common.COSArrayList;
import org.apache.pdfbox.pdmodel.common.COSObjectable;
-import org.apache.pdfbox.util.BitFlagHelper;
/**
* This represents a pdf signature seed value dictionary.
@@ -121,7 +120,7 @@ public class PDSeedValue implements COSO
*/
public boolean isFilterRequired()
{
- return BitFlagHelper.getFlag(getDictionary(), COSName.FF, FLAG_FILTER);
+ return getDictionary().getFlag( COSName.FF, FLAG_FILTER);
}
/**
@@ -131,7 +130,7 @@ public class PDSeedValue implements COSO
*/
public void setFilterRequired(boolean flag)
{
- BitFlagHelper.setFlag(getDictionary(), COSName.FF, FLAG_FILTER, flag);
+ getDictionary().setFlag( COSName.FF, FLAG_FILTER, flag);
}
/**
@@ -140,7 +139,7 @@ public class PDSeedValue implements COSO
*/
public boolean isSubFilterRequired()
{
- return BitFlagHelper.getFlag(getDictionary(), COSName.FF, FLAG_SUBFILTER);
+ return getDictionary().getFlag( COSName.FF, FLAG_SUBFILTER);
}
/**
@@ -150,7 +149,7 @@ public class PDSeedValue implements COSO
*/
public void setSubFilterRequired(boolean flag)
{
- BitFlagHelper.setFlag(getDictionary(), COSName.FF, FLAG_SUBFILTER, flag);
+ getDictionary().setFlag( COSName.FF, FLAG_SUBFILTER, flag);
}
/**
@@ -159,7 +158,7 @@ public class PDSeedValue implements COSO
*/
public boolean isDigestMethodRequired()
{
- return BitFlagHelper.getFlag(getDictionary(), COSName.FF, FLAG_DIGEST_METHOD);
+ return getDictionary().getFlag( COSName.FF, FLAG_DIGEST_METHOD);
}
/**
@@ -169,7 +168,7 @@ public class PDSeedValue implements COSO
*/
public void setDigestMethodRequired(boolean flag)
{
- BitFlagHelper.setFlag(getDictionary(), COSName.FF, FLAG_DIGEST_METHOD, flag);
+ getDictionary().setFlag( COSName.FF, FLAG_DIGEST_METHOD, flag);
}
/**
@@ -178,7 +177,7 @@ public class PDSeedValue implements COSO
*/
public boolean isVRequired()
{
- return BitFlagHelper.getFlag(getDictionary(), COSName.FF, FLAG_V);
+ return getDictionary().getFlag( COSName.FF, FLAG_V);
}
/**
@@ -188,7 +187,7 @@ public class PDSeedValue implements COSO
*/
public void setVRequired(boolean flag)
{
- BitFlagHelper.setFlag(getDictionary(), COSName.FF, FLAG_V, flag);
+ getDictionary().setFlag( COSName.FF, FLAG_V, flag);
}
/**
@@ -197,7 +196,7 @@ public class PDSeedValue implements COSO
*/
public boolean isReasonRequired()
{
- return BitFlagHelper.getFlag(getDictionary(), COSName.FF, FLAG_REASON);
+ return getDictionary().getFlag( COSName.FF, FLAG_REASON);
}
/**
@@ -207,7 +206,7 @@ public class PDSeedValue implements COSO
*/
public void setReasonRequired(boolean flag)
{
- BitFlagHelper.setFlag(getDictionary(), COSName.FF, FLAG_REASON, flag);
+ getDictionary().setFlag( COSName.FF, FLAG_REASON, flag);
}
/**
@@ -216,7 +215,7 @@ public class PDSeedValue implements COSO
*/
public boolean isLegalAttestationRequired()
{
- return BitFlagHelper.getFlag(getDictionary(), COSName.FF, FLAG_LEGAL_ATTESTATION);
+ return getDictionary().getFlag( COSName.FF, FLAG_LEGAL_ATTESTATION);
}
/**
@@ -226,7 +225,7 @@ public class PDSeedValue implements COSO
*/
public void setLegalAttestationRequired(boolean flag)
{
- BitFlagHelper.setFlag(getDictionary(), COSName.FF, FLAG_LEGAL_ATTESTATION, flag);
+ getDictionary().setFlag( COSName.FF, FLAG_LEGAL_ATTESTATION, flag);
}
/**
@@ -235,7 +234,7 @@ public class PDSeedValue implements COSO
*/
public boolean isAddRevInfoRequired()
{
- return BitFlagHelper.getFlag(getDictionary(), COSName.FF, FLAG_ADD_REV_INFO);
+ return getDictionary().getFlag( COSName.FF, FLAG_ADD_REV_INFO);
}
/**
@@ -245,7 +244,7 @@ public class PDSeedValue implements COSO
*/
public void setAddRevInfoRequired(boolean flag)
{
- BitFlagHelper.setFlag(getDictionary(), COSName.FF, FLAG_ADD_REV_INFO, flag);
+ getDictionary().setFlag( COSName.FF, FLAG_ADD_REV_INFO, flag);
}
/**
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/documentnavigation/outline/PDOutlineItem.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/documentnavigation/outline/PDOutlineItem.java?rev=1571845&r1=1571844&r2=1571845&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/documentnavigation/outline/PDOutlineItem.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/documentnavigation/outline/PDOutlineItem.java Tue Feb 25 22:31:56 2014
@@ -38,7 +38,6 @@ import org.apache.pdfbox.pdmodel.interac
import org.apache.pdfbox.pdmodel.interactive.documentnavigation.destination.PDNamedDestination;
import org.apache.pdfbox.pdmodel.interactive.documentnavigation.destination.PDPageDestination;
import org.apache.pdfbox.pdmodel.interactive.documentnavigation.destination.PDPageXYZDestination;
-import org.apache.pdfbox.util.BitFlagHelper;
/**
* This represents an outline in a pdf document.
@@ -380,7 +379,7 @@ public class PDOutlineItem extends PDOut
*/
public boolean isItalic()
{
- return BitFlagHelper.getFlag( node, COSName.F, ITALIC_FLAG );
+ return node.getFlag( COSName.F, ITALIC_FLAG );
}
/**
@@ -390,7 +389,7 @@ public class PDOutlineItem extends PDOut
*/
public void setItalic( boolean italic )
{
- BitFlagHelper.setFlag( node, COSName.F, ITALIC_FLAG, italic );
+ node.setFlag( COSName.F, ITALIC_FLAG, italic );
}
/**
@@ -400,7 +399,7 @@ public class PDOutlineItem extends PDOut
*/
public boolean isBold()
{
- return BitFlagHelper.getFlag( node, COSName.F, BOLD_FLAG );
+ return node.getFlag( COSName.F, BOLD_FLAG );
}
/**
@@ -410,7 +409,7 @@ public class PDOutlineItem extends PDOut
*/
public void setBold( boolean bold )
{
- BitFlagHelper.setFlag( node, COSName.F, BOLD_FLAG, bold );
+ node.setFlag( COSName.F, BOLD_FLAG, bold );
}
}
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=1571845&r1=1571844&r2=1571845&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 Feb 25 22:31:56 2014
@@ -31,7 +31,6 @@ import org.apache.pdfbox.pdmodel.common.
import org.apache.pdfbox.pdmodel.fdf.FDFField;
import org.apache.pdfbox.pdmodel.interactive.action.PDFormFieldAdditionalActions;
import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationWidget;
-import org.apache.pdfbox.util.BitFlagHelper;
/**
* This is the superclass for a Field element in a PDF. Based on the COS object model from PDFBox.
@@ -212,7 +211,7 @@ public abstract class PDField implements
*/
public void setReadonly(boolean readonly)
{
- BitFlagHelper.setFlag(getDictionary(), COSName.FF, FLAG_READ_ONLY, readonly);
+ getDictionary().setFlag( COSName.FF, FLAG_READ_ONLY, readonly);
}
/**
@@ -221,7 +220,7 @@ public abstract class PDField implements
*/
public boolean isReadonly()
{
- return BitFlagHelper.getFlag(getDictionary(), COSName.FF, FLAG_READ_ONLY);
+ return getDictionary().getFlag( COSName.FF, FLAG_READ_ONLY);
}
/**
@@ -231,7 +230,7 @@ public abstract class PDField implements
*/
public void setRequired(boolean required)
{
- BitFlagHelper.setFlag(getDictionary(), COSName.FF, FLAG_REQUIRED, required);
+ getDictionary().setFlag( COSName.FF, FLAG_REQUIRED, required);
}
/**
@@ -240,7 +239,7 @@ public abstract class PDField implements
*/
public boolean isRequired()
{
- return BitFlagHelper.getFlag(getDictionary(), COSName.FF, FLAG_REQUIRED);
+ return getDictionary().getFlag( COSName.FF, FLAG_REQUIRED);
}
/**
@@ -250,7 +249,7 @@ public abstract class PDField implements
*/
public void setNoExport(boolean noExport)
{
- BitFlagHelper.setFlag(getDictionary(), COSName.FF, FLAG_NO_EXPORT, noExport);
+ getDictionary().setFlag( COSName.FF, FLAG_NO_EXPORT, noExport);
}
/**
@@ -259,7 +258,7 @@ public abstract class PDField implements
*/
public boolean isNoExport()
{
- return BitFlagHelper.getFlag(getDictionary(), COSName.FF, FLAG_NO_EXPORT);
+ return getDictionary().getFlag( COSName.FF, FLAG_NO_EXPORT);
}
/**
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDRadioCollection.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDRadioCollection.java?rev=1571845&r1=1571844&r2=1571845&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDRadioCollection.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDRadioCollection.java Tue Feb 25 22:31:56 2014
@@ -25,7 +25,6 @@ import org.apache.pdfbox.cos.COSDictiona
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.pdmodel.common.COSArrayList;
-import org.apache.pdfbox.util.BitFlagHelper;
/**
* A class for handling the PDF field as a Radio Collection.
@@ -65,7 +64,7 @@ public class PDRadioCollection extends P
*/
public void setRadiosInUnison(boolean radiosInUnison)
{
- BitFlagHelper.setFlag( getDictionary(), COSName.FF, FLAG_RADIOS_IN_UNISON, radiosInUnison );
+ getDictionary().setFlag( COSName.FF, FLAG_RADIOS_IN_UNISON, radiosInUnison );
}
/**
@@ -74,7 +73,7 @@ public class PDRadioCollection extends P
*/
public boolean isRadiosInUnison()
{
- return BitFlagHelper.getFlag( getDictionary(), COSName.FF, FLAG_RADIOS_IN_UNISON );
+ return getDictionary().getFlag( COSName.FF, FLAG_RADIOS_IN_UNISON );
}
/**
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDVariableText.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDVariableText.java?rev=1571845&r1=1571844&r2=1571845&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDVariableText.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDVariableText.java Tue Feb 25 22:31:56 2014
@@ -17,11 +17,9 @@
package org.apache.pdfbox.pdmodel.interactive.form;
import org.apache.pdfbox.cos.COSDictionary;
-import org.apache.pdfbox.cos.COSInteger;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.cos.COSNumber;
import org.apache.pdfbox.cos.COSString;
-import org.apache.pdfbox.util.BitFlagHelper;
import java.io.IOException;
@@ -148,7 +146,7 @@ public abstract class PDVariableText ext
*/
public boolean isMultiline()
{
- return BitFlagHelper.getFlag( getDictionary(), COSName.FF, FLAG_MULTILINE );
+ return getDictionary().getFlag( COSName.FF, FLAG_MULTILINE );
}
/**
@@ -158,7 +156,7 @@ public abstract class PDVariableText ext
*/
public void setMultiline( boolean multiline )
{
- BitFlagHelper.setFlag( getDictionary(), COSName.FF, FLAG_MULTILINE, multiline );
+ getDictionary().setFlag( COSName.FF, FLAG_MULTILINE, multiline );
}
/**
@@ -166,7 +164,7 @@ public abstract class PDVariableText ext
*/
public boolean isPassword()
{
- return BitFlagHelper.getFlag( getDictionary(), COSName.FF, FLAG_PASSWORD );
+ return getDictionary().getFlag( COSName.FF, FLAG_PASSWORD );
}
/**
@@ -176,7 +174,7 @@ public abstract class PDVariableText ext
*/
public void setPassword( boolean password )
{
- BitFlagHelper.setFlag( getDictionary(), COSName.FF, FLAG_PASSWORD, password );
+ getDictionary().setFlag( COSName.FF, FLAG_PASSWORD, password );
}
/**
@@ -184,7 +182,7 @@ public abstract class PDVariableText ext
*/
public boolean isFileSelect()
{
- return BitFlagHelper.getFlag( getDictionary(), COSName.FF, FLAG_FILE_SELECT );
+ return getDictionary().getFlag( COSName.FF, FLAG_FILE_SELECT );
}
/**
@@ -194,7 +192,7 @@ public abstract class PDVariableText ext
*/
public void setFileSelect( boolean fileSelect )
{
- BitFlagHelper.setFlag( getDictionary(), COSName.FF, FLAG_FILE_SELECT, fileSelect );
+ getDictionary().setFlag( COSName.FF, FLAG_FILE_SELECT, fileSelect );
}
/**
@@ -202,7 +200,7 @@ public abstract class PDVariableText ext
*/
public boolean doNotSpellCheck()
{
- return BitFlagHelper.getFlag( getDictionary(), COSName.FF, FLAG_DO_NOT_SPELL_CHECK );
+ return getDictionary().getFlag( COSName.FF, FLAG_DO_NOT_SPELL_CHECK );
}
/**
@@ -212,7 +210,7 @@ public abstract class PDVariableText ext
*/
public void setDoNotSpellCheck( boolean doNotSpellCheck )
{
- BitFlagHelper.setFlag( getDictionary(), COSName.FF, FLAG_DO_NOT_SPELL_CHECK, doNotSpellCheck );
+ getDictionary().setFlag( COSName.FF, FLAG_DO_NOT_SPELL_CHECK, doNotSpellCheck );
}
/**
@@ -220,7 +218,7 @@ public abstract class PDVariableText ext
*/
public boolean doNotScroll()
{
- return BitFlagHelper.getFlag( getDictionary(), COSName.FF, FLAG_DO_NOT_SCROLL );
+ return getDictionary().getFlag( COSName.FF, FLAG_DO_NOT_SCROLL );
}
/**
@@ -230,7 +228,7 @@ public abstract class PDVariableText ext
*/
public void setDoNotScroll( boolean doNotScroll )
{
- BitFlagHelper.setFlag( getDictionary(), COSName.FF, FLAG_DO_NOT_SCROLL, doNotScroll );
+ getDictionary().setFlag( COSName.FF, FLAG_DO_NOT_SCROLL, doNotScroll );
}
/**
@@ -238,7 +236,7 @@ public abstract class PDVariableText ext
*/
public boolean shouldComb()
{
- return BitFlagHelper.getFlag( getDictionary(), COSName.FF, FLAG_COMB );
+ return getDictionary().getFlag( COSName.FF, FLAG_COMB );
}
/**
@@ -248,7 +246,7 @@ public abstract class PDVariableText ext
*/
public void setComb( boolean comb )
{
- BitFlagHelper.setFlag( getDictionary(), COSName.FF, FLAG_COMB, comb );
+ getDictionary().setFlag( COSName.FF, FLAG_COMB, comb );
}
/**
@@ -256,7 +254,7 @@ public abstract class PDVariableText ext
*/
public boolean isRichText()
{
- return BitFlagHelper.getFlag( getDictionary(), COSName.FF, FLAG_RICH_TEXT );
+ return getDictionary().getFlag( COSName.FF, FLAG_RICH_TEXT );
}
/**
@@ -266,7 +264,7 @@ public abstract class PDVariableText ext
*/
public void setRichText( boolean richText )
{
- BitFlagHelper.setFlag( getDictionary(), COSName.FF, FLAG_RICH_TEXT, richText );
+ getDictionary().setFlag( COSName.FF, FLAG_RICH_TEXT, richText );
}
/**