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

2002/css-validator/org/w3c/css/properties/atsc ATSCStyle.java,1.3,1.4 CssBorderFaceColorATSC.java,1.5,1.6 ATSCColor.java,1.5,NONE

From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
Date: Tue, 04 Oct 2011 13:05:25 +0000
To: www-validator-cvs@w3.org
Message-Id: <E1RB4h1-0004id-QK@lionel-hutz.w3.org>
Update of /sources/public/2002/css-validator/org/w3c/css/properties/atsc
In directory hutz:/tmp/cvs-serv17942/org/w3c/css/properties/atsc

Modified Files:
	ATSCStyle.java CssBorderFaceColorATSC.java 
Removed Files:
	ATSCColor.java 
Log Message:
some reordering to have only one background-color to check in checkConflicts (like what was done for CssColors

--- ATSCColor.java DELETED ---

Index: ATSCStyle.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/ATSCStyle.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ATSCStyle.java	9 Sep 2011 12:16:42 -0000	1.3
+++ ATSCStyle.java	4 Oct 2011 13:05:23 -0000	1.4
@@ -37,7 +37,6 @@
     MathlineATSC mathlineATSC;
     ToplineATSC toplineATSC;
     DefinitionSrcATSC definitionSrcATSC;
-    ATSCColor ATSCcolor;
     CssBackgroundColorATSC cssBackgroundColorATSC;
     CssBackgroundImageATSC cssBackgroundImageATSC;
     CssBackgroundRepeatATSC cssBackgroundRepeatATSC;
@@ -158,10 +157,6 @@
         return definitionSrcATSC;
     }
 
-    public final ATSCColor getColorATSC() {
-	return ATSCcolor;
-    }
-
     public final CssBackgroundColorATSC getBackgroundColorATSC() {
 	if (cssBackgroundATSC.color == null) {
 	    cssBackgroundATSC.color =

Index: CssBorderFaceColorATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/CssBorderFaceColorATSC.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- CssBorderFaceColorATSC.java	29 Sep 2011 09:08:59 -0000	1.5
+++ CssBorderFaceColorATSC.java	4 Oct 2011 13:05:23 -0000	1.6
@@ -26,7 +26,7 @@
      * Create a new CssBorderFaceColor
      */
     public CssBorderFaceColorATSC() {
-	face = new org.w3c.css.values.CssColor();
+        face = new org.w3c.css.values.CssColor();
     }
 
     /**
@@ -34,8 +34,8 @@
      *
      * @param color A color property
      */
-    public CssBorderFaceColorATSC(ATSCColor color) {
-	face = color.color;
+    public CssBorderFaceColorATSC(org.w3c.css.properties.css2.CssColor color) {
+        face = color.getColor();
     }
 
     /**
@@ -44,47 +44,47 @@
      * @param another An another face.
      */
     public CssBorderFaceColorATSC(CssBorderFaceColorATSC another) {
-	face = another.face;
+        face = another.face;
     }
 
     /**
      * Create a new CssBorderFaceColor with an expression
      *
      * @param expression The expression for this property.
-     * @exception InvalidParamException color is not a color
+     * @throws InvalidParamException color is not a color
      */
     public CssBorderFaceColorATSC(ApplContext ac, CssExpression expression,
-	    boolean check) throws InvalidParamException {
+                                  boolean check) throws InvalidParamException {
 
-	if(check && expression.getCount() > 1) {
-	    throw new InvalidParamException("unrecognize", ac);
-	}
+        if (check && expression.getCount() > 1) {
+            throw new InvalidParamException("unrecognize", ac);
+        }
 
-	CssValue val = expression.getValue();
+        CssValue val = expression.getValue();
 
-	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.CssColor(ac, (String) val.get());
-	} else {
-	    throw new InvalidParamException("value", val.toString(),
-					    "border-color", ac);
-	}
-	expression.next();
+        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.CssColor(ac, (String) val.get());
+        } else {
+            throw new InvalidParamException("value", val.toString(),
+                    "border-color", ac);
+        }
+        expression.next();
     }
 
     public CssBorderFaceColorATSC(ApplContext ac, CssExpression expression)
-	    throws InvalidParamException {
-	this(ac, expression, false);
+            throws InvalidParamException {
+        this(ac, expression, false);
     }
 
     /**
      * Returns the internal color
      */
     public CssValue getColor() {
-	return face;
+        return face;
     }
 
     /**
@@ -92,14 +92,14 @@
      * It is used by all macro for the function <code>print</code>
      */
     public boolean isDefault() {
-	return false; // @@ FIXME face.isDefault();
+        return false; // @@ FIXME face.isDefault();
     }
 
     /**
      * Returns a string representation of the object.
      */
     public String toString() {
-	return face.toString();
+        return face.toString();
     }
 
     /**
@@ -108,6 +108,6 @@
      * @param value The another faces.
      */
     public boolean equals(CssBorderFaceColorATSC color) {
-	return this.face.equals(color.face);
+        return this.face.equals(color.face);
     }
 }
Received on Tuesday, 4 October 2011 13:06:01 UTC

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