- From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
- Date: Fri, 09 Sep 2011 12:16:47 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/properties/css1
In directory hutz:/tmp/cvs-serv18813/properties/css1
Modified Files:
Css1Style.java CssBackgroundCSS1.java CssBackgroundMob.java
CssBackgroundTV.java CssBorder.java CssBorderBottom.java
CssBorderBottomCSS1.java CssBorderBottomCSS2.java
CssBorderBottomColor.java CssBorderBottomColorCSS1.java
CssBorderBottomColorCSS2.java CssBorderCSS1.java
CssBorderCSS2.java CssBorderColor.java CssBorderColorCSS1.java
CssBorderColorCSS2.java CssBorderLeft.java
CssBorderLeftCSS1.java CssBorderLeftCSS2.java
CssBorderLeftColor.java CssBorderLeftColorCSS1.java
CssBorderLeftColorCSS2.java CssBorderRight.java
CssBorderRightCSS1.java CssBorderRightCSS2.java
CssBorderRightColor.java CssBorderRightColorCSS1.java
CssBorderRightColorCSS2.java CssBorderStyle.java
CssBorderStyleCSS1.java CssBorderStyleCSS2.java
CssBorderTop.java CssBorderTopCSS1.java CssBorderTopCSS2.java
CssBorderTopColor.java CssBorderTopColorCSS1.java
CssBorderTopColorCSS2.java CssBorderWidth.java
CssBorderWidthCSS1.java CssBorderWidthCSS2.java CssFont.java
CssFontCSS1.java CssFontCSS2.java CssListStyle.java
CssListStyleCSS1.java CssListStyleCSS2.java
CssListStyleTV.java CssMargin.java CssPadding.java
Log Message:
code cleanup, removed dead code, starting reorg of azimuth (others to follow)
Index: CssBorderStyle.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderStyle.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- CssBorderStyle.java 5 Jan 2010 13:49:41 -0000 1.7
+++ CssBorderStyle.java 9 Sep 2011 12:16:44 -0000 1.8
@@ -9,7 +9,6 @@
import java.util.HashSet;
-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;
@@ -299,35 +298,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.important &&
- !right.important &&
- !left.important &&
- !bottom.important))) {
- 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: CssBorderStyleCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderStyleCSS2.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- CssBorderStyleCSS2.java 5 Jan 2010 13:49:41 -0000 1.6
+++ CssBorderStyleCSS2.java 9 Sep 2011 12:16:44 -0000 1.7
@@ -9,7 +9,6 @@
import java.util.HashSet;
-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;
@@ -295,35 +294,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.important &&
- !right.important &&
- !left.important &&
- !bottom.important))) {
- 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: CssFont.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssFont.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- CssFont.java 5 Jan 2010 13:49:43 -0000 1.5
+++ CssFont.java 9 Sep 2011 12:16:44 -0000 1.6
@@ -6,7 +6,6 @@
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.css1;
-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;
@@ -314,50 +313,6 @@
}
/**
- * Print this property.
- *
- * @param printer The printer
- * @see #toString()
- * @see #getPropertyName()
- */
- public void print(CssPrinterStyle printer) {
- if (value != null) {
- printer.print(this);
- } else if ((fontStyle != null && fontVariant != null &&
- fontWeight != null && fontSize !=null &&
- lineHeight != null && fontFamily != null) &&
- (getImportant() ||
- (!fontStyle.important &&
- !fontVariant.important &&
- !fontWeight.important &&
- !fontSize.important &&
- !lineHeight.important &&
- !fontFamily.important))) {
- printer.print(this);
- } else {
- if (fontStyle != null) {
- fontStyle.print(printer);
- }
- if (fontVariant != null) {
- fontVariant.print(printer);
- }
- if (fontWeight != null) {
- fontWeight.print(printer);
- }
- if (fontSize != null) {
- fontSize.print(printer);
- }
- if (lineHeight != null) {
- lineHeight.print(printer);
- }
- if ((fontFamily != null) &&
- ((fontFamily.isSoftlyInherited()) || (fontFamily.size() != 0))) {
- fontFamily.print(printer);
- }
- }
- }
-
- /**
* Add this property to the CssStyle
*
* @param style The CssStyle
Index: CssBorderLeftCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderLeftCSS2.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- CssBorderLeftCSS2.java 5 Jan 2010 13:49:41 -0000 1.5
+++ CssBorderLeftCSS2.java 9 Sep 2011 12:16:44 -0000 1.6
@@ -6,7 +6,6 @@
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.css1;
-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;
@@ -256,32 +255,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.important &&
- !style.important &&
- !color.important))) {
- 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: CssBorderRightColorCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderRightColorCSS1.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssBorderRightColorCSS1.java 5 Jan 2010 13:49:41 -0000 1.4
+++ CssBorderRightColorCSS1.java 9 Sep 2011 12:16:44 -0000 1.5
@@ -6,7 +6,6 @@
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.css1;
-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;
@@ -134,13 +133,4 @@
face.equals(((CssBorderRightColorCSS1) property).face));
}
- /**
- * Print this property.
- *
- * @param printer The printer.
- */
- public void print(CssPrinterStyle printer) {
- if (face != null && !face.isDefault())
- printer.print(this);
- }
}
Index: CssBorderRightCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderRightCSS1.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssBorderRightCSS1.java 5 Jan 2010 13:49:41 -0000 1.4
+++ CssBorderRightCSS1.java 9 Sep 2011 12:16:44 -0000 1.5
@@ -6,7 +6,6 @@
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.css1;
-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;
@@ -235,32 +234,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.important &&
- !style.important &&
- !color.important))) {
- 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: CssBorderLeft.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderLeft.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssBorderLeft.java 5 Jan 2010 13:49:41 -0000 1.4
+++ CssBorderLeft.java 9 Sep 2011 12:16:44 -0000 1.5
@@ -6,7 +6,6 @@
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.css1;
-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;
@@ -259,32 +258,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.important &&
- !style.important &&
- !color.important))) {
- 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: Css1Style.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/Css1Style.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- Css1Style.java 4 Sep 2011 21:01:57 -0000 1.20
+++ Css1Style.java 9 Sep 2011 12:16:43 -0000 1.21
@@ -7,15 +7,16 @@
package org.w3c.css.properties.css1;
-import org.w3c.css.parser.CssPrinterStyle;
import org.w3c.css.parser.CssSelectors;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssAzimuth;
import org.w3c.css.properties.css.CssBackground;
import org.w3c.css.properties.css.CssBackgroundAttachment;
import org.w3c.css.properties.css.CssBackgroundColor;
import org.w3c.css.properties.css.CssBackgroundImage;
[...4974 lines suppressed...]
+ Float f = (Float) length.get();
+ // 0 is always 0, no need to check
+ if (f.floatValue() != (float) 0.0) {
+ String unit = length.getUnit();
+ // per CSS21, section 4.3.2
+ // 'px', 'em', 'ex' are relative values
+ if (unit.equals("px") || unit.equals("em") ||
+ unit.equals("ex")) {
+ relative = true;
+ } else {
+ // 'cm', 'mm', 'pt', 'pc', 'in' are absolute values
+ absolute = true;
+ }
+ }
+ break;
+ default:
+ /* should never happen */
+ }
}
}
Index: CssPadding.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssPadding.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssPadding.java 5 Jan 2010 13:49:44 -0000 1.4
+++ CssPadding.java 9 Sep 2011 12:16:45 -0000 1.5
@@ -7,7 +7,6 @@
package org.w3c.css.properties.css1;
-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;
@@ -272,36 +271,6 @@
}
/**
- * Print this property.
- *
- * @see #toString()
- * @see #getPropertyName()
- */
- public void print(CssPrinterStyle printer) {
- if (inheritedValue) {
- printer.print(this);
- } else if ((top != null && right != null &&
- bottom != null && left != null) &&
- (getImportant() ||
- (!top.important &&
- !right.important &&
- !bottom.important &&
- !left.important))) {
- printer.print(this);
- } else {
- if (top != null)
- top.print(printer);
- if (right != null)
- right.print(printer);
- if (bottom != null)
- bottom.print(printer);
- if (left != null)
- left.print(printer);
- }
-
- }
-
- /**
* Set the context.
* Overrides this method for a macro
*
Index: CssBorderColor.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderColor.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- CssBorderColor.java 5 Jan 2010 13:49:40 -0000 1.5
+++ CssBorderColor.java 9 Sep 2011 12:16:44 -0000 1.6
@@ -7,7 +7,6 @@
package org.w3c.css.properties.css1;
-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;
@@ -249,37 +248,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.important &&
- !right.important &&
- !left.important &&
- !bottom.important))) {
- 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: CssBorderCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderCSS1.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssBorderCSS1.java 5 Jan 2010 13:49:40 -0000 1.4
+++ CssBorderCSS1.java 9 Sep 2011 12:16:43 -0000 1.5
@@ -6,7 +6,6 @@
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.css1;
-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;
@@ -190,87 +189,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.important && bottom.width.important &&
- right.width.important && left.width.important) ||
- (!top.width.important && !bottom.width.important &&
- !right.width.important && !left.width.important))) {
- CssBorderWidthCSS1 width = new CssBorderWidthCSS1(top.width, bottom.width,
- right.width, left.width);
- if (top.important) {
- width.setImportant();
- }
- printMacro = 1;
- width.print(printer);
- }
- if ((top.style != null && bottom.style != null &&
- right.style != null && left.style != null) &&
- ((top.style.important && bottom.style.important &&
- right.style.important && left.style.important) ||
- (!top.style.important && !bottom.style.important &&
- !right.style.important && !left.style.important))) {
- CssBorderStyleCSS1 style = new CssBorderStyleCSS1(top.style, bottom.style,
- right.style, left.style);
- if (top.important) {
- style.setImportant();
- }
- printMacro |= 2;
- style.print(printer);
- }
- if ((top.color != null && bottom.color != null &&
- right.color != null && left.color != null) &&
- ((top.color.important && bottom.color.important &&
- right.color.important && left.color.important) ||
- (!top.color.important && !bottom.color.important &&
- !right.color.important && !left.color.important))) {
- CssBorderColorCSS1 color = new CssBorderColorCSS1(top.color, bottom.color,
- right.color, left.color);
- if (top.important) {
- 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: CssBorderBottom.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderBottom.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssBorderBottom.java 5 Jan 2010 13:49:40 -0000 1.4
+++ CssBorderBottom.java 9 Sep 2011 12:16:43 -0000 1.5
@@ -6,7 +6,6 @@
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.css1;
-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;
@@ -258,32 +257,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.important &&
- !style.important &&
- !color.important))) {
- 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: CssBackgroundCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBackgroundCSS1.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- CssBackgroundCSS1.java 6 Jan 2010 09:27:44 -0000 1.7
+++ CssBackgroundCSS1.java 9 Sep 2011 12:16:43 -0000 1.8
@@ -6,7 +6,6 @@
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.css1;
-import org.w3c.css.parser.CssPrinterStyle;
import org.w3c.css.parser.CssSelectors;
import org.w3c.css.parser.CssStyle;
import org.w3c.css.properties.css.CssBackground;
@@ -262,41 +261,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.important &&
- !color.important &&
- !repeat.important &&
- !attachment.important &&
- !position.important))) {
- if (color.byUser || image.byUser || repeat.byUser
- || attachment.byUser || position.byUser) {
- 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
*
Index: CssBorderLeftCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderLeftCSS1.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssBorderLeftCSS1.java 5 Jan 2010 13:49:41 -0000 1.4
+++ CssBorderLeftCSS1.java 9 Sep 2011 12:16:44 -0000 1.5
@@ -6,7 +6,6 @@
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.css1;
-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.important &&
- !style.important &&
- !color.important))) {
- 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: CssListStyleCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssListStyleCSS1.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- CssListStyleCSS1.java 5 Jan 2010 13:49:44 -0000 1.5
+++ CssListStyleCSS1.java 9 Sep 2011 12:16:44 -0000 1.6
@@ -6,7 +6,6 @@
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.css1;
-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;
@@ -243,36 +242,6 @@
}
/**
- * Print this property.
- *
- * @see #toString()
- * @see #getPropertyName()
- */
- public void print(CssPrinterStyle printer) {
- if (inheritedValue) {
- printer.print(this);
- } else if ((listStyleType != null && listStyleImage != null &&
- listStylePosition != null) &&
- (getImportant() ||
- (!listStyleType.important &&
- !listStyleImage.important &&
- !listStylePosition.important))) {
- printer.print(this);
- } else {
- if (listStyleType != null) {
- listStyleType.print(printer);
- }
- if (listStyleImage != null) {
- listStyleImage.print(printer);
- }
- if (listStylePosition != null) {
- listStylePosition.print(printer);
- }
- }
-
- }
-
- /**
* Set the context.
* Overrides this method for a macro
*
Index: CssBorderBottomColorCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderBottomColorCSS2.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- CssBorderBottomColorCSS2.java 5 Jan 2010 13:49:40 -0000 1.5
+++ CssBorderBottomColorCSS2.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.css1;
-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;
@@ -140,15 +139,4 @@
return (property instanceof CssBorderBottomColorCSS2 && face.equals(((CssBorderBottomColorCSS2) property).face));
}
- /**
- * Print this property.
- *
- * @param printer The printer.
- * @see #toString()
- * @see #getPropertyName()
- */
- public void print(CssPrinterStyle printer) {
- if (face != null && !face.isDefault())
- printer.print(this);
- }
}
Index: CssBorderTopColor.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderTopColor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssBorderTopColor.java 5 Jan 2010 13:49:41 -0000 1.4
+++ CssBorderTopColor.java 9 Sep 2011 12:16:44 -0000 1.5
@@ -6,7 +6,6 @@
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.css1;
-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;
@@ -132,15 +131,4 @@
face.equals(((CssBorderTopColor) 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 != null && !face.isDefault())
- printer.print(this);
- }
-
}
Index: CssBackgroundMob.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBackgroundMob.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssBackgroundMob.java 5 Jan 2010 13:49:39 -0000 1.4
+++ CssBackgroundMob.java 9 Sep 2011 12:16:43 -0000 1.5
@@ -6,7 +6,6 @@
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.css1;
-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;
@@ -262,41 +261,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.important &&
- !color.important &&
- !repeat.important &&
- !attachment.important &&
- !position.important))) {
- if (color.byUser || image.byUser || repeat.byUser
- || attachment.byUser || position.byUser) {
- 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
*
Index: CssBorderTopCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderTopCSS1.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssBorderTopCSS1.java 5 Jan 2010 13:49:41 -0000 1.4
+++ CssBorderTopCSS1.java 9 Sep 2011 12:16:44 -0000 1.5
@@ -6,7 +6,6 @@
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.css1;
-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;
@@ -229,32 +228,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.important &&
- !style.important &&
- !color.important))) {
- 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: CssBorderBottomColorCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderBottomColorCSS1.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssBorderBottomColorCSS1.java 5 Jan 2010 13:49:40 -0000 1.4
+++ CssBorderBottomColorCSS1.java 9 Sep 2011 12:16:43 -0000 1.5
@@ -6,7 +6,6 @@
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.css1;
-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;
@@ -132,15 +131,4 @@
return (property instanceof CssBorderBottomColorCSS1 && face.equals(((CssBorderBottomColorCSS1) property).face));
}
- /**
- * Print this property.
- *
- * @param printer The printer.
- * @see #toString()
- * @see #getPropertyName()
- */
- public void print(CssPrinterStyle printer) {
- if (face != null && !face.isDefault())
- printer.print(this);
- }
}
Index: CssBorderRightColorCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderRightColorCSS2.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- CssBorderRightColorCSS2.java 5 Jan 2010 13:49:41 -0000 1.5
+++ CssBorderRightColorCSS2.java 9 Sep 2011 12:16:44 -0000 1.6
@@ -6,7 +6,6 @@
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.css1;
-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;
@@ -147,13 +146,4 @@
face.equals(((CssBorderRightColorCSS2) property).face));
}
- /**
- * Print this property.
- *
- * @param printer The printer.
- */
- public void print(CssPrinterStyle printer) {
- if (!face.isDefault())
- printer.print(this);
- }
}
Index: CssBorder.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssBorder.java 5 Jan 2010 13:49:40 -0000 1.4
+++ CssBorder.java 9 Sep 2011 12:16:43 -0000 1.5
@@ -6,7 +6,6 @@
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.css1;
-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;
@@ -292,87 +291,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.important && bottom.width.important &&
- right.width.important && left.width.important) ||
- (!top.width.important && !bottom.width.important &&
- !right.width.important && !left.width.important))) {
- CssBorderWidth width = new CssBorderWidth(top.width, bottom.width,
- right.width, left.width);
- if (top.important) {
- width.setImportant();
- }
- printMacro = 1;
- width.print(printer);
- }
- if ((top.style != null && bottom.style != null &&
- right.style != null && left.style != null) &&
- ((top.style.important && bottom.style.important &&
- right.style.important && left.style.important) ||
- (!top.style.important && !bottom.style.important &&
- !right.style.important && !left.style.important))) {
- CssBorderStyle style = new CssBorderStyle(top.style, bottom.style,
- right.style, left.style);
- if (top.important) {
- style.setImportant();
- }
- printMacro |= 2;
- style.print(printer);
- }
- if ((top.color != null && bottom.color != null &&
- right.color != null && left.color != null) &&
- ((top.color.important && bottom.color.important &&
- right.color.important && left.color.important) ||
- (!top.color.important && !bottom.color.important &&
- !right.color.important && !left.color.important))) {
- CssBorderColor color = new CssBorderColor(top.color, bottom.color,
- right.color, left.color);
- if (top.important) {
- 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: CssBorderBottomColor.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderBottomColor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssBorderBottomColor.java 5 Jan 2010 13:49:40 -0000 1.4
+++ CssBorderBottomColor.java 9 Sep 2011 12:16:43 -0000 1.5
@@ -6,7 +6,6 @@
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.css1;
-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;
@@ -132,15 +131,4 @@
return (property instanceof CssBorderBottomColor && face.equals(((CssBorderBottomColor) property).face));
}
- /**
- * Print this property.
- *
- * @param printer The printer.
- * @see #toString()
- * @see #getPropertyName()
- */
- public void print(CssPrinterStyle printer) {
- if (face != null && !face.isDefault())
- printer.print(this);
- }
}
Index: CssBorderCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderCSS2.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- CssBorderCSS2.java 5 Jan 2010 13:49:40 -0000 1.5
+++ CssBorderCSS2.java 9 Sep 2011 12:16:44 -0000 1.6
@@ -6,7 +6,6 @@
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.css1;
-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;
@@ -213,87 +212,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.important && bottom.width.important &&
- right.width.important && left.width.important) ||
- (!top.width.important && !bottom.width.important &&
- !right.width.important && !left.width.important))) {
- CssBorderWidthCSS2 width = new CssBorderWidthCSS2(top.width, bottom.width,
- right.width, left.width);
- if (top.important) {
- width.setImportant();
- }
- printMacro = 1;
- width.print(printer);
- }
- if ((top.style != null && bottom.style != null &&
- right.style != null && left.style != null) &&
- ((top.style.important && bottom.style.important &&
- right.style.important && left.style.important) ||
- (!top.style.important && !bottom.style.important &&
- !right.style.important && !left.style.important))) {
- CssBorderStyleCSS2 style = new CssBorderStyleCSS2(top.style, bottom.style,
- right.style, left.style);
- if (top.important) {
- style.setImportant();
- }
- printMacro |= 2;
- style.print(printer);
- }
- if ((top.color != null && bottom.color != null &&
- right.color != null && left.color != null) &&
- ((top.color.important && bottom.color.important &&
- right.color.important && left.color.important) ||
- (!top.color.important && !bottom.color.important &&
- !right.color.important && !left.color.important))) {
- CssBorderColorCSS2 color = new CssBorderColorCSS2(top.color, bottom.color,
- right.color, left.color);
- if (top.important) {
- 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: CssBorderStyleCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderStyleCSS1.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- CssBorderStyleCSS1.java 5 Jan 2010 13:49:41 -0000 1.5
+++ CssBorderStyleCSS1.java 9 Sep 2011 12:16:44 -0000 1.6
@@ -7,7 +7,6 @@
package org.w3c.css.properties.css1;
-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;
@@ -251,35 +250,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.important &&
- !right.important &&
- !left.important &&
- !bottom.important))) {
- 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: CssListStyleCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssListStyleCSS2.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- CssListStyleCSS2.java 5 Jan 2010 13:49:44 -0000 1.5
+++ CssListStyleCSS2.java 9 Sep 2011 12:16:45 -0000 1.6
@@ -6,7 +6,6 @@
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.css1;
-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;
@@ -301,36 +300,6 @@
}
/**
- * Print this property.
- *
- * @see #toString()
- * @see #getPropertyName()
- */
- public void print(CssPrinterStyle printer) {
- if (inheritedValue) {
- printer.print(this);
- } else if ((listStyleType != null && listStyleImage != null &&
- listStylePosition != null) &&
- (getImportant() ||
- (!listStyleType.important &&
- !listStyleImage.important &&
- !listStylePosition.important))) {
- printer.print(this);
- } else {
- if (listStyleType != null) {
- listStyleType.print(printer);
- }
- if (listStyleImage != null) {
- listStyleImage.print(printer);
- }
- if (listStylePosition != null) {
- listStylePosition.print(printer);
- }
- }
-
- }
-
- /**
* Set the context.
* Overrides this method for a macro
*
Index: CssBackgroundTV.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBackgroundTV.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssBackgroundTV.java 5 Jan 2010 13:49:40 -0000 1.4
+++ CssBackgroundTV.java 9 Sep 2011 12:16:43 -0000 1.5
@@ -6,7 +6,6 @@
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.css1;
-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;
@@ -251,38 +250,6 @@
}
/**
- * Print this property.
- *
- * @param printer The printer.
- * @see #toString()
- * @see #getPropertyName()
- */
- public void print(CssPrinterStyle printer) {
- if ((color != null && image != null &&
- repeat != null &&
- position != null) &&
- (getImportant() ||
- (!image.important &&
- !color.important &&
- !repeat.important &&
- !position.important))) {
- if (color.byUser || image.byUser || repeat.byUser
- || position.byUser) {
- printer.print(this);
- }
- } else {
- if (color != null)
- color.print(printer);
- if (image != null)
- image.print(printer);
- if (repeat != null)
- repeat.print(printer);
- if (position != null)
- position.print(printer);
- }
- }
-
- /**
* Set the context.
* Overrides this method for a macro
*
Index: CssBorderTopColorCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderTopColorCSS2.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- CssBorderTopColorCSS2.java 5 Jan 2010 13:49:42 -0000 1.5
+++ CssBorderTopColorCSS2.java 9 Sep 2011 12:16:44 -0000 1.6
@@ -6,7 +6,6 @@
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.css1;
-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;
@@ -146,15 +145,4 @@
face.equals(((CssBorderTopColorCSS2) 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 != null && !face.isDefault())
- printer.print(this);
- }
-
}
Index: CssBorderWidthCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderWidthCSS2.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- CssBorderWidthCSS2.java 5 Jan 2010 13:49:42 -0000 1.5
+++ CssBorderWidthCSS2.java 9 Sep 2011 12:16:44 -0000 1.6
@@ -6,7 +6,6 @@
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.css1;
-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.important &&
- !right.important &&
- !left.important &&
- !bottom.important))) {
- 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: CssListStyleTV.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssListStyleTV.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssListStyleTV.java 5 Jan 2010 13:49:44 -0000 1.4
+++ CssListStyleTV.java 9 Sep 2011 12:16:45 -0000 1.5
@@ -6,7 +6,6 @@
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.css1;
-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;
@@ -243,36 +242,6 @@
}
/**
- * Print this property.
- *
- * @see #toString()
- * @see #getPropertyName()
- */
- public void print(CssPrinterStyle printer) {
- if (inheritedValue) {
- printer.print(this);
- } else if ((listStyleType != null && listStyleImage != null &&
- listStylePosition != null) &&
- (getImportant() ||
- (!listStyleType.important &&
- !listStyleImage.important &&
- !listStylePosition.important))) {
- printer.print(this);
- } else {
- if (listStyleType != null) {
- listStyleType.print(printer);
- }
- if (listStyleImage != null) {
- listStyleImage.print(printer);
- }
- if (listStylePosition != null) {
- listStylePosition.print(printer);
- }
- }
-
- }
-
- /**
* Set the context.
* Overrides this method for a macro
*
Index: CssBorderRight.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderRight.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssBorderRight.java 5 Jan 2010 13:49:41 -0000 1.4
+++ CssBorderRight.java 9 Sep 2011 12:16:44 -0000 1.5
@@ -6,7 +6,6 @@
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.css1;
-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;
@@ -258,32 +257,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.important &&
- !style.important &&
- !color.important))) {
- 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: CssBorderBottomCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderBottomCSS1.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssBorderBottomCSS1.java 5 Jan 2010 13:49:40 -0000 1.4
+++ CssBorderBottomCSS1.java 9 Sep 2011 12:16:43 -0000 1.5
@@ -6,7 +6,6 @@
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.css1;
-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.important &&
- !style.important &&
- !color.important))) {
- 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: CssBorderRightCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderRightCSS2.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- CssBorderRightCSS2.java 5 Jan 2010 13:49:41 -0000 1.5
+++ CssBorderRightCSS2.java 9 Sep 2011 12:16:44 -0000 1.6
@@ -6,7 +6,6 @@
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.css1;
-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;
@@ -257,32 +256,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.important &&
- !style.important &&
- !color.important))) {
- 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: CssBorderColorCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderColorCSS2.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- CssBorderColorCSS2.java 5 Jan 2010 13:49:40 -0000 1.6
+++ CssBorderColorCSS2.java 9 Sep 2011 12:16:44 -0000 1.7
@@ -7,7 +7,6 @@
package org.w3c.css.properties.css1;
-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;
@@ -327,37 +326,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.important &&
- !right.important &&
- !left.important &&
- !bottom.important))) {
- 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: CssMargin.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssMargin.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- CssMargin.java 5 Jan 2010 13:49:44 -0000 1.5
+++ CssMargin.java 9 Sep 2011 12:16:45 -0000 1.6
@@ -6,7 +6,6 @@
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.css1;
-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;
@@ -280,36 +279,6 @@
}
/**
- * Print this property.
- *
- * @see #toString()
- * @see #getPropertyName()
- */
- public void print(CssPrinterStyle printer) {
- if (inheritedValue) {
- printer.print(this);
- } else if ((top != null && right != null &&
- bottom != null && left != null) &&
- (getImportant() ||
- (!top.important &&
- !right.important &&
- !bottom.important &&
- !left.important))) {
- printer.print(this);
- } else {
- if (top != null)
- top.print(printer);
- if (right != null)
- right.print(printer);
- if (bottom != null)
- bottom.print(printer);
- if (left != null)
- left.print(printer);
- }
-
- }
-
- /**
* Set the context.
* Overrides this method for a macro
*
Index: CssFontCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssFontCSS1.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- CssFontCSS1.java 5 Jan 2010 13:49:43 -0000 1.5
+++ CssFontCSS1.java 9 Sep 2011 12:16:44 -0000 1.6
@@ -6,7 +6,6 @@
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.css1;
-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;
@@ -287,50 +286,6 @@
}
/**
- * Print this property.
- *
- * @param printer The printer
- * @see #toString()
- * @see #getPropertyName()
- */
- public void print(CssPrinterStyle printer) {
- if (value != null) {
- printer.print(this);
- } else if ((fontStyle != null && fontVariant != null &&
- fontWeight != null && fontSize !=null &&
- lineHeight != null && fontFamily != null) &&
- (getImportant() ||
- (!fontStyle.important &&
- !fontVariant.important &&
- !fontWeight.important &&
- !fontSize.important &&
- !lineHeight.important &&
- !fontFamily.important))) {
- printer.print(this);
- } else {
- if (fontStyle != null) {
- fontStyle.print(printer);
- }
- if (fontVariant != null) {
- fontVariant.print(printer);
- }
- if (fontWeight != null) {
- fontWeight.print(printer);
- }
- if (fontSize != null) {
- fontSize.print(printer);
- }
- if (lineHeight != null) {
- lineHeight.print(printer);
- }
- if ((fontFamily != null) &&
- ((fontFamily.isSoftlyInherited()) || (fontFamily.size() != 0))) {
- fontFamily.print(printer);
- }
- }
- }
-
- /**
* Add this property to the CssStyle
*
* @param style The CssStyle
Index: CssBorderTopColorCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderTopColorCSS1.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssBorderTopColorCSS1.java 5 Jan 2010 13:49:41 -0000 1.4
+++ CssBorderTopColorCSS1.java 9 Sep 2011 12:16:44 -0000 1.5
@@ -6,7 +6,6 @@
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.css1;
-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;
@@ -132,15 +131,4 @@
face.equals(((CssBorderTopColorCSS1) 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 != null && !face.isDefault())
- printer.print(this);
- }
-
}
Index: CssFontCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssFontCSS2.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- CssFontCSS2.java 5 Jan 2010 13:49:43 -0000 1.5
+++ CssFontCSS2.java 9 Sep 2011 12:16:44 -0000 1.6
@@ -6,7 +6,6 @@
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.css1;
-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;
@@ -314,50 +313,6 @@
}
/**
- * Print this property.
- *
- * @param printer The printer
- * @see #toString()
- * @see #getPropertyName()
- */
- public void print(CssPrinterStyle printer) {
- if (value != null) {
- printer.print(this);
- } else if ((fontStyle != null && fontVariant != null &&
- fontWeight != null && fontSize !=null &&
- lineHeight != null && fontFamily != null) &&
- (getImportant() ||
- (!fontStyle.important &&
- !fontVariant.important &&
- !fontWeight.important &&
- !fontSize.important &&
- !lineHeight.important &&
- !fontFamily.important))) {
- printer.print(this);
- } else {
- if (fontStyle != null) {
- fontStyle.print(printer);
- }
- if (fontVariant != null) {
- fontVariant.print(printer);
- }
- if (fontWeight != null) {
- fontWeight.print(printer);
- }
- if (fontSize != null) {
- fontSize.print(printer);
- }
- if (lineHeight != null) {
- lineHeight.print(printer);
- }
- if ((fontFamily != null) &&
- ((fontFamily.isSoftlyInherited()) || (fontFamily.size() != 0))) {
- fontFamily.print(printer);
- }
- }
- }
-
- /**
* Add this property to the CssStyle
*
* @param style The CssStyle
Index: CssBorderColorCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderColorCSS1.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- CssBorderColorCSS1.java 5 Jan 2010 13:49:40 -0000 1.5
+++ CssBorderColorCSS1.java 9 Sep 2011 12:16:44 -0000 1.6
@@ -7,7 +7,6 @@
package org.w3c.css.properties.css1;
-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;
@@ -244,37 +243,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.important &&
- !right.important &&
- !left.important &&
- !bottom.important))) {
- 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: CssBorderLeftColorCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderLeftColorCSS1.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssBorderLeftColorCSS1.java 5 Jan 2010 13:49:41 -0000 1.4
+++ CssBorderLeftColorCSS1.java 9 Sep 2011 12:16:44 -0000 1.5
@@ -6,7 +6,6 @@
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.css1;
-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;
@@ -133,13 +132,4 @@
return (property instanceof CssBorderLeftColorCSS1 && face.equals(((CssBorderLeftColorCSS1) property).face));
}
- /**
- * Print this property
- *
- * @param printer The printer.
- */
- public void print(CssPrinterStyle printer) {
- if (face != null && !face.isDefault())
- printer.print(this);
- }
}
Index: CssBorderRightColor.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderRightColor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssBorderRightColor.java 5 Jan 2010 13:49:41 -0000 1.4
+++ CssBorderRightColor.java 9 Sep 2011 12:16:44 -0000 1.5
@@ -6,7 +6,6 @@
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.css1;
-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;
@@ -133,13 +132,4 @@
face.equals(((CssBorderRightColor) property).face));
}
- /**
- * Print this property.
- *
- * @param printer The printer.
- */
- public void print(CssPrinterStyle printer) {
- if (face != null && !face.isDefault())
- printer.print(this);
- }
}
Index: CssBorderBottomCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderBottomCSS2.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- CssBorderBottomCSS2.java 5 Jan 2010 13:49:40 -0000 1.5
+++ CssBorderBottomCSS2.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.css1;
-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;
@@ -257,32 +256,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.important &&
- !style.important &&
- !color.important))) {
- 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: CssBorderWidthCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderWidthCSS1.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- CssBorderWidthCSS1.java 5 Jan 2010 13:49:42 -0000 1.5
+++ CssBorderWidthCSS1.java 9 Sep 2011 12:16:44 -0000 1.6
@@ -6,7 +6,6 @@
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.css1;
-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.important &&
- !right.important &&
- !left.important &&
- !bottom.important))) {
- 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: CssBorderWidth.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderWidth.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssBorderWidth.java 5 Jan 2010 13:49:42 -0000 1.4
+++ CssBorderWidth.java 9 Sep 2011 12:16:44 -0000 1.5
@@ -6,7 +6,6 @@
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.css1;
-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;
@@ -231,35 +230,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.important &&
- !right.important &&
- !left.important &&
- !bottom.important))) {
- 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: CssBorderLeftColorCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderLeftColorCSS2.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- CssBorderLeftColorCSS2.java 5 Jan 2010 13:49:41 -0000 1.5
+++ CssBorderLeftColorCSS2.java 9 Sep 2011 12:16:44 -0000 1.6
@@ -6,7 +6,6 @@
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.css1;
-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;
@@ -147,13 +146,4 @@
return (property instanceof CssBorderLeftColorCSS2 && face.equals(((CssBorderLeftColorCSS2) property).face));
}
- /**
- * Print this property
- *
- * @param printer The printer.
- */
- public void print(CssPrinterStyle printer) {
- if (face != null && !face.isDefault())
- printer.print(this);
- }
}
Index: CssBorderLeftColor.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderLeftColor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssBorderLeftColor.java 5 Jan 2010 13:49:41 -0000 1.4
+++ CssBorderLeftColor.java 9 Sep 2011 12:16:44 -0000 1.5
@@ -6,7 +6,6 @@
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.css1;
-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;
@@ -133,13 +132,4 @@
return (property instanceof CssBorderLeftColor && face.equals(((CssBorderLeftColor) property).face));
}
- /**
- * Print this property
- *
- * @param printer The printer.
- */
- public void print(CssPrinterStyle printer) {
- if (face != null && !face.isDefault())
- printer.print(this);
- }
}
Index: CssListStyle.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssListStyle.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- CssListStyle.java 5 Jan 2010 13:49:44 -0000 1.5
+++ CssListStyle.java 9 Sep 2011 12:16:44 -0000 1.6
@@ -6,7 +6,6 @@
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.css1;
-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;
@@ -247,36 +246,6 @@
}
/**
- * Print this property.
- *
- * @see #toString()
- * @see #getPropertyName()
- */
- public void print(CssPrinterStyle printer) {
- if (inheritedValue) {
- printer.print(this);
- } else if ((listStyleType != null && listStyleImage != null &&
- listStylePosition != null) &&
- (getImportant() ||
- (!listStyleType.important &&
- !listStyleImage.important &&
- !listStylePosition.important))) {
- printer.print(this);
- } else {
- if (listStyleType != null) {
- listStyleType.print(printer);
- }
- if (listStyleImage != null) {
- listStyleImage.print(printer);
- }
- if (listStylePosition != null) {
- listStylePosition.print(printer);
- }
- }
-
- }
-
- /**
* Set the context.
* Overrides this method for a macro
*
Index: CssBorderTopCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderTopCSS2.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- CssBorderTopCSS2.java 5 Jan 2010 13:49:41 -0000 1.6
+++ CssBorderTopCSS2.java 9 Sep 2011 12:16:44 -0000 1.7
@@ -6,7 +6,6 @@
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.css1;
-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;
@@ -286,32 +285,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.important &&
- !style.important &&
- !color.important))) {
- 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: CssBorderTop.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderTop.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssBorderTop.java 5 Jan 2010 13:49:41 -0000 1.4
+++ CssBorderTop.java 9 Sep 2011 12:16:44 -0000 1.5
@@ -6,7 +6,6 @@
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.css1;
-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;
@@ -261,32 +260,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.important &&
- !style.important &&
- !color.important))) {
- 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
Received on Friday, 9 September 2011 12:17:05 UTC