svn commit: r1674383 - in /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure: PDAttributeObject.java PDStructureNode.java PDUserProperty.java

[ti...@apache.org]

Author: tilman
Date: Fri Apr 17 19:47:03 2015
New Revision: 1674383

URL: http://svn.apache.org/r1674383
Log:
PDFBOX-2576: revert "make methods static" changes due to lack of consensus

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDAttributeObject.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDStructureNode.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDUserProperty.java

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDAttributeObject.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDAttributeObject.java?rev=1674383&r1=1674382&r2=1674383&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDAttributeObject.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDAttributeObject.java Fri Apr 17 19:47:03 2015
@@ -159,7 +159,7 @@ public abstract class PDAttributeObject
      */
     protected void potentiallyNotifyChanged(COSBase oldBase, COSBase newBase)
     {
-        if (PDAttributeObject.isValueChanged(oldBase, newBase))
+        if (this.isValueChanged(oldBase, newBase))
         {
             this.notifyChanged();
         }
@@ -173,7 +173,7 @@ public abstract class PDAttributeObject
      * @return <code>true</code> if the value is changed, <code>false</code>
      * otherwise
      */
-    private static boolean isValueChanged(COSBase oldValue, COSBase newValue)
+    private boolean isValueChanged(COSBase oldValue, COSBase newValue)
     {
         if (oldValue == null)
         {

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=1674383&r1=1674382&r2=1674383&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 Fri Apr 17 19:47:03 2015
@@ -121,7 +121,7 @@ public abstract class PDStructureNode im
             while (kids.hasNext())
             {
                 COSBase kid = kids.next();
-                Object kidObject = PDStructureNode.createObject(kid);
+                Object kidObject = this.createObject(kid);
                 if (kidObject != null)
                 {
                     kidObjects.add(kidObject);
@@ -130,7 +130,7 @@ public abstract class PDStructureNode im
         }
         else
         {
-            Object kidObject = PDStructureNode.createObject(k);
+            Object kidObject = this.createObject(k);
             if (kidObject != null)
             {
                 kidObjects.add(kidObject);
@@ -377,7 +377,7 @@ public abstract class PDStructureNode im
      * @param kid the kid
      * @return the object
      */
-    protected static Object createObject(COSBase kid)
+    protected Object createObject(COSBase kid)
     {
         COSDictionary kidDic = null;
         if (kid instanceof COSDictionary)

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDUserProperty.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDUserProperty.java?rev=1674383&r1=1674382&r2=1674383&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDUserProperty.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDUserProperty.java Fri Apr 17 19:47:03 2015
@@ -160,7 +160,7 @@ public class PDUserProperty extends PDDi
      */
     private void potentiallyNotifyChanged(Object oldEntry, Object newEntry)
     {
-        if (PDUserProperty.isEntryChanged(oldEntry, newEntry))
+        if (this.isEntryChanged(oldEntry, newEntry))
         {
             this.userAttributeObject.userPropertyChanged(this);
         }
@@ -174,7 +174,7 @@ public class PDUserProperty extends PDDi
      * @return <code>true</code> if the entry is changed, <code>false</code>
      * otherwise
      */
-    private static boolean isEntryChanged(Object oldEntry, Object newEntry)
+    private boolean isEntryChanged(Object oldEntry, Object newEntry)
     {
         if (oldEntry == null)
         {