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/04/16 18:44:22 UTC

svn commit: r1674110 - in /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure: PDMarkInfo.java PDMarkedContentReference.java PDObjectReference.java PDStructureElement.java PDStructureNode.java

Author: tilman
Date: Thu Apr 16 16:44:22 2015
New Revision: 1674110

URL: http://svn.apache.org/r1674110
Log:
PDFBOX-2576: make getCOSDictionary() public as in the rest of the project for Simon Steiner; make fields final; make methods final that are called in constructor

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDMarkInfo.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDMarkedContentReference.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDObjectReference.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDStructureElement.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDStructureNode.java

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDMarkInfo.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDMarkInfo.java?rev=1674110&r1=1674109&r2=1674110&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDMarkInfo.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDMarkInfo.java Thu Apr 16 16:44:22 2015
@@ -28,7 +28,7 @@ import org.apache.pdfbox.pdmodel.common.
  */
 public class PDMarkInfo implements COSObjectable
 {
-    private COSDictionary dictionary;
+    private final COSDictionary dictionary;
 
     /**
      * Default Constructor.

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDMarkedContentReference.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDMarkedContentReference.java?rev=1674110&r1=1674109&r2=1674110&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDMarkedContentReference.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDMarkedContentReference.java Thu Apr 16 16:44:22 2015
@@ -32,9 +32,9 @@ public class PDMarkedContentReference im
 
     public static final String TYPE = "MCR";
 
-    private COSDictionary dictionary;
+    private final COSDictionary dictionary;
 
-    protected COSDictionary getCOSDictionary()
+    public COSDictionary getCOSDictionary()
     {
         return this.dictionary;
     }

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDObjectReference.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDObjectReference.java?rev=1674110&r1=1674109&r2=1674110&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDObjectReference.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDObjectReference.java Thu Apr 16 16:44:22 2015
@@ -39,14 +39,14 @@ public class PDObjectReference implement
      */
     public static final String TYPE = "OBJR";
 
-    private COSDictionary dictionary;
+    private final COSDictionary dictionary;
 
     /**
      * Returns the underlying dictionary.
      * 
      * @return the dictionary
      */
-    protected COSDictionary getCOSDictionary()
+    public COSDictionary getCOSDictionary()
     {
         return this.dictionary;
     }

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDStructureElement.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDStructureElement.java?rev=1674110&r1=1674109&r2=1674110&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDStructureElement.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDStructureElement.java Thu Apr 16 16:44:22 2015
@@ -78,7 +78,7 @@ public class PDStructureElement extends
      * 
      * @param structureType the structure type
      */
-    public void setStructureType(String structureType)
+    public final void setStructureType(String structureType)
     {
         this.getCOSDictionary().setName(COSName.S, structureType);
     }
@@ -104,7 +104,7 @@ public class PDStructureElement extends
      * 
      * @param structureNode the parent in the structure hierarchy
      */
-    public void setParent(PDStructureNode structureNode)
+    public final void setParent(PDStructureNode structureNode)
     {
         this.getCOSDictionary().setItem(COSName.P, structureNode);
     }
@@ -239,7 +239,7 @@ public class PDStructureElement extends
         COSName key = COSName.A;
         attributeObject.setStructureElement(this);
         COSBase a = this.getCOSDictionary().getDictionaryObject(key);
-        COSArray array = null;
+        COSArray array;
         if (a instanceof COSArray)
         {
             array = (COSArray) a;
@@ -408,7 +408,7 @@ public class PDStructureElement extends
         }
         COSName key = COSName.C;
         COSBase c = this.getCOSDictionary().getDictionaryObject(key);
-        COSArray array = null;
+        COSArray array;
         if (c instanceof COSArray)
         {
             array = (COSArray) c;

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDStructureNode.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDStructureNode.java?rev=1674110&r1=1674109&r2=1674110&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDStructureNode.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDStructureNode.java Thu Apr 16 16:44:22 2015
@@ -61,7 +61,7 @@ public abstract class PDStructureNode im
 
     private final COSDictionary dictionary;
 
-    protected COSDictionary getCOSDictionary()
+    public COSDictionary getCOSDictionary()
     {
         return dictionary;
     }