- From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
- Date: Tue, 27 Sep 2011 08:15:49 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/values
In directory hutz:/tmp/cvs-serv13381/org/w3c/css/values
Modified Files:
CssColor.java CssIdent.java CssLength.java CssPercentage.java
Log Message:
width and height, including css3 value initial
Index: CssPercentage.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/values/CssPercentage.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- CssPercentage.java 5 Jan 2010 13:50:00 -0000 1.8
+++ CssPercentage.java 27 Sep 2011 08:15:46 -0000 1.9
@@ -103,7 +103,7 @@
/**
* Returns the value as a float
*/
- public float getValue() {
+ public float floatValue() {
return value.floatValue();
}
Index: CssIdent.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/values/CssIdent.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- CssIdent.java 5 Jan 2010 13:50:00 -0000 1.10
+++ CssIdent.java 27 Sep 2011 08:15:46 -0000 1.11
@@ -20,6 +20,7 @@
static {
allowedvalues = new HashMap<String, CssIdent>();
allowedvalues.put("inherit", new CssIdent("inherit"));
+ allowedvalues.put("initial", new CssIdent("initial"));
allowedvalues.put("none", new CssIdent("none"));
}
Index: CssColor.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/values/CssColor.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- CssColor.java 5 Jan 2010 19:49:51 -0000 1.20
+++ CssColor.java 27 Sep 2011 08:15:46 -0000 1.21
@@ -279,7 +279,7 @@
break;
case CssTypes.CSS_PERCENTAGE:
CssPercentage percent = (CssPercentage) val;
- rgb.setRed(clippedPercentValue(percent.getValue(), ac));
+ rgb.setRed(clippedPercentValue(percent.floatValue(), ac));
rgb.setPercent(true);
break;
default:
@@ -307,7 +307,7 @@
throw new InvalidParamException("integer", val, ac);
}
CssPercentage percent = (CssPercentage) val;
- rgb.setGreen(clippedPercentValue(percent.getValue(), ac));
+ rgb.setGreen(clippedPercentValue(percent.floatValue(), ac));
break;
default:
throw new InvalidParamException("rgb", val, ac);
@@ -334,7 +334,7 @@
throw new InvalidParamException("integer", val, ac);
}
CssPercentage percent = (CssPercentage) val;
- rgb.setBlue(clippedPercentValue(percent.getValue(), ac));
+ rgb.setBlue(clippedPercentValue(percent.floatValue(), ac));
break;
default:
throw new InvalidParamException("rgb", val, ac);
@@ -492,7 +492,7 @@
break;
case CssTypes.CSS_PERCENTAGE:
CssPercentage percent = (CssPercentage) val;
- rgba.setRed(clippedPercentValue(percent.getValue(), ac));
+ rgba.setRed(clippedPercentValue(percent.floatValue(), ac));
rgba.setPercent(true);
break;
default:
@@ -521,7 +521,7 @@
throw new InvalidParamException("integer", val, ac);
}
CssPercentage percent = (CssPercentage) val;
- rgba.setGreen(clippedPercentValue(percent.getValue(), ac));
+ rgba.setGreen(clippedPercentValue(percent.floatValue(), ac));
break;
default:
exp.starts();
@@ -551,7 +551,7 @@
throw new InvalidParamException("integer", val, ac);
}
CssPercentage percent = (CssPercentage) val;
- rgba.setBlue(clippedPercentValue(percent.getValue(), ac));
+ rgba.setBlue(clippedPercentValue(percent.floatValue(), ac));
break;
default:
exp.starts();
@@ -605,7 +605,7 @@
}
if (val.getType() == CssTypes.CSS_PERCENTAGE) {
CssPercentage percent = (CssPercentage) val;
- hsl.setSaturation(clippedPercentValue(percent.getValue(), ac));
+ hsl.setSaturation(clippedPercentValue(percent.floatValue(), ac));
} else {
exp.starts();
throw new InvalidParamException("rgb", val, ac); // FIXME hsl
@@ -622,7 +622,7 @@
if (val.getType() == CssTypes.CSS_PERCENTAGE) {
CssPercentage percent = (CssPercentage) val;
- hsl.setLightness(clippedPercentValue(percent.getValue(), ac));
+ hsl.setLightness(clippedPercentValue(percent.floatValue(), ac));
} else {
exp.starts();
throw new InvalidParamException("rgb", val, ac); // FIXME hsl
@@ -664,7 +664,7 @@
}
if (val.getType() == CssTypes.CSS_PERCENTAGE) {
CssPercentage percent = (CssPercentage) val;
- hsla.setSaturation(clippedPercentValue(percent.getValue(), ac));
+ hsla.setSaturation(clippedPercentValue(percent.floatValue(), ac));
} else {
exp.starts();
throw new InvalidParamException("rgb", val, ac); // FIXME hsl
@@ -680,7 +680,7 @@
}
if (val.getType() == CssTypes.CSS_PERCENTAGE) {
CssPercentage percent = (CssPercentage) val;
- hsla.setLightness(clippedPercentValue(percent.getValue(), ac));
+ hsla.setLightness(clippedPercentValue(percent.floatValue(), ac));
} else {
exp.starts();
throw new InvalidParamException("rgb", val, ac); // FIXME hsl
Index: CssLength.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/values/CssLength.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- CssLength.java 5 Jan 2010 13:50:00 -0000 1.7
+++ CssLength.java 27 Sep 2011 08:15:46 -0000 1.8
@@ -146,6 +146,13 @@
}
/**
+ * return the float value
+ */
+ public float floatValue() {
+ return value.floatValue();
+ }
+
+ /**
* Returns the current value
*/
public String getUnit() {
Received on Tuesday, 27 September 2011 08:15:56 UTC