- From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
- Date: Fri, 09 Sep 2011 12:16:45 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/properties/atsc
In directory hutz:/tmp/cvs-serv18813/properties/atsc
Modified Files:
ATSCStyle.java CssBackgroundATSC.java CssBorderATSC.java
CssBorderBottomATSC.java CssBorderBottomColorATSC.java
CssBorderColorATSC.java CssBorderLeftATSC.java
CssBorderLeftColorATSC.java CssBorderRightATSC.java
CssBorderRightColorATSC.java CssBorderStyleATSC.java
CssBorderTopATSC.java CssBorderTopColorATSC.java
CssBorderWidthATSC.java
Log Message:
code cleanup, removed dead code, starting reorg of azimuth (others to follow)
Index: CssBorderBottomColorATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/CssBorderBottomColorATSC.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssBorderBottomColorATSC.java 5 Jan 2010 13:49:35 -0000 1.4
+++ CssBorderBottomColorATSC.java 9 Sep 2011 12:16:42 -0000 1.5
@@ -7,7 +7,6 @@
package org.w3c.css.properties.atsc;
-import org.w3c.css.parser.CssPrinterStyle;
import org.w3c.css.parser.CssStyle;
import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
@@ -128,15 +127,4 @@
return (property instanceof CssBorderBottomColorATSC && face.equals(((CssBorderBottomColorATSC) property).face));
}
- /**
- * Print this property.
- *
- * @param printer The printer.
- * @see #toString()
- * @see #getPropertyName()
- */
- public void print(CssPrinterStyle printer) {
- if (!face.isDefault())
- printer.print(this);
- }
}
Index: CssBorderRightATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/CssBorderRightATSC.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssBorderRightATSC.java 5 Jan 2010 13:49:35 -0000 1.4
+++ CssBorderRightATSC.java 9 Sep 2011 12:16:42 -0000 1.5
@@ -7,7 +7,6 @@
package org.w3c.css.properties.atsc;
-import org.w3c.css.parser.CssPrinterStyle;
import org.w3c.css.parser.CssSelectors;
import org.w3c.css.parser.CssStyle;
//import org.w3c.css.properties.CssBorderRightColorCSS2;
@@ -278,32 +277,6 @@
}
/**
- * Print this property.
- *
- * @param printer The printer.
- * @see #toString()
- * @see #getPropertyName()
- */
- public void print(CssPrinterStyle printer) {
- if ((width != null && style != null &&
- color != null) &&
- (getImportant() ||
- (!width.getImportant() &&
- !style.getImportant() &&
- !color.getImportant()))) {
- printer.print(this);
- } else {
- if (width != null)
- width.print(printer);
- if (style != null)
- style.print(printer);
- if (color != null)
- color.print(printer);
- }
-
- }
-
- /**
* Set the context.
* Overrides this method for a macro
*
Index: CssBorderLeftATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/CssBorderLeftATSC.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssBorderLeftATSC.java 5 Jan 2010 13:49:35 -0000 1.4
+++ CssBorderLeftATSC.java 9 Sep 2011 12:16:42 -0000 1.5
@@ -7,7 +7,6 @@
package org.w3c.css.properties.atsc;
-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;
@@ -226,32 +225,6 @@
/**
- * Print this property.
- *
- * @param printer The printer.
- * @see #toString()
- * @see #getPropertyName()
- */
- public void print(CssPrinterStyle printer) {
- if ((width != null && style != null &&
- color != null) &&
- (getImportant() ||
- (!width.getImportant() &&
- !style.getImportant() &&
- !color.getImportant()))) {
- printer.print(this);
- } else {
- if (width != null)
- width.print(printer);
- if (style != null)
- style.print(printer);
- if (color != null)
- color.print(printer);
- }
-
- }
-
- /**
* Set the context.
* Overrides this method for a macro
*
Index: CssBorderTopATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/CssBorderTopATSC.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssBorderTopATSC.java 5 Jan 2010 13:49:35 -0000 1.4
+++ CssBorderTopATSC.java 9 Sep 2011 12:16:42 -0000 1.5
@@ -7,7 +7,6 @@
package org.w3c.css.properties.atsc;
-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;
@@ -225,32 +224,6 @@
}
/**
- * Print this property.
- *
- * @param printer The printer.
- * @see #toString()
- * @see #getPropertyName()
- */
- public void print(CssPrinterStyle printer) {
- if ((width != null && style != null &&
- color != null) &&
- (getImportant() ||
- (!width.getImportant() &&
- !style.getImportant() &&
- !color.getImportant()))) {
- printer.print(this);
- } else {
- if (width != null)
- width.print(printer);
- if (style != null)
- style.print(printer);
- if (color != null)
- color.print(printer);
- }
-
- }
-
- /**
* Add this property to the CssStyle
*
* @param style The CssStyle
Index: ATSCStyle.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/ATSCStyle.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ATSCStyle.java 14 Sep 2005 15:14:18 -0000 1.2
+++ ATSCStyle.java 9 Sep 2011 12:16:42 -0000 1.3
@@ -8,8 +8,6 @@
package org.w3c.css.properties.atsc;
-import org.w3c.css.parser.CssPrinterStyle;
-
/**
* @version $Revision$
*/
@@ -422,89 +420,4 @@
}
-
- /**
- * Print this style.
- *
- * @param printer The printer interface.
- */
- public void print(CssPrinterStyle printer) {
- super.print(printer);
- if (navindex != null) {
- navindex.print(printer);
- }
- if (navleft != null) {
- navleft.print(printer);
- }
- if (navup != null) {
- navup.print(printer);
- }
- if (navdown != null) {
- navdown.print(printer);
- }
- if (navright != null) {
- navright.print(printer);
- }
- if (unitsPerEmATSC != null) {
- unitsPerEmATSC.print(printer);
- }
- if (srcATSC != null) {
- srcATSC.print(printer);
- }
- if (panose1ATSC != null) {
- panose1ATSC.print(printer);
- }
- if (widthsATSC != null) {
- widthsATSC.print(printer);
- }
- if (bboxATSC != null) {
- bboxATSC.print(printer);
- }
- if (stemvATSC != null) {
- stemvATSC.print(printer);
- }
- if (stemhATSC != null) {
- stemhATSC.print(printer);
- }
- if (slopeATSC != null) {
- slopeATSC.print(printer);
- }
- if (ascentATSC != null) {
- ascentATSC.print(printer);
- }
- if (descentATSC != null) {
- descentATSC.print(printer);
- }
- if (capHeightATSC != null) {
- capHeightATSC.print(printer);
- }
- if (xHeightATSC != null) {
- xHeightATSC.print(printer);
- }
- if (baselineATSC != null) {
- baselineATSC.print(printer);
- }
- if (centerlineATSC != null) {
- centerlineATSC.print(printer);
- }
- if (mathlineATSC != null) {
- mathlineATSC.print(printer);
- }
- if (toplineATSC != null) {
- toplineATSC.print(printer);
- }
- if (definitionSrcATSC != null) {
- definitionSrcATSC.print(printer);
- }
- if (ATSCcolor != null) {
- ATSCcolor.print(printer);
- }
- if (dynamicRefresh != null) {
- dynamicRefresh.print(printer);
- }
- cssBackgroundATSC.print(printer);
- cssBorderATSC.print(printer);
- }
-
-
}
Index: CssBorderStyleATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/CssBorderStyleATSC.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- CssBorderStyleATSC.java 5 Jan 2010 13:49:35 -0000 1.5
+++ CssBorderStyleATSC.java 9 Sep 2011 12:16:42 -0000 1.6
@@ -7,7 +7,6 @@
package org.w3c.css.properties.atsc;
-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;
@@ -269,35 +268,6 @@
}
/**
- * Print this property.
- *
- * @param printer The printer.
- * @see #toString()
- * @see #getPropertyName()
- */
- public void print(CssPrinterStyle printer) {
- if ((top != null && right != null &&
- left != null && bottom != null) &&
- (getImportant() ||
- (!top.getImportant() &&
- !right.getImportant() &&
- !left.getImportant() &&
- !bottom.getImportant()))) {
- printer.print(this);
- } else {
- if (top != null)
- top.print(printer);
- if (right != null)
- right.print(printer);
- if (left != null)
- left.print(printer);
- if (bottom != null)
- bottom.print(printer);
- }
-
- }
-
- /**
* Set the context.
* Overrides this method for a macro
*
Index: CssBorderWidthATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/CssBorderWidthATSC.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- CssBorderWidthATSC.java 5 Jan 2010 13:49:35 -0000 1.5
+++ CssBorderWidthATSC.java 9 Sep 2011 12:16:43 -0000 1.6
@@ -6,7 +6,6 @@
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.atsc;
-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;
@@ -245,35 +244,6 @@
}
/**
- * Print this property.
- *
- * @param printer The printer.
- * @see #toString()
- * @see #getPropertyName()
- */
- public void print(CssPrinterStyle printer) {
- if ((top != null && right != null &&
- left != null && bottom != null) &&
- (getImportant() ||
- (!top.getImportant() &&
- !right.getImportant() &&
- !left.getImportant() &&
- !bottom.getImportant()))) {
- printer.print(this);
- } else {
- if (top != null)
- top.print(printer);
- if (right != null)
- right.print(printer);
- if (left != null)
- left.print(printer);
- if (bottom != null)
- bottom.print(printer);
- }
-
- }
-
- /**
* Set the context.
* Overrides this method for a macro
*
Index: CssBorderColorATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/CssBorderColorATSC.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- CssBorderColorATSC.java 5 Jan 2010 13:49:35 -0000 1.5
+++ CssBorderColorATSC.java 9 Sep 2011 12:16:42 -0000 1.6
@@ -7,7 +7,6 @@
package org.w3c.css.properties.atsc;
-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;
@@ -248,37 +247,6 @@
}
/**
- * Print this property.
- *
- * @param printer The printer.
- * @see #toString()
- * @see #getPropertyName()
- */
- public void print(CssPrinterStyle printer) {
- if ((top != null && right != null &&
- left != null && bottom != null) &&
- (!top.face.isDefault() && !right.face.isDefault() &&
- !left.face.isDefault() && !bottom.face.isDefault()) &&
- (getImportant() ||
- (!top.getImportant() &&
- !right.getImportant() &&
- !left.getImportant() &&
- !bottom.getImportant()))) {
- printer.print(this);
- } else {
- if (top != null)
- top.print(printer);
- if (right != null)
- right.print(printer);
- if (left != null)
- left.print(printer);
- if (bottom != null)
- bottom.print(printer);
- }
-
- }
-
- /**
* Set the context.
* Overrides this method for a macro
*
Index: CssBorderRightColorATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/CssBorderRightColorATSC.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssBorderRightColorATSC.java 5 Jan 2010 13:49:35 -0000 1.4
+++ CssBorderRightColorATSC.java 9 Sep 2011 12:16:42 -0000 1.5
@@ -7,7 +7,6 @@
package org.w3c.css.properties.atsc;
-import org.w3c.css.parser.CssPrinterStyle;
import org.w3c.css.parser.CssStyle;
import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
@@ -128,13 +127,4 @@
face.equals(((CssBorderRightColorATSC) property).face));
}
- /**
- * Print this property.
- *
- * @param printer The printer.
- */
- public void print(CssPrinterStyle printer) {
- if (!face.isDefault())
- printer.print(this);
- }
}
Index: CssBorderTopColorATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/CssBorderTopColorATSC.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssBorderTopColorATSC.java 5 Jan 2010 13:49:35 -0000 1.4
+++ CssBorderTopColorATSC.java 9 Sep 2011 12:16:43 -0000 1.5
@@ -7,7 +7,6 @@
package org.w3c.css.properties.atsc;
-import org.w3c.css.parser.CssPrinterStyle;
import org.w3c.css.parser.CssStyle;
import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
@@ -130,15 +129,4 @@
face.equals(((CssBorderTopColorATSC) property).face));
}
- /**
- * Is the value of this property is a default value.
- * It is used by all macro for the function <code>print</code>
- *
- * @see #print(CssPrinterStyle)
- */
- public void print(CssPrinterStyle printer) {
- if (!face.isDefault())
- printer.print(this);
- }
-
}
Index: CssBorderATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/CssBorderATSC.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssBorderATSC.java 5 Jan 2010 13:49:35 -0000 1.4
+++ CssBorderATSC.java 9 Sep 2011 12:16:42 -0000 1.5
@@ -7,7 +7,6 @@
package org.w3c.css.properties.atsc;
-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;
@@ -186,87 +185,6 @@
}
/**
- * Print this property.
- *
- * @param printer The printer.
- * @see #toString()
- * @see #getPropertyName()
- */
- public void print(CssPrinterStyle printer) {
- int printMacro = 0;
-
- if ((top.width != null && bottom.width != null &&
- right.width != null && left.width != null) &&
- ((top.width.getImportant() && bottom.width.getImportant() &&
- right.width.getImportant() && left.width.getImportant()) ||
- (!top.width.getImportant() && !bottom.width.getImportant() &&
- !right.width.getImportant() && !left.width.getImportant()))) {
- CssBorderWidthATSC width = new CssBorderWidthATSC(top.width, bottom.width,
- right.width, left.width);
- if (top.getImportant()) {
- width.setImportant();
- }
- printMacro = 1;
- width.print(printer);
- }
- if ((top.style != null && bottom.style != null &&
- right.style != null && left.style != null) &&
- ((top.style.getImportant() && bottom.style.getImportant() &&
- right.style.getImportant() && left.style.getImportant()) ||
- (!top.style.getImportant() && !bottom.style.getImportant() &&
- !right.style.getImportant() && !left.style.getImportant()))) {
- CssBorderStyleATSC style = new CssBorderStyleATSC(top.style, bottom.style,
- right.style, left.style);
- if (top.getImportant()) {
- style.setImportant();
- }
- printMacro |= 2;
- style.print(printer);
- }
- if ((top.color != null && bottom.color != null &&
- right.color != null && left.color != null) &&
- ((top.color.getImportant() && bottom.color.getImportant() &&
- right.color.getImportant() && left.color.getImportant()) ||
- (!top.color.getImportant() && !bottom.color.getImportant() &&
- !right.color.getImportant() && !left.color.getImportant()))) {
- CssBorderColorATSC color = new CssBorderColorATSC(top.color, bottom.color,
- right.color, left.color);
- if (top.getImportant()) {
- color.setImportant();
- }
- printMacro |= 4;
- color.print(printer);
- }
-
- if (printMacro == 0) {
- top.print(printer);
- right.print(printer);
- bottom.print(printer);
- left.print(printer);
- } else {
- if ((printMacro & 1) == 0) {
- if (top.width != null) top.width.print(printer);
- if (right.width != null) right.width.print(printer);
- if (bottom.width != null) bottom.width.print(printer);
- if (left.width != null) left.width.print(printer);
- }
- if ((printMacro & 2) == 0) {
- if (top.style != null) top.style.print(printer);
- if (right.style != null) right.style.print(printer);
- if (bottom.style != null) bottom.style.print(printer);
- if (left.style != null) left.style.print(printer);
- }
- if ((printMacro & 4) == 0) {
- if (top.color != null) top.color.print(printer);
- if (right.color != null) right.color.print(printer);
- if (bottom.color != null) bottom.color.print(printer);
- if (left.color != null) left.color.print(printer);
- }
- }
-
- }
-
- /**
* Set the context.
* Overrides this method for a macro
*
Index: CssBorderBottomATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/CssBorderBottomATSC.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssBorderBottomATSC.java 5 Jan 2010 13:49:35 -0000 1.4
+++ CssBorderBottomATSC.java 9 Sep 2011 12:16:42 -0000 1.5
@@ -7,7 +7,6 @@
package org.w3c.css.properties.atsc;
-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;
@@ -224,32 +223,6 @@
}
/**
- * Print this property.
- *
- * @param printer The printer.
- * @see #toString()
- * @see #getPropertyName()
- */
- public void print(CssPrinterStyle printer) {
- if ((width != null && style != null &&
- color != null) &&
- (getImportant() ||
- (!width.getImportant() &&
- !style.getImportant() &&
- !color.getImportant()))) {
- printer.print(this);
- } else {
- if (width != null)
- width.print(printer);
- if (style != null)
- style.print(printer);
- if (color != null)
- color.print(printer);
- }
-
- }
-
- /**
* Set the context.
* Overrides this method for a macro
*
Index: CssBorderLeftColorATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/CssBorderLeftColorATSC.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssBorderLeftColorATSC.java 5 Jan 2010 13:49:35 -0000 1.4
+++ CssBorderLeftColorATSC.java 9 Sep 2011 12:16:42 -0000 1.5
@@ -7,7 +7,6 @@
package org.w3c.css.properties.atsc;
-import org.w3c.css.parser.CssPrinterStyle;
import org.w3c.css.parser.CssStyle;
import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
@@ -127,13 +126,4 @@
return (property instanceof CssBorderLeftColorATSC && face.equals(((CssBorderLeftColorATSC) property).face));
}
- /**
- * Print this property
- *
- * @param printer The printer.
- */
- public void print(CssPrinterStyle printer) {
- if (!face.isDefault())
- printer.print(this);
- }
}
Index: CssBackgroundATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/CssBackgroundATSC.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssBackgroundATSC.java 5 Jan 2010 13:49:34 -0000 1.4
+++ CssBackgroundATSC.java 9 Sep 2011 12:16:42 -0000 1.5
@@ -7,7 +7,6 @@
package org.w3c.css.properties.atsc;
-import org.w3c.css.parser.CssPrinterStyle;
import org.w3c.css.parser.CssSelectors;
import org.w3c.css.parser.CssStyle;
import org.w3c.css.properties.css.CssBackgroundConstants;
@@ -257,41 +256,6 @@
}
/**
- * Print this property.
- *
- * @param printer The printer.
- * @see #toString()
- * @see #getPropertyName()
- */
- public void print(CssPrinterStyle printer) {
- if ((color != null && image != null &&
- repeat != null && attachment !=null &&
- position != null) &&
- (getImportant() ||
- (!image.getImportant() &&
- !color.getImportant() &&
- !repeat.getImportant() &&
- !attachment.getImportant() &&
- !position.getImportant()))) {
- if (color.isByUser() || image.isByUser() || repeat.isByUser()
- || attachment.isByUser() || position.isByUser()) {
- printer.print(this);
- }
- } else {
- if (color != null)
- color.print(printer);
- if (image != null)
- image.print(printer);
- if (repeat != null)
- repeat.print(printer);
- if (attachment != null)
- attachment.print(printer);
- if (position != null)
- position.print(printer);
- }
- }
-
- /**
* Set the context.
* Overrides this method for a macro
*
Received on Friday, 9 September 2011 12:17:17 UTC