deweese 2003/07/26 11:54:22 Modified: sources/org/apache/batik/css/parser CSSLexicalUnit.java Log: 1) CSSLexicalUnit now properly implements getDimensionUnitText(). PR: 12536 Revision Changes Path 1.3 +42 -2 xml-batik/sources/org/apache/batik/css/parser/CSSLexicalUnit.java Index: CSSLexicalUnit.java =================================================================== RCS file: /home/cvs/xml-batik/sources/org/apache/batik/css/parser/CSSLexicalUnit.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- CSSLexicalUnit.java 21 Aug 2001 15:25:59 -0000 1.2 +++ CSSLexicalUnit.java 26 Jul 2003 18:54:22 -0000 1.3 @@ -18,6 +18,25 @@ */ public abstract class CSSLexicalUnit implements LexicalUnit { + public static final String UNIT_TEXT_CENTIMETER = "cm"; + public static final String UNIT_TEXT_DEGREE = "deg"; + public static final String UNIT_TEXT_EM = "em"; + public static final String UNIT_TEXT_EX = "ex"; + public static final String UNIT_TEXT_GRADIAN = "grad"; + public static final String UNIT_TEXT_HERTZ = "Hz"; + public static final String UNIT_TEXT_INCH = "in"; + public static final String UNIT_TEXT_KILOHERTZ = "kHz"; + public static final String UNIT_TEXT_MILLIMETER = "mm"; + public static final String UNIT_TEXT_MILLISECOND = "ms"; + public static final String UNIT_TEXT_PERCENTAGE = "%"; + public static final String UNIT_TEXT_PICA = "pc"; + public static final String UNIT_TEXT_PIXEL = "px"; + public static final String UNIT_TEXT_POINT = "pt"; + public static final String UNIT_TEXT_RADIAN = "rad"; + public static final String UNIT_TEXT_REAL = ""; + public static final String UNIT_TEXT_SECOND = "s"; + + /** * The lexical unit type. */ @@ -97,7 +116,28 @@ * <b>SAC</b>: Implements [EMAIL PROTECTED] LexicalUnit#getDimensionUnitText()}. */ public String getDimensionUnitText() { - throw new IllegalStateException(); + switch (lexicalUnitType) { + case LexicalUnit.SAC_CENTIMETER: return UNIT_TEXT_CENTIMETER; + case LexicalUnit.SAC_DEGREE: return UNIT_TEXT_DEGREE; + case LexicalUnit.SAC_EM: return UNIT_TEXT_EM; + case LexicalUnit.SAC_EX: return UNIT_TEXT_EX; + case LexicalUnit.SAC_GRADIAN: return UNIT_TEXT_GRADIAN; + case LexicalUnit.SAC_HERTZ: return UNIT_TEXT_HERTZ; + case LexicalUnit.SAC_INCH: return UNIT_TEXT_INCH; + case LexicalUnit.SAC_KILOHERTZ: return UNIT_TEXT_KILOHERTZ; + case LexicalUnit.SAC_MILLIMETER: return UNIT_TEXT_MILLIMETER; + case LexicalUnit.SAC_MILLISECOND: return UNIT_TEXT_MILLISECOND; + case LexicalUnit.SAC_PERCENTAGE: return UNIT_TEXT_PERCENTAGE; + case LexicalUnit.SAC_PICA: return UNIT_TEXT_PICA; + case LexicalUnit.SAC_PIXEL: return UNIT_TEXT_PIXEL; + case LexicalUnit.SAC_POINT: return UNIT_TEXT_POINT; + case LexicalUnit.SAC_RADIAN: return UNIT_TEXT_RADIAN; + case LexicalUnit.SAC_REAL: return UNIT_TEXT_REAL; + case LexicalUnit.SAC_SECOND: return UNIT_TEXT_SECOND; + default: + throw new IllegalStateException("No Unit Text for type: " + + lexicalUnitType); + } } /**
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]