- From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
- Date: Thu, 11 Oct 2012 12:36:17 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/properties/css2
In directory hutz:/tmp/cvs-serv26209/css2
Modified Files:
Css2Style.java
Added Files:
CssMaxWidth.java
Log Message:
max-width per relevant specs
Index: Css2Style.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css2/Css2Style.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Css2Style.java 11 Oct 2012 09:53:52 -0000 1.11
+++ Css2Style.java 11 Oct 2012 12:36:14 -0000 1.12
@@ -9,6 +9,7 @@
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.CssMaxWidth;
import org.w3c.css.properties.css.CssMinWidth;
import org.w3c.css.properties.css.CssPosition;
import org.w3c.css.properties.css.CssRight;
@@ -45,6 +46,7 @@
public CssPosition cssPosition;
public CssMinWidth cssMinWidth;
+ public CssMaxWidth cssMaxWidth;
/**
* Get the azimuth
@@ -215,4 +217,12 @@
}
return cssMinWidth;
}
+
+ public final CssMaxWidth getMaxWidth() {
+ if (cssMaxWidth == null) {
+ cssMaxWidth =
+ (CssMaxWidth) style.CascadingOrder(new CssMaxWidth(), style, selector);
+ }
+ return cssMaxWidth;
+ }
}
--- NEW FILE: CssMaxWidth.java ---
// $Id: CssMaxWidth.java,v 1.1 2012/10/11 12:36:14 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.CssLength;
import org.w3c.css.values.CssPercentage;
import org.w3c.css.values.CssTypes;
import org.w3c.css.values.CssValue;
/**
* @spec http://www.w3.org/TR/2008/REC-CSS2-20080411/visudet.html#propdef-max-width
*/
public class CssMaxWidth extends org.w3c.css.properties.css.CssMaxWidth {
/**
* Create a new CssMaxWidth
*/
public CssMaxWidth() {
}
/**
* Creates a new CssMaxWidth
*
* @param expression The expression for this property
* @throws org.w3c.css.util.InvalidParamException
* Expressions are incorrect
*/
public CssMaxWidth(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
if (check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
CssValue val = expression.getValue();
setByUser();
switch (val.getType()) {
case CssTypes.CSS_NUMBER:
case CssTypes.CSS_LENGTH:
CssLength length = val.getLength();
length.checkPositiveness(ac, this);
value = val;
break;
case CssTypes.CSS_PERCENTAGE:
CssPercentage percentage = val.getPercentage();
percentage.checkPositiveness(ac, this);
value = val;
break;
case CssTypes.CSS_IDENT:
if (inherit.equals(val)) {
value = inherit;
break;
}
if (none.equals(val)) {
value = none;
break;
}
default:
throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
expression.next();
}
public CssMaxWidth(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
}
Received on Thursday, 11 October 2012 12:36:21 UTC