- From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
- Date: Tue, 28 Aug 2012 19:44:06 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/properties/css21 In directory hutz:/tmp/cvs-serv15553 Modified Files: CssFont.java CssFontFamily.java CssFontSize.java CssFontStyle.java CssFontWeight.java Log Message: minor changes Index: CssFontSize.java =================================================================== RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css21/CssFontSize.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- CssFontSize.java 23 Aug 2012 14:33:38 -0000 1.2 +++ CssFontSize.java 28 Aug 2012 19:44:04 -0000 1.3 @@ -23,10 +23,11 @@ public class CssFontSize extends org.w3c.css.properties.css.CssFontSize { public static final CssIdent[] allowed_values; - static final String[] absolute_values = {"xx-small", "x-small", "small", "medium", "large", "x-large", "xx-large"}; - static final String[] relative_values = {"smaller", "larger"}; static { + String[] absolute_values = {"xx-small", "x-small", "small", "medium", "large", "x-large", "xx-large"}; + String[] relative_values = {"smaller", "larger"}; + allowed_values = new CssIdent[absolute_values.length + relative_values.length]; int i = 0; for (String s : absolute_values) { Index: CssFontWeight.java =================================================================== RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css21/CssFontWeight.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- CssFontWeight.java 23 Aug 2012 14:33:38 -0000 1.2 +++ CssFontWeight.java 28 Aug 2012 19:44:04 -0000 1.3 @@ -14,15 +14,16 @@ import org.w3c.css.values.CssValue; /** - * @spec http://www.w3.org/TR/2011/REC-CSS2-20110607/fonts.html#propdef-font-weight * @version $Revision$ + * @spec http://www.w3.org/TR/2011/REC-CSS2-20110607/fonts.html#propdef-font-weight */ public class CssFontWeight extends org.w3c.css.properties.css.CssFontWeight { public static final CssIdent[] allowed_values; - static final String[] _allowed_values = {"normal", "bold", "bolder", "lighter"}; static { + String[] _allowed_values = {"normal", "bold", "bolder", "lighter"}; + allowed_values = new CssIdent[_allowed_values.length]; for (int i = 0; i < allowed_values.length; i++) { allowed_values[i] = CssIdent.getIdent(_allowed_values[i]); @@ -38,21 +39,21 @@ return null; } - /** - * Create a new CssFontWeight - */ - public CssFontWeight() { - } + /** + * Create a new CssFontWeight + */ + public CssFontWeight() { + } - /** - * Creates a new CssFontWeight - * - * @param expression The expression for this property - * @throws org.w3c.css.util.InvalidParamException - * Expressions are incorrect - */ - public CssFontWeight(ApplContext ac, CssExpression expression, boolean check) - throws InvalidParamException { + /** + * Creates a new CssFontWeight + * + * @param expression The expression for this property + * @throws org.w3c.css.util.InvalidParamException + * Expressions are incorrect + */ + public CssFontWeight(ApplContext ac, CssExpression expression, boolean check) + throws InvalidParamException { if (check && expression.getCount() > 1) { throw new InvalidParamException("unrecognize", ac); } @@ -67,7 +68,7 @@ switch (val.getType()) { case CssTypes.CSS_NUMBER: CssNumber num = (CssNumber) val; - switch(num.getInt()) { + switch (num.getInt()) { case 100: case 200: case 300: @@ -77,7 +78,7 @@ case 700: case 800: case 900: - value = num; + value = num; break; default: throw new InvalidParamException("value", @@ -104,12 +105,12 @@ getPropertyName(), ac); } expression.next(); - } + } - public CssFontWeight(ApplContext ac, CssExpression expression) - throws InvalidParamException { - this(ac, expression, false); - } + public CssFontWeight(ApplContext ac, CssExpression expression) + throws InvalidParamException { + this(ac, expression, false); + } } Index: CssFont.java =================================================================== RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css21/CssFont.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- CssFont.java 23 Aug 2012 14:40:49 -0000 1.4 +++ CssFont.java 28 Aug 2012 19:44:04 -0000 1.5 @@ -23,10 +23,11 @@ public static final CssIdent normal; public static final CssIdent[] systemFonts; - static final String[] _systemFonts = {"caption", "icon", "menu", - "message-box", "small-caption", "status-bar"}; static { + String[] _systemFonts = {"caption", "icon", "menu", + "message-box", "small-caption", "status-bar"}; + normal = CssIdent.getIdent("normal"); systemFonts = new CssIdent[_systemFonts.length]; int i = 0; Index: CssFontStyle.java =================================================================== RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css21/CssFontStyle.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- CssFontStyle.java 23 Aug 2012 14:33:38 -0000 1.2 +++ CssFontStyle.java 28 Aug 2012 19:44:04 -0000 1.3 @@ -19,10 +19,11 @@ */ public class CssFontStyle extends org.w3c.css.properties.css.CssFontStyle { - static final String[] _allowed_values = {"italic", "normal", "oblique"}; public static final ArrayList<CssIdent> allowed_values; static { + String[] _allowed_values = {"italic", "normal", "oblique"}; + allowed_values = new ArrayList<CssIdent>(_allowed_values.length); for (String s : _allowed_values) { allowed_values.add(CssIdent.getIdent(s)); Index: CssFontFamily.java =================================================================== RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css21/CssFontFamily.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- CssFontFamily.java 23 Aug 2012 14:33:38 -0000 1.2 +++ CssFontFamily.java 28 Aug 2012 19:44:04 -0000 1.3 @@ -25,18 +25,13 @@ public static final ArrayList<CssIdent> genericNames; public static final ArrayList<CssIdent> reservedNames; - public static final String[] _genericNames = { - "serif", - "sans-serif", - "cursive", - "fantasy", - "monospace"}; + static { + String[] _genericNames = { + "serif", "sans-serif", "cursive", + "fantasy", "monospace"}; - public static final String[] _reservedNames = {"inherit", - "initial", "default" - }; + String[] _reservedNames = {"inherit", "initial", "default"}; - static { genericNames = new ArrayList<CssIdent>(_genericNames.length); for (String s : _genericNames) { genericNames.add(CssIdent.getIdent(s));
Received on Tuesday, 28 August 2012 19:44:08 UTC