From be2193cb5bec0da86a3d2aa047196a2c99c999d8 Mon Sep 17 00:00:00 2001 From: Glen Mazza Date: Wed, 31 Dec 2003 00:40:14 +0000 Subject: [PATCH] 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 --- src/java/org/apache/fop/datatypes/CondLength.java | 4 ++++ src/java/org/apache/fop/datatypes/Keep.java | 5 ++++- src/java/org/apache/fop/datatypes/LengthPair.java | 6 ++++++ src/java/org/apache/fop/datatypes/LengthRange.java | 7 +++++++ src/java/org/apache/fop/datatypes/Space.java | 9 +++++++++ 5 files changed, 30 insertions(+), 1 deletion(-) diff --git a/src/java/org/apache/fop/datatypes/CondLength.java b/src/java/org/apache/fop/datatypes/CondLength.java index 25804cfec..4ae19cdc7 100644 --- 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 1d9628356..43606c7b9 100644 --- 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 bbfc735ec..c16941c72 100644 --- 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 b3db3a3c6..1fca6f28e 100644 --- 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 90ef2cb8d..b3469c513 100644 --- 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() + "]"; + } + } -- 2.39.5