- From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
- Date: Tue, 28 Aug 2012 19:49:17 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/properties/css3
In directory hutz:/tmp/cvs-serv16956
Modified Files:
CssFontFeatureSettings.java
Log Message:
use CssLayerValue
Index: CssFontFeatureSettings.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css3/CssFontFeatureSettings.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssFontFeatureSettings.java 13 Aug 2012 05:38:56 -0000 1.1
+++ CssFontFeatureSettings.java 28 Aug 2012 19:49:14 -0000 1.2
@@ -9,6 +9,7 @@
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
import org.w3c.css.values.CssIdent;
+import org.w3c.css.values.CssLayerList;
import org.w3c.css.values.CssNumber;
import org.w3c.css.values.CssTypes;
import org.w3c.css.values.CssValue;
@@ -32,8 +33,6 @@
}
- public Object value;
-
/**
* Create a new CssFontFeatureSettings
*/
@@ -102,7 +101,7 @@
if (values.size() == 1) {
value = values.get(0);
} else {
- value = values;
+ value = new CssLayerList(values);
}
}
@@ -163,27 +162,8 @@
val.toString(),
getPropertyName(), ac);
}
- return new CssValueList(v);
+ return (v.size() == 1) ? v.get(0) : new CssValueList(v);
}
- /**
- * Returns a string representation of the object.
- */
- public String toString() {
- if (value instanceof ArrayList) {
- StringBuilder sb = new StringBuilder();
- boolean addComa = false;
- for (Object v : (ArrayList) value) {
- if (addComa) {
- sb.append(", ");
- } else {
- addComa = true;
- }
- sb.append(v);
- }
- return sb.toString();
- }
- return value.toString();
- }
}
Received on Tuesday, 28 August 2012 19:49:18 UTC