Bug #25563 (Patch by Finn Bock) toString() implementations added.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197078 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/fop/datatypes/CondLength.java b/src/java/org/apache/fop/datatypes/CondLength.java
index 25804cfecb4b2117fd612f752cfb02b5ebc5391c..4ae19cdc730f15809660a7b63f613ff8dfbfee49 100644 (file)
--- a/src/java/org/apache/fop/datatypes/CondLength.java
+++ b/src/java/org/apache/fop/datatypes/CondLength.java
@@ -119,5 +119,9 @@ public class CondLength implements CompoundDatatype {
         return this.length.getLength().getValue();
     }
 
+    public String toString() {
+        return "CondLength[" + (isDiscard() ? "discard, " : "") +
+                length.getObject().toString() + "]";
+    }
 }
 

diff --git a/src/java/org/apache/fop/datatypes/Keep.java b/src/java/org/apache/fop/datatypes/Keep.java
index 1d9628356e2d70bc2648bedfaac50c528033fd76..43606c7b9af22f4c7f1c9ec0add681d09b05d9e0 100644 (file)
--- a/src/java/org/apache/fop/datatypes/Keep.java
+++ b/src/java/org/apache/fop/datatypes/Keep.java
@@ -152,7 +152,10 @@ public class Keep implements CompoundDatatype {
      * @return String representation
      */
     public String toString() {
-        return "Keep";
+        return "Keep[" + 
+            "withinLine:" + getWithinLine().getObject() + 
+            ", withinColumn:" + getWithinColumn().getObject() + 
+            ", withinPage:" + getWithinPage().getObject() + "]";
     }
 
 }

diff --git a/src/java/org/apache/fop/datatypes/LengthPair.java b/src/java/org/apache/fop/datatypes/LengthPair.java
index bbfc735ec578e32649909fee225bcc62f54534c5..c16941c72c5cdb93716ec4a477ed0931e4e24652 100644 (file)
--- a/src/java/org/apache/fop/datatypes/LengthPair.java
+++ b/src/java/org/apache/fop/datatypes/LengthPair.java
@@ -108,5 +108,11 @@ public class LengthPair implements CompoundDatatype {
         return this.bpd;
     }
 
+    public String toString() {
+        return "LengthPair[" + 
+            "ipd:" + getIPD().getObject() + 
+            ", bpd:" + getBPD().getObject() + "]";
+    }
+    
 }
 

diff --git a/src/java/org/apache/fop/datatypes/LengthRange.java b/src/java/org/apache/fop/datatypes/LengthRange.java
index b3db3a3c69c4ac5e8d9b61dfdb8497505146ef48..1fca6f28ee3fb381f8f37595da61ab1abd0003c8 100644 (file)
--- a/src/java/org/apache/fop/datatypes/LengthRange.java
+++ b/src/java/org/apache/fop/datatypes/LengthRange.java
@@ -227,5 +227,12 @@ public class LengthRange implements CompoundDatatype {
         return this.optimum;
     }
 
+    public String toString() {
+        return "LengthRange[" +
+            "min:" + getMinimum().getObject() + 
+            ", max:" + getMaximum().getObject() + 
+            ", opt:" + getOptimum().getObject() + "]";
+    }
+    
 }
 

diff --git a/src/java/org/apache/fop/datatypes/Space.java b/src/java/org/apache/fop/datatypes/Space.java
index 90ef2cb8d766740025ddd9d6fc8260820fb55c1d..b3469c51317a269d1c2be9cfdc62e04352ab2865 100644 (file)
--- a/src/java/org/apache/fop/datatypes/Space.java
+++ b/src/java/org/apache/fop/datatypes/Space.java
@@ -125,5 +125,14 @@ public class Space extends LengthRange {
         return this.conditionality;
     }
 
+    public String toString() {
+        return "Space[" +
+            "min:" + getMinimum().getObject() + 
+            ", max:" + getMaximum().getObject() + 
+            ", opt:" + getOptimum().getObject() + 
+            ", precedence:" + precedence.getObject() + 
+            ", conditionality:" + conditionality.getObject() + "]";
+    }
+
 }