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

2002/css-validator/org/w3c/css/properties/css2/user Css2Style.java,1.2,1.3 Outline.java,1.3,1.4 OutlineATSC.java,1.3,1.4

From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
Date: Fri, 09 Sep 2011 12:16:47 +0000
To: www-validator-cvs@w3.org
Message-Id: <E1R200l-00050B-OE@lionel-hutz.w3.org>
Update of /sources/public/2002/css-validator/org/w3c/css/properties/css2/user
In directory hutz:/tmp/cvs-serv18813/properties/css2/user

Modified Files:
	Css2Style.java Outline.java OutlineATSC.java 
Log Message:
code cleanup, removed dead code, starting reorg of azimuth (others to follow)

Index: Css2Style.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css2/user/Css2Style.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Css2Style.java	14 Sep 2005 15:14:58 -0000	1.2
+++ Css2Style.java	9 Sep 2011 12:16:45 -0000	1.3
@@ -8,8 +8,6 @@
  */
 package org.w3c.css.properties.css2.user;
 
-import org.w3c.css.parser.CssPrinterStyle;
-
 /**
  * @version $Revision$
  */
@@ -141,27 +139,4 @@
         return outlineATSC;
     }
 
-    /**
-     * Print this style.
-     *
-     * @param printer The printer interface.
-     */
-    public void print(CssPrinterStyle printer) {
-	super.print(printer);
-	if (cursor != null) {
-	    cursor.print(printer);
-	}
-	if (cursorATSC != null) {
-	    cursorATSC.print(printer);
-	}
-	if (cursorCSS2 != null) {
-	    cursorCSS2.print(printer);
-	}
-	if (outline != null) {
-	    outline.print(printer);
-	}
-	if (outlineATSC != null) {
-	    outlineATSC.print(printer);
-	}
-    }
 }

Index: Outline.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css2/user/Outline.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Outline.java	5 Jan 2010 13:49:48 -0000	1.3
+++ Outline.java	9 Sep 2011 12:16:45 -0000	1.4
@@ -8,7 +8,6 @@
  */
 package org.w3c.css.properties.css2.user;
 
-import org.w3c.css.parser.CssPrinterStyle;
 import org.w3c.css.parser.CssSelectors;
 import org.w3c.css.parser.CssStyle;
 import org.w3c.css.properties.css.CssProperty;
@@ -21,7 +20,7 @@
 /**
  * @version $Revision$
  */
-public class Outline extends UserProperty implements CssOperator {
+public class Outline extends UserProperty {
 
     OutlineColor color;
     OutlineWidth width;
@@ -49,7 +48,7 @@
 	}
 
 	CssValue val = expression.getValue();
-        char op = SPACE;
+        char op = CssOperator.SPACE;
         boolean find = true;
         int max_values = 3;
 
@@ -79,7 +78,7 @@
                 break;
 	    }
 
-            if (op != SPACE) {
+            if (op != CssOperator.SPACE) {
                 throw new InvalidParamException("operator",
                                                 ((new Character(op)).toString()), ac);
 	    }
@@ -189,36 +188,9 @@
     }
 
     /**
-     * Print this property.
-     *
-     * @param printer The printer.
-     * @see #toString()
-     * @see #getPropertyName()
-     */
-    public void print(CssPrinterStyle printer) {
-	if ((color != null && width != null && style != null) &&
-	    (getImportant() ||
-	     (!color.getImportant()
-	      && !style.getImportant()
-	      && !width.getImportant()))) {
-	    printer.print(this);
-	} else {
-	    if (color != null) {
-		color.print(printer);
-	    }
-	    if (width != null) {
-		width.print(printer);
-	    }
-	    if (style != null) {
-		style.print(printer);
-	    }
-	}
-    }
-
-    /**
      * Add this property to the CssStyle
      *
-     * @param style The CssStyle
+     * @param style0 The CssStyle
      */
     public void addToStyle(ApplContext ac, CssStyle style0) {
 	// outlineColor and outlineWidth can't be null ...
@@ -251,7 +223,7 @@
     /**
      * Compares two properties for equality.
      *
-     * @param value The other property.
+     * @param property The other property.
      */
     public boolean equals(CssProperty property) {
 	return false; // @FIXME

Index: OutlineATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css2/user/OutlineATSC.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- OutlineATSC.java	5 Jan 2010 13:49:48 -0000	1.3
+++ OutlineATSC.java	9 Sep 2011 12:16:45 -0000	1.4
@@ -8,7 +8,6 @@
  */
 package org.w3c.css.properties.css2.user;
 
-import org.w3c.css.parser.CssPrinterStyle;
 import org.w3c.css.parser.CssSelectors;
 import org.w3c.css.parser.CssStyle;
 import org.w3c.css.properties.css.CssProperty;
@@ -192,33 +191,6 @@
     }
 
     /**
-     * Print this property.
-     *
-     * @param printer The printer.
-     * @see #toString()
-     * @see #getPropertyName()
-     */
-    public void print(CssPrinterStyle printer) {
-	if ((color != null && width != null && style != null) &&
-	    (getImportant() ||
-	     (!color.getImportant()
-	      && !style.getImportant()
-	      && !width.getImportant()))) {
-	    printer.print(this);
-	} else {
-	    if (color != null) {
-		color.print(printer);
-	    }
-	    if (width != null) {
-		width.print(printer);
-	    }
-	    if (style != null) {
-		style.print(printer);
-	    }
-	}
-    }
-
-    /**
      * Add this property to the CssStyle
      *
      * @param style The CssStyle
Received on Friday, 9 September 2011 12:16:53 UTC

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