W3C home > Mailing lists > Public > www-validator-cvs@w3.org > September 2011

2002/css-validator/org/w3c/css/properties/atsc ATSCColor.java,1.4,1.5 CssBackgroundColorATSC.java,1.4,1.5 CssBorderFaceColorATSC.java,1.4,1.5

From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
Date: Thu, 29 Sep 2011 09:09:01 +0000
To: www-validator-cvs@w3.org
Message-Id: <E1R9Cc1-0006ex-46@lionel-hutz.w3.org>
Update of /sources/public/2002/css-validator/org/w3c/css/properties/atsc
In directory hutz:/tmp/cvs-serv25474/org/w3c/css/properties/atsc

Modified Files:
	ATSCColor.java CssBackgroundColorATSC.java 
	CssBorderFaceColorATSC.java 
Log Message:
getting rid of multiple classes for Color value

Index: CssBackgroundColorATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/CssBackgroundColorATSC.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssBackgroundColorATSC.java	5 Jan 2010 13:49:35 -0000	1.4
+++ CssBackgroundColorATSC.java	29 Sep 2011 09:08:58 -0000	1.5
@@ -61,8 +61,7 @@
 	setByUser();
 	CssValue val = expression.getValue();
 
-	if (val instanceof org.w3c.css.values.ATSCColor ||
-		val instanceof org.w3c.css.values.CssColor) {
+	if (val instanceof org.w3c.css.values.CssColor) {
 	    color = val;
 	    expression.next();
 	} else if (val instanceof CssIdent) {
@@ -73,7 +72,7 @@
 		color = inherit;
 		expression.next();
 	    } else {
-		color = new org.w3c.css.values.ATSCColor(ac, (String) val.get());
+		color = new org.w3c.css.values.CssColor(ac, (String) val.get());
 		expression.next();
 	    }
 	} else {

Index: ATSCColor.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/ATSCColor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ATSCColor.java	5 Jan 2010 13:49:34 -0000	1.4
+++ ATSCColor.java	29 Sep 2011 09:08:58 -0000	1.5
@@ -63,12 +63,11 @@
 	if (val.equals(inherit)) {
 	    color = inherit;
 	    expression.next();
-	} else if (val instanceof org.w3c.css.values.ATSCColor ||
-		val instanceof org.w3c.css.values.CssColor) {
+	} else if (val instanceof org.w3c.css.values.CssColor) {
 	    color = val;
 	    expression.next();
 	} else if (val instanceof CssIdent) {
-	    color = new org.w3c.css.values.ATSCColor(ac, (String) val.get());
+	    color = new org.w3c.css.values.CssColor(ac, (String) val.get());
 	    expression.next();
 	} else {
 	    throw new InvalidParamException("value", expression.getValue(),
@@ -91,7 +90,7 @@
     /**
      * Returns the color
      */
-    public org.w3c.css.values.ATSCColor getColor() {
+    public org.w3c.css.values.CssColor getColor() {
 	if (color.equals(inherit)) {
 	    /*
 	    System.err.println("[ERROR] org.w3c.css.properties.CssColor");
@@ -99,7 +98,7 @@
 	    */
 	    return null;
 	} else {
-	    return (org.w3c.css.values.ATSCColor) color;
+	    return (org.w3c.css.values.CssColor) color;
 	}
     }
 

Index: CssBorderFaceColorATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/CssBorderFaceColorATSC.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssBorderFaceColorATSC.java	5 Jan 2010 13:49:35 -0000	1.4
+++ CssBorderFaceColorATSC.java	29 Sep 2011 09:08:59 -0000	1.5
@@ -26,7 +26,7 @@
      * Create a new CssBorderFaceColor
      */
     public CssBorderFaceColorATSC() {
-	face = new org.w3c.css.values.ATSCColor();
+	face = new org.w3c.css.values.CssColor();
     }
 
     /**
@@ -62,13 +62,12 @@
 
 	CssValue val = expression.getValue();
 
-	if (val instanceof org.w3c.css.values.ATSCColor ||
-		val instanceof CssColor) {
+	if (val instanceof CssColor) {
 	    face = val;
 	} else if (val.equals(CssProperty.inherit)) {
 	    face = CssProperty.inherit;
 	} else if (val instanceof CssIdent) {
-	    face = new org.w3c.css.values.ATSCColor(ac, (String) val.get());
+	    face = new org.w3c.css.values.CssColor(ac, (String) val.get());
 	} else {
 	    throw new InvalidParamException("value", val.toString(),
 					    "border-color", ac);
Received on Thursday, 29 September 2011 09:09:05 UTC

This archive was generated by hypermail 2.3.1 : Wednesday, 7 January 2015 15:17:46 UTC