- From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
- Date: Thu, 27 Sep 2012 14:57:34 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/properties/css2
In directory hutz:/tmp/cvs-serv19765/css2
Modified Files:
Css2Style.java
Added Files:
CssBottom.java CssLeft.java CssRight.java CssTop.java
Log Message:
top/left/right/bottom per relevant specs
--- NEW FILE: CssRight.java ---
// $Id: CssRight.java,v 1.1 2012/09/27 14:57:31 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;
/**
* @spec http://www.w3.org/TR/2008/REC-CSS2-20080411/visuren.html#propdef-right
* @see org.w3c.css.properties.css2.CssTop
*/
public class CssRight extends org.w3c.css.properties.css.CssRight {
/**
* Create a new CssRight
*/
public CssRight() {
}
/**
* Creates a new CssRight
* @see org.w3c.css.properties.css2.CssTop
*
* @param expression The expression for this property
* @throws org.w3c.css.util.InvalidParamException
* Expressions are incorrect
*/
public CssRight(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
value = CssTop.checkValue(ac, expression, check, this);
}
public CssRight(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
}
--- NEW FILE: CssBottom.java ---
// $Id: CssBottom.java,v 1.1 2012/09/27 14:57:31 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;
/**
* @spec http://www.w3.org/TR/2008/REC-CSS2-20080411/visuren.html#propdef-bottom
* @see CssTop
*/
public class CssBottom extends org.w3c.css.properties.css.CssBottom {
/**
* Create a new CssBottom
*/
public CssBottom() {
}
/**
* Creates a new CssBottom
* @see CssTop
*
* @param expression The expression for this property
* @throws org.w3c.css.util.InvalidParamException
* Expressions are incorrect
*/
public CssBottom(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
value = CssTop.checkValue(ac, expression, check, this);
}
public CssBottom(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
}
Index: Css2Style.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css2/Css2Style.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Css2Style.java 29 Aug 2012 10:08:48 -0000 1.8
+++ Css2Style.java 27 Sep 2012 14:57:31 -0000 1.9
@@ -7,7 +7,11 @@
package org.w3c.css.properties.css2;
import org.w3c.css.properties.aural.ACssStyle;
+import org.w3c.css.properties.css.CssBottom;
+import org.w3c.css.properties.css.CssLeft;
+import org.w3c.css.properties.css.CssRight;
import org.w3c.css.properties.css.CssTextShadow;
+import org.w3c.css.properties.css.CssTop;
/**
* @version $Revision$
@@ -31,6 +35,12 @@
*/
public CssTextShadow cssTextShadow;
+ public CssTop cssTop;
+ public CssBottom cssBottom;
+ public CssLeft cssLeft;
+ public CssRight cssRight;
+
+
/**
* Get the azimuth
*/
@@ -138,4 +148,47 @@
return cssTextShadow;
}
+ /**
+ * Get the top property
+ */
+ public final CssTop getTop() {
+ if (cssTop == null) {
+ cssTop =
+ (CssTop) style.CascadingOrder(new CssTop(), style, selector);
+ }
+ return cssTop;
+ }
+
+ /**
+ * Get the bottom property
+ */
+ public final CssBottom getBottom() {
+ if (cssBottom == null) {
+ cssBottom =
+ (CssBottom) style.CascadingOrder(new CssBottom(), style, selector);
+ }
+ return cssBottom;
+ }
+
+ /**
+ * Get the left property
+ */
+ public final CssLeft getLeft() {
+ if (cssLeft == null) {
+ cssLeft =
+ (CssLeft) style.CascadingOrder(new CssLeft(), style, selector);
+ }
+ return cssLeft;
+ }
+
+ /**
+ * Get the right property
+ */
+ public final CssRight getRight() {
+ if (cssRight == null) {
+ cssRight =
+ (CssRight) style.CascadingOrder(new CssRight(), style, selector);
+ }
+ return cssRight;
+ }
}
--- NEW FILE: CssTop.java ---
// $Id: CssTop.java,v 1.1 2012/09/27 14:57:31 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.properties.css.CssProperty;
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.CssLength;
import org.w3c.css.values.CssTypes;
import org.w3c.css.values.CssValue;
/**
* @spec http://www.w3.org/TR/2008/REC-CSS2-20080411/visuren.html#propdef-top
* @see CssBottom
* @see CssLeft
* @see CssRight
*/
public class CssTop extends org.w3c.css.properties.css.CssTop {
public static final CssIdent auto = CssIdent.getIdent("auto");
/**
* Create a new CssTop
*/
public CssTop() {
}
/**
* Creates a new CssTop
*
* @param expression The expression for this property
* @throws org.w3c.css.util.InvalidParamException
* Expressions are incorrect
*/
public CssTop(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
value = checkValue(ac, expression, check, this);
}
public CssTop(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
/**
* for use by other box properties
*
* @see CssBottom
* @see CssLeft
* @see CssRight
*/
protected static CssValue checkValue(ApplContext ac,
CssExpression expression,
boolean check, CssProperty caller)
throws InvalidParamException {
if (check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
caller.setByUser();
CssValue val;
char op;
val = expression.getValue();
op = expression.getOperator();
switch (val.getType()) {
case CssTypes.CSS_NUMBER:
CssLength l = val.getLength();
case CssTypes.CSS_LENGTH:
case CssTypes.CSS_PERCENTAGE:
expression.next();
return val;
case CssTypes.CSS_IDENT:
if (inherit.equals(val)) {
expression.next();
return inherit;
}
if (auto.equals(val)) {
expression.next();
return auto;
}
// if not inherit, or not an ident
// let it flow to the exception
}
throw new InvalidParamException("value",
val.toString(),
caller.getPropertyName(), ac);
}
}
--- NEW FILE: CssLeft.java ---
// $Id: CssLeft.java,v 1.1 2012/09/27 14:57:31 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;
/**
* @spec http://www.w3.org/TR/2008/REC-CSS2-20080411/visuren.html#propdef-left
* @see org.w3c.css.properties.css2.CssTop
*/
public class CssLeft extends org.w3c.css.properties.css.CssLeft {
/**
* Create a new CssLeft
*/
public CssLeft() {
}
/**
* Creates a new CssLeft
* @see org.w3c.css.properties.css2.CssTop
*
* @param expression The expression for this property
* @throws org.w3c.css.util.InvalidParamException
* Expressions are incorrect
*/
public CssLeft(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
value = CssTop.checkValue(ac, expression, check, this);
}
public CssLeft(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
}
Received on Thursday, 27 September 2012 14:57:44 UTC