gmazza 2003/12/30 16:40:14
Modified: src/java/org/apache/fop/datatypes CondLength.java Keep.java
LengthPair.java LengthRange.java Space.java
Log:
Bug #25563 (Patch by Finn Bock) toString() implementations added.
Revision Changes Path
1.3 +4 -0 xml-fop/src/java/org/apache/fop/datatypes/CondLength.java
Index: CondLength.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/datatypes/CondLength.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CondLength.java 22 Dec 2003 21:37:43 -0000 1.2
+++ CondLength.java 31 Dec 2003 00:40:14 -0000 1.3
@@ -119,5 +119,9 @@
return this.length.getLength().getValue();
}
+ public String toString() {
+ return "CondLength[" + (isDiscard() ? "discard, " : "") +
+ length.getObject().toString() + "]";
+ }
}
1.4 +4 -1 xml-fop/src/java/org/apache/fop/datatypes/Keep.java
Index: Keep.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/datatypes/Keep.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Keep.java 13 Jul 2003 00:59:45 -0000 1.3
+++ Keep.java 31 Dec 2003 00:40:14 -0000 1.4
@@ -152,7 +152,10 @@
* @return String representation
*/
public String toString() {
- return "Keep";
+ return "Keep[" +
+ "withinLine:" + getWithinLine().getObject() +
+ ", withinColumn:" + getWithinColumn().getObject() +
+ ", withinPage:" + getWithinPage().getObject() + "]";
}
}
1.3 +6 -0 xml-fop/src/java/org/apache/fop/datatypes/LengthPair.java
Index: LengthPair.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/datatypes/LengthPair.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LengthPair.java 6 Jul 2003 22:38:43 -0000 1.2
+++ LengthPair.java 31 Dec 2003 00:40:14 -0000 1.3
@@ -108,5 +108,11 @@
return this.bpd;
}
+ public String toString() {
+ return "LengthPair[" +
+ "ipd:" + getIPD().getObject() +
+ ", bpd:" + getBPD().getObject() + "]";
+ }
+
}
1.4 +7 -0 xml-fop/src/java/org/apache/fop/datatypes/LengthRange.java
Index: LengthRange.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/datatypes/LengthRange.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LengthRange.java 6 Jul 2003 22:38:43 -0000 1.3
+++ LengthRange.java 31 Dec 2003 00:40:14 -0000 1.4
@@ -227,5 +227,12 @@
return this.optimum;
}
+ public String toString() {
+ return "LengthRange[" +
+ "min:" + getMinimum().getObject() +
+ ", max:" + getMaximum().getObject() +
+ ", opt:" + getOptimum().getObject() + "]";
+ }
+
}
1.3 +9 -0 xml-fop/src/java/org/apache/fop/datatypes/Space.java
Index: Space.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/datatypes/Space.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Space.java 6 Jul 2003 22:38:44 -0000 1.2
+++ Space.java 31 Dec 2003 00:40:14 -0000 1.3
@@ -125,5 +125,14 @@
return this.conditionality;
}
+ public String toString() {
+ return "Space[" +
+ "min:" + getMinimum().getObject() +
+ ", max:" + getMaximum().getObject() +
+ ", opt:" + getOptimum().getObject() +
+ ", precedence:" + precedence.getObject() +
+ ", conditionality:" + conditionality.getObject() + "]";
+ }
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
