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 2015/05/06 21:07:01 UTC
svn commit: r1678062 - in
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/action:
PDAction.java PDActionGoTo.java PDActionLaunch.java
Author: tilman
Date: Wed May 6 19:07:01 2015
New Revision: 1678062
URL: http://svn.apache.org/r1678062
Log:
PDFBOX-2576: use COSName constants
PDFBOX-2783: Use getCOSObject() instead of getCOSDictionary()
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/action/PDAction.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/action/PDActionGoTo.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/action/PDActionLaunch.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/action/PDAction.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/action/PDAction.java?rev=1678062&r1=1678061&r2=1678062&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/action/PDAction.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/action/PDAction.java Wed May 6 19:07:01 2015
@@ -69,17 +69,7 @@ public abstract class PDAction implement
* @return The cos object that matches this Java object.
*/
@Override
- public COSBase getCOSObject()
- {
- return action;
- }
-
- /**
- * Convert this standard java object to a COS object.
- *
- * @return The cos object that matches this Java object.
- */
- public COSDictionary getCOSDictionary()
+ public COSDictionary getCOSObject()
{
return action;
}
@@ -114,7 +104,7 @@ public abstract class PDAction implement
*/
public String getSubType()
{
- return action.getNameAsString( "S" );
+ return action.getNameAsString(COSName.S);
}
/**
@@ -125,7 +115,7 @@ public abstract class PDAction implement
*/
public void setSubType( String s )
{
- action.setName( "S", s );
+ action.setName(COSName.S, s);
}
/**
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/action/PDActionGoTo.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/action/PDActionGoTo.java?rev=1678062&r1=1678061&r2=1678062&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/action/PDActionGoTo.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/action/PDActionGoTo.java Wed May 6 19:07:01 2015
@@ -66,7 +66,7 @@ public class PDActionGoTo extends PDActi
*/
public PDDestination getDestination() throws IOException
{
- return PDDestination.create(getCOSDictionary().getDictionaryObject(COSName.D));
+ return PDDestination.create(getCOSObject().getDictionaryObject(COSName.D));
}
/**
@@ -92,6 +92,6 @@ public class PDActionGoTo extends PDActi
}
}
}
- getCOSDictionary().setItem(COSName.D, d);
+ getCOSObject().setItem(COSName.D, d);
}
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/action/PDActionLaunch.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/action/PDActionLaunch.java?rev=1678062&r1=1678061&r2=1678062&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/action/PDActionLaunch.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/action/PDActionLaunch.java Wed May 6 19:07:01 2015
@@ -19,6 +19,7 @@ package org.apache.pdfbox.pdmodel.intera
import java.io.IOException;
import org.apache.pdfbox.cos.COSDictionary;
+import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.pdmodel.common.filespecification.PDFileSpecification;
@@ -68,7 +69,7 @@ public class PDActionLaunch extends PDAc
*/
public PDFileSpecification getFile() throws IOException
{
- return PDFileSpecification.createFS( getCOSDictionary().getDictionaryObject( "F" ) );
+ return PDFileSpecification.createFS(getCOSObject().getDictionaryObject(COSName.F));
}
/**
@@ -82,7 +83,7 @@ public class PDActionLaunch extends PDAc
*/
public void setFile( PDFileSpecification fs )
{
- getCOSDictionary().setItem( "F", fs );
+ getCOSObject().setItem(COSName.F, fs);
}
/**
@@ -121,7 +122,7 @@ public class PDActionLaunch extends PDAc
*/
public String getF()
{
- return action.getString( "F" );
+ return action.getString(COSName.F);
}
/**
@@ -134,7 +135,7 @@ public class PDActionLaunch extends PDAc
*/
public void setF( String f )
{
- action.setString( "F", f );
+ action.setString(COSName.F, f );
}
/**
@@ -144,7 +145,7 @@ public class PDActionLaunch extends PDAc
*/
public String getD()
{
- return action.getString( "D" );
+ return action.getString(COSName.D);
}
/**
@@ -154,7 +155,7 @@ public class PDActionLaunch extends PDAc
*/
public void setD( String d )
{
- action.setString( "D", d );
+ action.setString(COSName.D, d );
}
/**
@@ -168,7 +169,7 @@ public class PDActionLaunch extends PDAc
*/
public String getO()
{
- return action.getString( "O" );
+ return action.getString(COSName.O);
}
/**
@@ -182,7 +183,7 @@ public class PDActionLaunch extends PDAc
*/
public void setO( String o )
{
- action.setString( "O", o );
+ action.setString(COSName.O, o );
}
/**
@@ -193,7 +194,7 @@ public class PDActionLaunch extends PDAc
*/
public String getP()
{
- return action.getString( "P" );
+ return action.getString(COSName.P);
}
/**
@@ -204,7 +205,7 @@ public class PDActionLaunch extends PDAc
*/
public void setP( String p )
{
- action.setString( "P", p );
+ action.setString(COSName.P, p );
}
/**