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/02 13:24:57 UTC
svn commit: r1677302 - in
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common:
PDDictionaryWrapper.java PDNameTreeNode.java PDNumberTreeNode.java
PDPageLabelRange.java PDTypedDictionaryWrapper.java
Author: tilman
Date: Sat May 2 11:24:56 2015
New Revision: 1677302
URL: http://svn.apache.org/r1677302
Log:
PDFBOX-2783: Use getCOSObject() instead of getCOSDictionary()
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDDictionaryWrapper.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDNameTreeNode.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDNumberTreeNode.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDPageLabelRange.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDTypedDictionaryWrapper.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDDictionaryWrapper.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDDictionaryWrapper.java?rev=1677302&r1=1677301&r2=1677302&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDDictionaryWrapper.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDDictionaryWrapper.java Sat May 2 11:24:56 2015
@@ -48,27 +48,15 @@ public class PDDictionaryWrapper impleme
this.dictionary = dictionary;
}
-
/**
* {@inheritDoc}
*/
@Override
- public COSBase getCOSObject()
- {
- return this.dictionary;
- }
-
- /**
- * Gets the COS dictionary.
- *
- * @return the COS dictionary
- */
- public COSDictionary getCOSDictionary()
+ public COSDictionary getCOSObject()
{
return this.dictionary;
}
-
@Override
public boolean equals(Object obj)
{
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDNameTreeNode.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDNameTreeNode.java?rev=1677302&r1=1677301&r2=1677302&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDNameTreeNode.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDNameTreeNode.java Sat May 2 11:24:56 2015
@@ -73,17 +73,7 @@ public class PDNameTreeNode implements C
* @return The cos object that matches this Java object.
*/
@Override
- public COSBase getCOSObject()
- {
- return node;
- }
-
- /**
- * 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 node;
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDNumberTreeNode.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDNumberTreeNode.java?rev=1677302&r1=1677301&r2=1677302&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDNumberTreeNode.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDNumberTreeNode.java Sat May 2 11:24:56 2015
@@ -75,17 +75,7 @@ public class PDNumberTreeNode implements
* @return The cos object that matches this Java object.
*/
@Override
- public COSBase getCOSObject()
- {
- return node;
- }
-
- /**
- * 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 node;
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDPageLabelRange.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDPageLabelRange.java?rev=1677302&r1=1677301&r2=1677302&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDPageLabelRange.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDPageLabelRange.java Sat May 2 11:24:56 2015
@@ -91,13 +91,8 @@ public class PDPageLabelRange implements
*
* @return the underlying dictionary.
*/
- public COSDictionary getCOSDictionary()
- {
- return root;
- }
-
@Override
- public COSBase getCOSObject()
+ public COSDictionary getCOSObject()
{
return root;
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDTypedDictionaryWrapper.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDTypedDictionaryWrapper.java?rev=1677302&r1=1677301&r2=1677302&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDTypedDictionaryWrapper.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDTypedDictionaryWrapper.java Sat May 2 11:24:56 2015
@@ -36,7 +36,7 @@ public class PDTypedDictionaryWrapper ex
public PDTypedDictionaryWrapper(String type)
{
super();
- this.getCOSDictionary().setName(COSName.TYPE, type);
+ this.getCOSObject().setName(COSName.TYPE, type);
}
/**
@@ -57,7 +57,7 @@ public class PDTypedDictionaryWrapper ex
*/
public String getType()
{
- return this.getCOSDictionary().getNameAsString(COSName.TYPE);
+ return this.getCOSObject().getNameAsString(COSName.TYPE);
}
// There is no setType(String) method because changing the Type would most