- From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
- Date: Tue, 28 Aug 2012 20:08:43 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/properties/css
In directory hutz:/tmp/cvs-serv19583
Modified Files:
CssBackgroundClip.java CssBackgroundColor.java
CssBackgroundImage.java CssBackgroundOrigin.java
CssBackgroundSize.java CssBoxShadow.java
Log Message:
small updates
Index: CssBackgroundOrigin.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css/CssBackgroundOrigin.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- CssBackgroundOrigin.java 5 Oct 2011 11:46:42 -0000 1.7
+++ CssBackgroundOrigin.java 28 Aug 2012 20:08:41 -0000 1.8
@@ -13,6 +13,7 @@
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssValue;
/**
* @since CSS3
@@ -20,8 +21,7 @@
public class CssBackgroundOrigin extends CssProperty {
- Object value;
-
+ public CssValue value;
/**
* Create a new CssBackgroundClip
@@ -52,7 +52,6 @@
* @param style The CssStyle
*/
public void addToStyle(ApplContext ac, CssStyle style) {
- // TODO FIXME -> in CssStyle
if (((Css3Style) style).cssBackgroundOrigin != null)
style.addRedefinitionWarning(ac, this);
((Css3Style) style).cssBackgroundOrigin = this;
@@ -96,10 +95,6 @@
return value;
}
- public void set(Object val) {
- value = val;
- }
-
/**
* Returns true if this property is "softly" inherited
*/
@@ -111,7 +106,6 @@
* Returns a string representation of the object
*/
public String toString() {
-
return value.toString();
}
Index: CssBackgroundColor.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css/CssBackgroundColor.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- CssBackgroundColor.java 5 Oct 2011 11:46:42 -0000 1.5
+++ CssBackgroundColor.java 28 Aug 2012 20:08:41 -0000 1.6
@@ -19,7 +19,7 @@
*/
public class CssBackgroundColor extends CssProperty {
- CssValue color;
+ public CssValue value;
/**
* Create a new CssBackgroundColor
@@ -47,18 +47,18 @@
* Returns the value of this property
*/
public Object get() {
- return color;
+ return value;
}
public void set(CssValue col) {
- color = col;
+ value = col;
}
/**
* Returns the color
*/
public CssValue getColor() {
- return color;
+ return value;
}
/**
@@ -66,14 +66,14 @@
* e.g. his value equals inherit
*/
public boolean isSoftlyInherited() {
- return color.equals(inherit);
+ return value.equals(inherit);
}
/**
* Returns a string representation of the object.
*/
public String toString() {
- return color.toString();
+ return value.toString();
}
@@ -110,7 +110,7 @@
*/
public boolean equals(CssProperty property) {
return (property instanceof CssBackgroundColor &&
- color.equals(((CssBackgroundColor) property).color));
+ value.equals(((CssBackgroundColor) property).value));
}
/**
Index: CssBackgroundImage.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css/CssBackgroundImage.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- CssBackgroundImage.java 5 Oct 2011 11:46:42 -0000 1.5
+++ CssBackgroundImage.java 28 Aug 2012 20:08:41 -0000 1.6
@@ -11,12 +11,13 @@
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssValue;
/**
* @since CSS1
*/
public class CssBackgroundImage extends CssProperty {
- Object url = null;
+ public CssValue value;
/**
* Create a new CssBackgroundImage
@@ -49,11 +50,7 @@
*/
public Object get() {
- return url;
- }
-
- public void set(Object val) {
- url = val;
+ return value;
}
/**
@@ -61,14 +58,14 @@
* e.g. his value equals inherit
*/
public boolean isSoftlyInherited() {
- return (inherit == url);
+ return (inherit == value);
}
/**
* Returns a string representation of the object.
*/
public String toString() {
- return url.toString();
+ return value.toString();
}
/**
@@ -110,8 +107,8 @@
* @param property The other property.
*/
public boolean equals(CssProperty property) {
- return (property instanceof CssBackgroundImage && url != null &&
- url.equals(((CssBackgroundImage) property).url));
+ return (property instanceof CssBackgroundImage && value != null &&
+ value.equals(((CssBackgroundImage) property).value));
}
/**
Index: CssBackgroundSize.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css/CssBackgroundSize.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- CssBackgroundSize.java 5 Oct 2011 11:46:42 -0000 1.6
+++ CssBackgroundSize.java 28 Aug 2012 20:08:41 -0000 1.7
@@ -11,6 +11,7 @@
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssValue;
/**
* @since CSS3
@@ -20,7 +21,7 @@
private static final String propertyName = "background-size";
- Object value;
+ public CssValue value;
/**
* Create a new CssBackgroundSize
@@ -96,9 +97,6 @@
return value;
}
- public void set(Object val) {
- value = val;
- }
/**
* Returns true if this property is "softly" inherited
*/
Index: CssBoxShadow.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css/CssBoxShadow.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBoxShadow.java 5 Apr 2012 09:42:20 -0000 1.2
+++ CssBoxShadow.java 28 Aug 2012 20:08:41 -0000 1.3
@@ -11,7 +11,7 @@
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.CssValue;
/**
* @since CSS3
@@ -21,7 +21,7 @@
private static final String propertyName = "box-shadow";
- CssIdent value;
+ public CssValue value;
/**
* Create a new CssBoxShadow
@@ -53,8 +53,9 @@
* @param style The CssStyle
*/
public void addToStyle(ApplContext ac, CssStyle style) {
- if (((Css3Style) style).cssBoxShadow != null)
+ if (((Css3Style) style).cssBoxShadow != null) {
style.addRedefinitionWarning(ac, this);
+ }
((Css3Style) style).cssBoxShadow = this;
}
Index: CssBackgroundClip.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css/CssBackgroundClip.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- CssBackgroundClip.java 5 Oct 2011 11:46:42 -0000 1.5
+++ CssBackgroundClip.java 28 Aug 2012 20:08:41 -0000 1.6
@@ -12,6 +12,7 @@
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssValue;
/**
* @since CSS3
@@ -20,7 +21,7 @@
public class CssBackgroundClip extends CssProperty {
- Object value;
+ public CssValue value;
/**
Received on Tuesday, 28 August 2012 20:08:48 UTC