- From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
- Date: Thu, 11 Oct 2012 13:17:39 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/properties/css2
In directory hutz:/tmp/cvs-serv2540/css2
Modified Files:
Css2Style.java
Added Files:
CssMaxHeight.java
Log Message:
max-height per css1-css3
Index: Css2Style.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css2/Css2Style.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Css2Style.java 11 Oct 2012 12:55:39 -0000 1.13
+++ Css2Style.java 11 Oct 2012 13:17:36 -0000 1.14
@@ -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.CssMaxHeight;
import org.w3c.css.properties.css.CssMaxWidth;
import org.w3c.css.properties.css.CssMinHeight;
import org.w3c.css.properties.css.CssMinWidth;
@@ -49,6 +50,7 @@
public CssMinWidth cssMinWidth;
public CssMaxWidth cssMaxWidth;
public CssMinHeight cssMinHeight;
+ public CssMaxHeight cssMaxHeight;
/**
* Get the azimuth
@@ -236,4 +238,11 @@
return cssMinHeight;
}
+ public final CssMaxHeight getMaxHeight() {
+ if (cssMaxHeight == null) {
+ cssMaxHeight =
+ (CssMaxHeight) style.CascadingOrder(new CssMaxHeight(), style, selector);
+ }
+ return cssMaxHeight;
+ }
}
--- NEW FILE: CssMaxHeight.java ---
// $Id: CssMaxHeight.java,v 1.1 2012/10/11 13:17:36 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-height
*/
public class CssMaxHeight extends org.w3c.css.properties.css.CssMaxHeight {
/**
* Create a new CssMaxHeight
*/
public CssMaxHeight() {
}
/**
* Creates a new CssMaxHeight
*
* @param expression The expression for this property
* @throws org.w3c.css.util.InvalidParamException
* Expressions are incorrect
*/
public CssMaxHeight(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 CssMaxHeight(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
}
Received on Thursday, 11 October 2012 13:17:43 UTC