- From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
- Date: Fri, 19 Oct 2012 10:05:54 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/properties/css2
In directory hutz:/tmp/cvs-serv16933/css2
Modified Files:
Css2Style.java
Added Files:
CssCursor.java
Log Message:
cursor per css2/css21 and http://www.w3.org/TR/2012/WD-css3-ui-20120117/#cursor0 + removed old code
Index: Css2Style.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css2/Css2Style.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Css2Style.java 16 Oct 2012 20:43:59 -0000 1.15
+++ Css2Style.java 19 Oct 2012 10:05:52 -0000 1.16
@@ -8,6 +8,7 @@
import org.w3c.css.properties.aural.ACssStyle;
import org.w3c.css.properties.css.CssBottom;
+import org.w3c.css.properties.css.CssCursor;
import org.w3c.css.properties.css.CssLeft;
import org.w3c.css.properties.css.CssMaxHeight;
import org.w3c.css.properties.css.CssMaxWidth;
@@ -60,6 +61,7 @@
public CssOutlineStyle cssOutlineStyle;
public CssOutlineColor cssOutlineColor;
public CssOutline cssOutline;
+ public CssCursor cssCursor;
/**
* Get the azimuth
@@ -286,4 +288,12 @@
}
return cssOutline;
}
+
+ public final CssCursor getCursor() {
+ if (cssCursor == null) {
+ cssCursor =
+ (CssCursor) style.CascadingOrder(new CssCursor(), style, selector);
+ }
+ return cssCursor;
+ }
}
--- NEW FILE: CssCursor.java ---
// $Id: CssCursor.java,v 1.1 2012/10/19 10:05:52 ylafon Exp $
// Author: Yves Lafon <ylafon@w3.org>
//
// (c) COPYRIGHT MIT, ERCIM and Keio University, 2012.
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.css2;
import org.w3c.css.util.ApplContext;
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.CssTypes;
import org.w3c.css.values.CssValue;
import java.util.ArrayList;
import static org.w3c.css.values.CssOperator.COMMA;
/**
* @spec http://www.w3.org/TR/2008/REC-CSS2-20080411/ui.html#cursor-props
*/
public class CssCursor extends org.w3c.css.properties.css.CssCursor {
public static CssIdent[] allowed_values;
static {
String[] _allowed_values = {
"auto", "crosshair", "default", "pointer", "move",
"e-resize", "ne-resize", "nw-resize", "n-resize",
"se-resize", "sw-resize", "s-resize", "w-resize",
"text", "wait", "help"};
allowed_values = new CssIdent[_allowed_values.length];
int i = 0;
for (String s : _allowed_values) {
allowed_values[i++] = CssIdent.getIdent(s);
}
}
public static CssIdent getMatchingIdent(CssIdent ident) {
for (CssIdent id : allowed_values) {
if (id.equals(ident)) {
return id;
}
}
return null;
}
/**
* Create a new CssCursor
*/
public CssCursor() {
}
/**
* Creates a new CssCursor
*
* @param expression The expression for this property
* @throws org.w3c.css.util.InvalidParamException
* Expressions are incorrect
*/
public CssCursor(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
setByUser();
CssValue val;
char op;
CssValue lastIdent = null;
ArrayList<CssValue> values = new ArrayList<CssValue>();
while (!expression.end()) {
val = expression.getValue();
op = expression.getOperator();
switch (val.getType()) {
case CssTypes.CSS_URL:
if (lastIdent != null) {
throw new InvalidParamException("value",
val.toString(),
getPropertyName(), ac);
}
values.add(val);
break;
case CssTypes.CSS_IDENT:
if (inherit.equals(val)) {
if (expression.getCount() > 1) {
throw new InvalidParamException("value",
inherit.toString(),
getPropertyName(), ac);
}
value = inherit;
break;
}
lastIdent = getMatchingIdent((CssIdent) val);
// not recognized... exit
if (lastIdent == null) {
throw new InvalidParamException("value",
val.toString(),
getPropertyName(), ac);
}
values.add(val);
break;
default:
throw new InvalidParamException("value",
val.toString(),
getPropertyName(), ac);
}
expression.next();
if (!expression.end() && (op != COMMA)) {
throw new InvalidParamException("operator",
((new Character(op)).toString()), ac);
}
}
if (value != inherit) {
// check if we got the mandatory ident
if (lastIdent == null) {
// TODO better errormsg
throw new InvalidParamException("value",
expression.toString(),
getPropertyName(), ac);
}
value = (values.size() == 1) ? values.get(0) : new CssLayerList(values);
}
}
public CssCursor(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
}
Received on Friday, 19 October 2012 10:06:00 UTC