- From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
- Date: Mon, 05 Nov 2012 15:35:27 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/properties/css2
In directory hutz:/tmp/cvs-serv16850/css2
Modified Files:
Css2Style.java
Added Files:
CssVisibility.java
Log Message:
visibility per css2/21/3
Index: Css2Style.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css2/Css2Style.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- Css2Style.java 5 Nov 2012 14:25:59 -0000 1.20
+++ Css2Style.java 5 Nov 2012 15:35:25 -0000 1.21
@@ -27,6 +27,7 @@
import org.w3c.css.properties.css.CssTextShadow;
import org.w3c.css.properties.css.CssTop;
import org.w3c.css.properties.css.CssUnicodeBidi;
+import org.w3c.css.properties.css.CssVisibility;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.Warning;
import org.w3c.css.util.Warnings;
@@ -77,6 +78,7 @@
public CssMarkerOffset cssMarkerOffset;
public CssDirection cssDirection;
public CssUnicodeBidi cssUnicodeBidi;
+ public CssVisibility cssVisibility;
/**
* Get the azimuth
@@ -360,7 +362,17 @@
}
return cssUnicodeBidi;
}
-
+ /**
+ * Get the visibility property
+ */
+ public final CssVisibility getVisibility() {
+ if (cssVisibility == null) {
+ cssVisibility =
+ (CssVisibility) style.CascadingOrder(new CssVisibility(),
+ style, selector);
+ }
+ return cssVisibility;
+ }
/**
* Find conflicts in this Style
*
--- NEW FILE: CssVisibility.java ---
// $Id: CssVisibility.java,v 1.1 2012/11/05 15:35:25 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.CssTypes;
import org.w3c.css.values.CssValue;
/**
* @spec http://www.w3.org/TR/2008/REC-CSS2-20080411/visufx.html#propdef-visibility
*/
public class CssVisibility extends org.w3c.css.properties.css.CssVisibility {
public static final CssIdent[] allowed_values;
static {
String[] _allowed_values = {"visible", "hidden", "collapse"};
int i = 0;
allowed_values = new CssIdent[_allowed_values.length];
for (String s : _allowed_values) {
allowed_values[i++] = CssIdent.getIdent(s);
}
}
public static final CssIdent getAllowedIdent(CssIdent ident) {
for (CssIdent id : allowed_values) {
if (id.equals(ident)) {
return id;
}
}
return null;
}
/**
* Create a new CssVisibility
*/
public CssVisibility() {
}
/**
* Creates a new CssVisibility
*
* @param expression The expression for this property
* @throws org.w3c.css.util.InvalidParamException
* Expressions are incorrect
*/
public CssVisibility(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
if (check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
setByUser();
CssValue val;
char op;
val = expression.getValue();
op = expression.getOperator();
if (val.getType() != CssTypes.CSS_IDENT) {
throw new InvalidParamException("value", val,
getPropertyName(), ac);
}
CssIdent id = (CssIdent) val;
if (inherit.equals(id)) {
value = inherit;
} else {
value = getAllowedIdent(id);
if (value == null) {
throw new InvalidParamException("value",
val.toString(),
getPropertyName(), ac);
}
}
expression.next();
}
public CssVisibility(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
}
Received on Monday, 5 November 2012 15:35:32 UTC