svn commit: r1677301 - in /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/filespecification: PDComplexFileSpecification.java PDSimpleFileSpecification.java

[tilman]

Author: tilman
Date: Sat May  2 11:19:03 2015
New Revision: 1677301

URL: http://svn.apache.org/r1677301
Log:
PDFBOX-2783: Use getCOSObject() instead of getCOSDictionary()

Modified:
    
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/filespecification/PDComplexFileSpecification.java
    
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/filespecification/PDSimpleFileSpecification.java

Modified: 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/filespecification/PDComplexFileSpecification.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/filespecification/PDComplexFileSpecification.java?rev=1677301&r1=1677300&r2=1677301&view=diff
==============================================================================
--- 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/filespecification/PDComplexFileSpecification.java
 (original)
+++ 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/filespecification/PDComplexFileSpecification.java
 Sat May  2 11:19:03 2015
@@ -29,7 +29,7 @@ import org.apache.pdfbox.cos.COSStream;
  */
 public class PDComplexFileSpecification extends PDFileSpecification
 {
-    private COSDictionary fs;
+    private final COSDictionary fs;
     private COSDictionary efDictionary;
 
     /**
@@ -64,21 +64,12 @@ public class PDComplexFileSpecification
      *
      * @return The cos object that matches this Java object.
      */
-    public COSBase getCOSObject()
+    @Override
+    public COSDictionary getCOSObject()
     {
         return fs;
     }
-
-    /**
-     * Convert this standard java object to a COS object.
-     *
-     * @return The cos object that matches this Java object.
-     */
-    public COSDictionary getCOSDictionary()
-    {
-        return fs;
-    }
-
+    
     private COSDictionary getEFDictionary()
     {
         if (efDictionary == null && fs != null)
@@ -154,6 +145,7 @@ public class PDComplexFileSpecification
      *
      * @return The file name.
      */
+    @Override
     public String getFile()
     {
         return fs.getString( COSName.F );
@@ -164,6 +156,7 @@ public class PDComplexFileSpecification
      *
      * @param file The name of the file.
      */
+    @Override
     public void setFile( String file )
     {
         fs.setString( COSName.F, file );

Modified: 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/filespecification/PDSimpleFileSpecification.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/filespecification/PDSimpleFileSpecification.java?rev=1677301&r1=1677300&r2=1677301&view=diff
==============================================================================
--- 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/filespecification/PDSimpleFileSpecification.java
 (original)
+++ 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/filespecification/PDSimpleFileSpecification.java
 Sat May  2 11:19:03 2015
@@ -52,6 +52,7 @@ public class PDSimpleFileSpecification e
      *
      * @return The file name.
      */
+    @Override
     public String getFile()
     {
     return file.getString();
@@ -62,6 +63,7 @@ public class PDSimpleFileSpecification e
      *
      * @param fileName The name of the file.
      */
+    @Override
     public void setFile( String fileName )
     {
     file = new COSString( fileName );
@@ -72,6 +74,7 @@ public class PDSimpleFileSpecification e
      *
      * @return The cos object that matches this Java object.
      */
+    @Override
     public COSBase getCOSObject()
     {
         return file;