aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremias Maerki <jeremias@apache.org>2005-09-14 13:53:21 +0000
committerJeremias Maerki <jeremias@apache.org>2005-09-14 13:53:21 +0000
commitaccf2d5828ba0e6445d4344838fdc94ede8123af (patch)
treeffb3dc724ef3c114af48e3c870e16f3bdc336409
parent1f96d7574dd259bb0ca5c41488bcb11258e9e560 (diff)
downloadxmlgraphics-fop-accf2d5828ba0e6445d4344838fdc94ede8123af.tar.gz
xmlgraphics-fop-accf2d5828ba0e6445d4344838fdc94ede8123af.zip
Style fixes.
Assimilate toString() with SpaceProperty's toString(). git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@280857 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--src/java/org/apache/fop/fo/properties/CondLengthProperty.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/java/org/apache/fop/fo/properties/CondLengthProperty.java b/src/java/org/apache/fop/fo/properties/CondLengthProperty.java
index a5188f2eb..587caf856 100644
--- a/src/java/org/apache/fop/fo/properties/CondLengthProperty.java
+++ b/src/java/org/apache/fop/fo/properties/CondLengthProperty.java
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -57,8 +57,7 @@ public class CondLengthProperty extends Property implements CompoundDatatype {
* @see CompoundPropertyMaker#convertProperty
*/
public Property convertProperty(Property p, PropertyList propertyList, FObj fo)
- throws PropertyException
- {
+ throws PropertyException {
if (p instanceof KeepProperty) {
return p;
}
@@ -125,18 +124,19 @@ public class CondLengthProperty extends Property implements CompoundDatatype {
/**
* Returns the computed length value.
+ * @param context The context for the length calculation (for percentage based lengths)
* @return the length in millipoints
*/
public int getLengthValue(PercentBaseContext context) {
return this.length.getLength().getValue(context);
}
+ /** @see java.lang.Object#toString() */
public String toString() {
- return "CondLength[" + (isDiscard() ? "discard, " : "") +
- length.getObject().toString() + "]";
+ return "CondLength[" + length.getObject().toString()
+ + ", conditionality:" + conditionality + "]";
}
-
/**
* @return this.condLength
*/