Author: adelmelle
Date: Thu Feb 7 14:41:26 2008
New Revision: 619674
URL: http://svn.apache.org/viewvc?rev=619674&view=rev
Log:
Tweak: modify PercentLength.toString() to return a value that facilitates
debugging.
Moved the original code to a getString() implementation, which is now used by
the fotree test suite.
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PercentLength.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/ext/AssertElement.java
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PercentLength.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PercentLength.java?rev=619674&r1=619673&r2=619674&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PercentLength.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/PercentLength.java
Thu Feb 7 14:41:26 2008
@@ -80,16 +80,12 @@
return false;
}
- /**
- * [EMAIL PROTECTED]
- */
+ /** [EMAIL PROTECTED] */
public double getNumericValue() {
return getNumericValue(null);
}
- /**
- * [EMAIL PROTECTED]
- */
+ /** [EMAIL PROTECTED] */
public double getNumericValue(PercentBaseContext context) {
try {
resolvedValue = factor * lbase.getBaseLength(context);
@@ -99,6 +95,11 @@
return 0;
}
}
+
+ /** [EMAIL PROTECTED] */
+ public String getString() {
+ return (factor * 100.0) + "%";
+ }
/**
* Return the length of this PercentLength.
@@ -108,9 +109,7 @@
return (int) getNumericValue();
}
- /**
- * [EMAIL PROTECTED]
- */
+ /** [EMAIL PROTECTED] */
public int getValue(PercentBaseContext context) {
return (int) getNumericValue(context);
}
@@ -119,8 +118,11 @@
* @return the String equivalent of this
*/
public String toString() {
- // TODO: What about the base value?
- return (new Double(factor * 100.0).toString()) + "%";
+ StringBuffer sb =
+ new StringBuffer(PercentLength.class.getName())
+ .append("[factor=").append(factor)
+ .append(",lbase=").append(lbase).append("]");
+ return sb.toString();
}
}
Modified:
xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/ext/AssertElement.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/ext/AssertElement.java?rev=619674&r1=619673&r2=619674&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/ext/AssertElement.java
(original)
+++
xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/ext/AssertElement.java
Thu Feb 7 14:41:26 2008
@@ -27,6 +27,7 @@
import org.apache.fop.fo.properties.KeepProperty;
import org.apache.fop.fo.properties.LengthPairProperty;
import org.apache.fop.fo.properties.LengthRangeProperty;
+import org.apache.fop.fo.properties.PercentLength;
import org.apache.fop.fo.properties.Property;
import org.apache.fop.fo.properties.SpaceProperty;
import org.apache.fop.fotreetest.ResultCollector;
@@ -91,7 +92,12 @@
prop =
sp.getComponent(FOPropertyMapping.getSubPropertyId(component));
}
}
- String s = String.valueOf(prop);
+ String s;
+ if (prop instanceof PercentLength) {
+ s = ((PercentLength)prop).getString();
+ } else {
+ s = String.valueOf(prop);
+ }
String expected = attlist.getValue("expected");
if (!expected.equals(s)) {
collector.notifyException(
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
