pbwest 2004/05/27 08:12:04
Modified: src/java/org/apache/fop/fo/properties Tag:
FOP_0-20-0_Alt-Design TextDecoration.java
Log:
Added NULL_DECORATION for use as initial value,
to indicate that no decoration has been defined on a node.
Revision Changes Path
No revision
No revision
1.1.2.6 +17 -11
xml-fop/src/java/org/apache/fop/fo/properties/Attic/TextDecoration.java
Index: TextDecoration.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/properties/Attic/TextDecoration.java,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- TextDecoration.java 19 Feb 2004 03:11:40 -0000 1.1.2.5
+++ TextDecoration.java 27 May 2004 15:12:04 -0000 1.1.2.6
@@ -28,14 +28,13 @@
import org.apache.fop.datatypes.None;
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.datatypes.PropertyValueList;
-import org.apache.fop.datatypes.TextDecorations;
import org.apache.fop.datatypes.TextDecorator;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.expr.PropertyException;
public class TextDecoration extends Property {
- public static final int dataTypes = COMPLEX | NONE | INHERIT;
+ public static final int dataTypes = COMPLEX | NONE;
public int getDataTypes() {
return dataTypes;
@@ -53,11 +52,17 @@
return initialValueType;
}
+ /**
+ * text-decoration cannot be inherited, even though the current value
+ * is passed down to all text-bearing chikdren of a block on which it is
+ * defined. Just return a NoProperty.
+ *
+ */
public PropertyValue getInitialValue(int property)
throws PropertyException
{
- return new TextDecorations
- (PropNames.TEXT_DECORATION, NO_DECORATION);
+ return new TextDecorator(
+ PropNames.TEXT_DECORATION, NULL_DECORATION, NULL_DECORATION);
}
public static final int inherited = NO;
@@ -68,13 +73,14 @@
/** Text decoration constant. */
public static final byte
- NO_DECORATION = 0
- ,UNDERLINE = 1
- ,OVERLINE = 2
- ,LINE_THROUGH = 4
- ,BLINK = 8
+ NULL_DECORATION = -1
+ ,NO_DECORATION = 0
+ ,UNDERLINE = 1
+ ,OVERLINE = 2
+ ,LINE_THROUGH = 4
+ ,BLINK = 8
- ,ALL_DECORATIONS = UNDERLINE | OVERLINE | LINE_THROUGH | BLINK
+ ,ALL_DECORATIONS = UNDERLINE | OVERLINE | LINE_THROUGH | BLINK
;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
