- From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
- Date: Mon, 15 Oct 2012 15:08:27 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/properties/css3
In directory hutz:/tmp/cvs-serv9330/css3
Modified Files:
Css3Style.java
Added Files:
CssResize.java
Removed Files:
CssResizer.java
Log Message:
resize per http://www.w3.org/TR/2012/WD-css3-ui-20120117/#resize0
Index: Css3Style.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css3/Css3Style.java,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -d -r1.129 -r1.130
--- Css3Style.java 15 Oct 2012 13:36:07 -0000 1.129
+++ Css3Style.java 15 Oct 2012 15:08:25 -0000 1.130
@@ -74,6 +74,7 @@
import org.w3c.css.properties.css.CssOverflowWrap;
import org.w3c.css.properties.css.CssPerspective;
import org.w3c.css.properties.css.CssPerspectiveOrigin;
+import org.w3c.css.properties.css.CssResize;
import org.w3c.css.properties.css.CssTabSize;
import org.w3c.css.properties.css.CssTextAlignLast;
import org.w3c.css.properties.css.CssTextDecorationColor;
@@ -105,7 +106,6 @@
CssRubyPosition cssRubyPosition;
CssRubyAlign cssRubyAlign;
CssRubyOverhang cssRubyOverhang;
- CssResizer cssResizer;
CssWritingMode cssWritingMode;
CssGlyphOrVert cssGlyphOrVert;
CssGlyphHor cssGlyphHor;
@@ -206,7 +206,8 @@
public CssTransform cssTransform;
public CssBoxSizing cssBoxSizing;
-
+ public CssResize cssResize;
+
CssDropInitialAfterAdjust cssDropInitialAfterAdjust;
CssDropInitialAfterAlign cssDropInitialAfterAlign;
CssDropInitialBeforeAdjust cssDropInitialBeforeAdjust;
@@ -288,13 +289,13 @@
return cssBoxSizing;
}
- public CssResizer getResizer() {
- if (cssResizer == null) {
- cssResizer =
- (CssResizer) style.CascadingOrder(
- new CssResizer(), style, selector);
+ public CssResize getResize() {
+ if (cssResize == null) {
+ cssResize =
+ (CssResize) style.CascadingOrder(
+ new CssResize(), style, selector);
}
- return cssResizer;
+ return cssResize;
}
public CssWritingMode getWritingMode() {
--- CssResizer.java DELETED ---
--- NEW FILE: CssResize.java ---
// $Id: CssResize.java,v 1.1 2012/10/15 15:08: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.css3;
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/2012/WD-css3-ui-20120117/#resize0
*/
public class CssResize extends org.w3c.css.properties.css.CssResize {
private static CssIdent[] allowed_values;
static {
String id_values[] = {"none", "both", "horizontal", "vertical"};
allowed_values = new CssIdent[id_values.length];
int i = 0;
for (String s : id_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 CssResize
*/
public CssResize() {
value = initial;
}
/**
* Creates a new CssResize
*
* @param expression The expression for this property
* @throws org.w3c.css.util.InvalidParamException
* Expressions are incorrect
*/
public CssResize(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
setByUser();
CssValue val = expression.getValue();
if (check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
if (val.getType() != CssTypes.CSS_IDENT) {
throw new InvalidParamException("value",
expression.getValue(),
getPropertyName(), ac);
}
// ident, so inherit, or allowed value
if (inherit.equals(val)) {
value = inherit;
} else {
val = getMatchingIdent((CssIdent) val);
if (val == null) {
throw new InvalidParamException("value",
expression.getValue(),
getPropertyName(), ac);
}
value = val;
}
expression.next();
}
public CssResize(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
}
Received on Monday, 15 October 2012 15:08:33 UTC