bella 01/07/04 23:40:13
Modified: sources/org/apache/batik/css/value
TextDecorationFactory.java
TextDecorationResolver.java
Log:
fixed up problem with text decoration inheritance and default values
Revision Changes Path
1.5 +4 -2
xml-batik/sources/org/apache/batik/css/value/TextDecorationFactory.java
Index: TextDecorationFactory.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/css/value/TextDecorationFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TextDecorationFactory.java 2001/06/12 23:49:37 1.4
+++ TextDecorationFactory.java 2001/07/05 06:40:12 1.5
@@ -20,7 +20,7 @@
* This class provides a factory for the 'text-decoration' property values.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Stephane Hillion</a>
- * @version $Id: TextDecorationFactory.java,v 1.4 2001/06/12 23:49:37 bella Exp $
+ * @version $Id: TextDecorationFactory.java,v 1.5 2001/07/05 06:40:12 bella Exp $
*/
public class TextDecorationFactory
extends AbstractValueFactory
@@ -35,7 +35,6 @@
values.put(CSS_LINE_THROUGH_VALUE, LINE_THROUGH_VALUE);
values.put(CSS_OVERLINE_VALUE, OVERLINE_VALUE);
values.put(CSS_UNDERLINE_VALUE, UNDERLINE_VALUE);
- values.put(CSS_NONE_VALUE, NONE_VALUE);
}
/**
@@ -67,6 +66,9 @@
case LexicalUnit.SAC_INHERIT:
return INHERIT;
case LexicalUnit.SAC_IDENT:
+ if (lu.getStringValue().equalsIgnoreCase(CSS_NONE_VALUE)) {
+ return NONE_VALUE;
+ }
ImmutableValueList list = new ImmutableValueList(' ');
do {
list.append(new CSSOMValue(identFactory,
1.4 +4 -4
xml-batik/sources/org/apache/batik/css/value/TextDecorationResolver.java
Index: TextDecorationResolver.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/css/value/TextDecorationResolver.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TextDecorationResolver.java 2001/06/12 23:49:38 1.3
+++ TextDecorationResolver.java 2001/07/05 06:40:12 1.4
@@ -18,7 +18,7 @@
* property.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Stephane Hillion</a>
- * @version $Id: TextDecorationResolver.java,v 1.3 2001/06/12 23:49:38 bella Exp $
+ * @version $Id: TextDecorationResolver.java,v 1.4 2001/07/05 06:40:12 bella Exp $
*/
public class TextDecorationResolver implements RelativeValueResolver {
@@ -26,21 +26,21 @@
* Whether the handled property is inherited or not.
*/
public boolean isInheritedProperty() {
- return false;
+ return false;
}
/**
* Returns the name of the handled property.
*/
public String getPropertyName() {
- return ValueConstants.CSS_TEXT_DECORATION_PROPERTY;
+ return ValueConstants.CSS_TEXT_DECORATION_PROPERTY;
}
/**
* Returns the default value for the handled property.
*/
public CSSOMReadOnlyValue getDefaultValue() {
- return new CSSOMReadOnlyValue(TextDecorationFactory.NONE_VALUE);
+ return new CSSOMReadOnlyValue(TextDecorationFactory.NONE_VALUE);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
