- From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
- Date: Tue, 05 Jan 2010 13:49:48 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/properties/css1
In directory hutz:/tmp/cvs-serv25562/org/w3c/css/properties/css1
Modified Files:
Css1Style.java CssBackgroundAttachmentCSS1.java
CssBackgroundAttachmentMob.java CssBackgroundCSS1.java
CssBackgroundColorCSS1.java CssBackgroundColorMob.java
CssBackgroundImageCSS1.java CssBackgroundImageMob.java
CssBackgroundMob.java CssBackgroundPositionCSS1.java
CssBackgroundPositionMob.java CssBackgroundRepeatCSS1.java
CssBackgroundRepeatMob.java CssBackgroundTV.java
CssBorder.java CssBorderBottom.java CssBorderBottomCSS1.java
CssBorderBottomCSS2.java CssBorderBottomColor.java
CssBorderBottomColorCSS1.java CssBorderBottomColorCSS2.java
CssBorderBottomStyle.java CssBorderBottomStyleCSS1.java
CssBorderBottomStyleCSS2.java CssBorderBottomWidth.java
CssBorderBottomWidthCSS1.java CssBorderBottomWidthCSS2.java
CssBorderCSS1.java CssBorderCSS2.java CssBorderColor.java
CssBorderColorCSS1.java CssBorderColorCSS2.java
CssBorderFaceColor.java CssBorderFaceColorCSS2.java
CssBorderFaceWidth.java CssBorderFaceWidthCSS1.java
CssBorderFaceWidthCSS2.java CssBorderLeft.java
CssBorderLeftCSS1.java CssBorderLeftCSS2.java
CssBorderLeftColor.java CssBorderLeftColorCSS1.java
CssBorderLeftColorCSS2.java CssBorderLeftStyle.java
CssBorderLeftStyleCSS1.java CssBorderLeftStyleCSS2.java
CssBorderLeftWidth.java CssBorderLeftWidthCSS1.java
CssBorderLeftWidthCSS2.java CssBorderRight.java
CssBorderRightCSS1.java CssBorderRightCSS2.java
CssBorderRightColor.java CssBorderRightColorCSS1.java
CssBorderRightColorCSS2.java CssBorderRightStyle.java
CssBorderRightStyleCSS1.java CssBorderRightStyleCSS2.java
CssBorderRightWidth.java CssBorderRightWidthCSS1.java
CssBorderRightWidthCSS2.java CssBorderStyle.java
CssBorderStyleCSS1.java CssBorderStyleCSS2.java
CssBorderTop.java CssBorderTopCSS1.java CssBorderTopCSS2.java
CssBorderTopColor.java CssBorderTopColorCSS1.java
CssBorderTopColorCSS2.java CssBorderTopStyle.java
CssBorderTopStyleCSS1.java CssBorderTopStyleCSS2.java
CssBorderTopWidth.java CssBorderTopWidthCSS1.java
CssBorderTopWidthCSS2.java CssBorderWidth.java
CssBorderWidthCSS1.java CssBorderWidthCSS2.java CssBottom.java
CssBoxOffsetFace.java CssClear.java CssClip.java CssColor.java
CssColorCSS1.java CssColorCSS2.java CssContent.java
CssContentCSS2.java CssCounterIncrement.java
CssCounterReset.java CssDirection.java CssDirectionATSC.java
CssDisplayCSS1.java CssFloat.java CssFont.java
CssFontCSS1.java CssFontCSS2.java CssFontFamily.java
CssFontFamilyCSS1.java CssFontFamilyCSS2.java CssFontSize.java
CssFontSizeAdjust.java CssFontSizeAdjustCSS2.java
CssFontSizeCSS1.java CssFontSizeCSS2.java CssFontStretch.java
CssFontStretchCSS1.java CssFontStretchCSS2.java
CssFontStyle.java CssFontStyleCSS1.java CssFontStyleCSS2.java
CssFontVariant.java CssFontVariantCSS1.java
CssFontVariantCSS2.java CssFontWeight.java
CssFontWeightCSS1.java CssFontWeightCSS2.java CssHeight.java
CssHeightMob.java CssLeft.java CssLetterSpacing.java
CssLineHeight.java CssLineHeightCSS1.java
CssLineHeightCSS2.java CssListStyle.java CssListStyleCSS1.java
CssListStyleCSS2.java CssListStyleImage.java
CssListStyleImageCSS1.java CssListStyleImageCSS2.java
CssListStylePosition.java CssListStylePositionCSS1.java
CssListStylePositionCSS2.java CssListStyleTV.java
CssListStyleType.java CssListStyleTypeCSS1.java
CssListStyleTypeCSS2.java CssListStyleTypeTV.java
CssMargin.java CssMarginBottom.java CssMarginLeft.java
CssMarginRight.java CssMarginSide.java CssMarginTop.java
CssMarkerOffset.java CssMarkerOffsetATSC.java
CssMaxHeight.java CssMaxHeightATSC.java CssMaxWidth.java
CssMaxWidthATSC.java CssMinHeight.java CssMinHeightATSC.java
CssMinWidth.java CssMinWidthATSC.java CssOverflow.java
CssPadding.java CssPaddingBottom.java CssPaddingLeft.java
CssPaddingRight.java CssPaddingSide.java CssPaddingTop.java
CssPosition.java CssPositionTV.java CssQuotes.java
CssQuotesATSC.java CssRight.java CssTextAlign.java
CssTextAlignMob.java CssTextAlignTV.java
CssTextDecoration.java CssTextDecorationMob.java
CssTextDecorationTV.java CssTextIndent.java
CssTextIndentMob.java CssTextPropertiesConstants.java
CssTextShadow.java CssTextShadowATSC.java
CssTextTransform.java CssTop.java CssUnicodeBidi.java
CssUnicodeBidiATSC.java CssVerticalAlign.java
CssVerticalAlignCSS1.java CssVerticalAlignMob.java
CssVerticalAlignTV.java CssVisibility.java CssWhiteSpace.java
CssWidth.java CssWidthMob.java CssWordSpacing.java
Removed Files:
CssBackground.java CssBackgroundAttachment.java
CssBackgroundAttachmentCSS2.java CssBackgroundCSS2.java
CssBackgroundColor.java CssBackgroundColorCSS2.java
CssBackgroundConstants.java CssBackgroundImage.java
CssBackgroundImageCSS2.java CssBackgroundPosition.java
CssBackgroundPositionCSS2.java CssBackgroundRepeat.java
CssBackgroundRepeatCSS2.java CssDisplay.java
CssDisplayCSS2.java CssProperties.java CssProperty.java
CssZIndex.java
Log Message:
Implementation of css3-background (partial, missing background-color and background, also borders not done)
cf. http://www.w3.org/TR/2009/CR-css3-background-20091217/
moved and corrected implementation of css3-multicol
cf. http://www.w3.org/TR/2009/CR-css3-multicol-20091217/
Some reorganization of code.
Index: CssBorderTopStyleCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderTopStyleCSS2.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorderTopStyleCSS2.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssBorderTopStyleCSS2.java 5 Jan 2010 13:49:42 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssPaddingTop.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssPaddingTop.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssPaddingTop.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssPaddingTop.java 5 Jan 2010 13:49:45 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorderBottomWidthCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderBottomWidthCSS2.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorderBottomWidthCSS2.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssBorderBottomWidthCSS2.java 5 Jan 2010 13:49:40 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
--- CssBackgroundPosition.java DELETED ---
Index: CssBorderLeftWidth.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderLeftWidth.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorderLeftWidth.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssBorderLeftWidth.java 5 Jan 2010 13:49:41 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorderColor.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderColor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssBorderColor.java 19 Apr 2006 11:28:05 -0000 1.4
+++ CssBorderColor.java 5 Jan 2010 13:49:40 -0000 1.5
@@ -10,6 +10,7 @@
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;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssPosition.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssPosition.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssPosition.java 14 Sep 2005 15:14:31 -0000 1.2
+++ CssPosition.java 5 Jan 2010 13:49:45 -0000 1.3
@@ -9,6 +9,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorderBottom.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderBottom.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorderBottom.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssBorderBottom.java 5 Jan 2010 13:49:40 -0000 1.4
@@ -9,6 +9,7 @@
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;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssFontStretch.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssFontStretch.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssFontStretch.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssFontStretch.java 5 Jan 2010 13:49:43 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssHeight.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssHeight.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssHeight.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssHeight.java 5 Jan 2010 13:49:43 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBackgroundMob.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBackgroundMob.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBackgroundMob.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssBackgroundMob.java 5 Jan 2010 13:49:39 -0000 1.4
@@ -9,6 +9,8 @@
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;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
@@ -46,11 +48,11 @@
* have been specified.
*
* @version $Revision$
- * @see CssBackgroundColor
- * @see CssBackgroundImage
- * @see CssBackgroundRepeat
- * @see CssBackgroundAttachment
- * @see CssBackgroundPosition
+ * @see org.w3c.css.properties.css.CssBackgroundColor
+ * @see org.w3c.css.properties.css.CssBackgroundImage
+ * @see org.w3c.css.properties.css.CssBackgroundRepeat
+ * @see org.w3c.css.properties.css.CssBackgroundAttachment
+ * @see org.w3c.css.properties.css.CssBackgroundPosition
*/
public class CssBackgroundMob extends CssProperty
implements CssOperator, CssBackgroundConstants {
Index: CssMaxWidth.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssMaxWidth.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssMaxWidth.java 14 Sep 2005 15:14:31 -0000 1.2
+++ CssMaxWidth.java 5 Jan 2010 13:49:44 -0000 1.3
@@ -9,6 +9,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssListStyleCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssListStyleCSS1.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssListStyleCSS1.java 27 Feb 2007 22:36:23 -0000 1.4
+++ CssListStyleCSS1.java 5 Jan 2010 13:49:44 -0000 1.5
@@ -9,6 +9,7 @@
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;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
--- CssBackgroundColor.java DELETED ---
Index: CssTextDecoration.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssTextDecoration.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssTextDecoration.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssTextDecoration.java 5 Jan 2010 13:49:45 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssLineHeightCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssLineHeightCSS2.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssLineHeightCSS2.java 5 Mar 2006 18:27:27 -0000 1.4
+++ CssLineHeightCSS2.java 5 Jan 2010 13:49:44 -0000 1.5
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssTextAlign.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssTextAlign.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssTextAlign.java 14 Sep 2005 15:14:31 -0000 1.4
+++ CssTextAlign.java 5 Jan 2010 13:49:45 -0000 1.5
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssTextDecorationTV.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssTextDecorationTV.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssTextDecorationTV.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssTextDecorationTV.java 5 Jan 2010 13:49:45 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssContent.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssContent.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssContent.java 14 Sep 2005 15:14:31 -0000 1.2
+++ CssContent.java 5 Jan 2010 13:49:42 -0000 1.3
@@ -12,6 +12,7 @@
import java.util.Vector;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssListStyleType.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssListStyleType.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssListStyleType.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssListStyleType.java 5 Jan 2010 13:49:44 -0000 1.4
@@ -8,6 +8,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
--- CssDisplay.java DELETED ---
Index: CssPaddingSide.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssPaddingSide.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssPaddingSide.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssPaddingSide.java 5 Jan 2010 13:49:45 -0000 1.4
@@ -6,6 +6,7 @@
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.css1;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssListStyleImage.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssListStyleImage.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssListStyleImage.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssListStyleImage.java 5 Jan 2010 13:49:44 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBackgroundColorMob.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBackgroundColorMob.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBackgroundColorMob.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssBackgroundColorMob.java 5 Jan 2010 13:49:39 -0000 1.4
@@ -8,6 +8,8 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
+import org.w3c.css.properties.css2.CssBackgroundColorCSS2;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorderTopStyle.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderTopStyle.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorderTopStyle.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssBorderTopStyle.java 5 Jan 2010 13:49:42 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssLineHeight.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssLineHeight.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssLineHeight.java 5 Mar 2006 18:27:27 -0000 1.4
+++ CssLineHeight.java 5 Jan 2010 13:49:43 -0000 1.5
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
--- CssProperty.java DELETED ---
Index: CssFontSize.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssFontSize.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssFontSize.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssFontSize.java 5 Jan 2010 13:49:43 -0000 1.4
@@ -8,6 +8,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssListStyleTypeTV.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssListStyleTypeTV.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssListStyleTypeTV.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssListStyleTypeTV.java 5 Jan 2010 13:49:44 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorderStyleCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderStyleCSS1.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssBorderStyleCSS1.java 19 Apr 2006 11:28:05 -0000 1.4
+++ CssBorderStyleCSS1.java 5 Jan 2010 13:49:41 -0000 1.5
@@ -10,6 +10,7 @@
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;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssColorCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssColorCSS1.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- CssColorCSS1.java 9 Mar 2009 21:12:00 -0000 1.5
+++ CssColorCSS1.java 5 Jan 2010 13:49:42 -0000 1.6
@@ -7,10 +7,10 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssIdent;
import org.w3c.css.values.CssTypes;
import org.w3c.css.values.CssValue;
--- CssBackgroundAttachment.java DELETED ---
Index: CssBorderFaceColorCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderFaceColorCSS2.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- CssBorderFaceColorCSS2.java 19 Apr 2006 11:28:05 -0000 1.5
+++ CssBorderFaceColorCSS2.java 5 Jan 2010 13:49:40 -0000 1.6
@@ -6,6 +6,7 @@
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.css1;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorderLeftWidthCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderLeftWidthCSS1.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorderLeftWidthCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssBorderLeftWidthCSS1.java 5 Jan 2010 13:49:41 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssListStyleImageCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssListStyleImageCSS2.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssListStyleImageCSS2.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssListStyleImageCSS2.java 5 Jan 2010 13:49:44 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssFontWeightCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssFontWeightCSS1.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssFontWeightCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssFontWeightCSS1.java 5 Jan 2010 13:49:43 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: Css1Style.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/Css1Style.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- Css1Style.java 6 Apr 2009 13:41:42 -0000 1.17
+++ Css1Style.java 5 Jan 2010 13:49:38 -0000 1.18
@@ -7,15 +7,29 @@
package org.w3c.css.properties.css1;
-import java.util.Enumeration;
-
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;
+import org.w3c.css.properties.css.CssBackgroundAttachment;
+import org.w3c.css.properties.css.CssBackgroundColor;
+import org.w3c.css.properties.css.CssBackgroundImage;
+import org.w3c.css.properties.css.CssBackgroundPosition;
+import org.w3c.css.properties.css.CssBackgroundRepeat;
+import org.w3c.css.properties.css.CssDisplay;
+import org.w3c.css.properties.css.CssProperty;
+import org.w3c.css.properties.css.CssZIndex;
+import org.w3c.css.properties.css2.CssBackgroundAttachmentCSS2;
+import org.w3c.css.properties.css2.CssBackgroundCSS2;
+import org.w3c.css.properties.css2.CssBackgroundColorCSS2;
+import org.w3c.css.properties.css2.CssBackgroundImageCSS2;
+import org.w3c.css.properties.css2.CssBackgroundPositionCSS2;
+import org.w3c.css.properties.css2.CssBackgroundRepeatCSS2;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.Util;
import org.w3c.css.util.Warning;
import org.w3c.css.util.Warnings;
+import org.w3c.css.values.CssIdent;
import org.w3c.css.values.CssLength;
import org.w3c.css.values.CssPercentage;
import org.w3c.css.values.CssTypes;
@@ -27,157 +41,155 @@
public class Css1Style extends CssStyle {
/** Font properties */
- protected CssFont cssFont = new CssFont();
- protected CssFontCSS2 cssFontCSS2 = new CssFontCSS2();
- protected CssFontCSS1 cssFontCSS1 = new CssFontCSS1();
- protected CssFontStretch cssFontStretch;
- protected CssFontStretchCSS2 cssFontStretchCSS2;
- protected CssFontStretchCSS1 cssFontStretchCSS1;
- protected CssFontSizeAdjust cssFontSizeAdjust;
- protected CssFontSizeAdjustCSS2 cssFontSizeAdjustCSS2;
+ public CssFont cssFont = new CssFont();
+ public CssFontCSS2 cssFontCSS2 = new CssFontCSS2();
+ public CssFontCSS1 cssFontCSS1 = new CssFontCSS1();
+ public CssFontStretch cssFontStretch;
+ public CssFontStretchCSS2 cssFontStretchCSS2;
+ public CssFontStretchCSS1 cssFontStretchCSS1;
+ public CssFontSizeAdjust cssFontSizeAdjust;
+ public CssFontSizeAdjustCSS2 cssFontSizeAdjustCSS2;
/* Color and Background properties */
/** Color property */
- protected CssColor cssColor;
- protected CssColorCSS2 cssColorCSS2;
- protected CssColorCSS1 cssColorCSS1;
+ public CssColor cssColor;
+ public CssColorCSS2 cssColorCSS2;
+ public CssColorCSS1 cssColorCSS1;
/** background properties */
- protected CssBackground cssBackground = new CssBackground();
- protected CssBackgroundCSS2 cssBackgroundCSS2 = new CssBackgroundCSS2();
- protected CssBackgroundCSS1 cssBackgroundCSS1 = new CssBackgroundCSS1();
- protected CssBackgroundMob cssBackgroundMob = new CssBackgroundMob();
+ public CssBackground cssBackground = new CssBackground();
+ public CssBackgroundCSS2 cssBackgroundCSS2 = new CssBackgroundCSS2();
+ public CssBackgroundCSS1 cssBackgroundCSS1 = new CssBackgroundCSS1();
+ public CssBackgroundMob cssBackgroundMob = new CssBackgroundMob();
/* Text properties */
/** word-spacing property */
- protected CssWordSpacing cssWordSpacing;
+ public CssWordSpacing cssWordSpacing;
/** letter-spacing property */
- protected CssLetterSpacing cssLetterSpacing;
+ public CssLetterSpacing cssLetterSpacing;
/** text-decoration property */
- protected CssTextDecoration cssTextDecoration;
- protected CssTextDecorationMob cssTextDecorationMob;
+ public CssTextDecoration cssTextDecoration;
+ public CssTextDecorationMob cssTextDecorationMob;
/** vertical-align property */
- protected CssVerticalAlign cssVerticalAlign;
- protected CssVerticalAlignCSS1 cssVerticalAlignCSS1;
- protected CssVerticalAlignMob cssVerticalAlignMob;
+ public CssVerticalAlign cssVerticalAlign;
+ public CssVerticalAlignCSS1 cssVerticalAlignCSS1;
+ public CssVerticalAlignMob cssVerticalAlignMob;
/** text-transform property */
- protected CssTextTransform cssTextTransform;
+ public CssTextTransform cssTextTransform;
/** text-align property */
- protected CssTextAlign cssTextAlign;
- protected CssTextAlignMob cssTextAlignMob;
+ public CssTextAlign cssTextAlign;
+ public CssTextAlignMob cssTextAlignMob;
/** text-ident property */
- protected CssTextIndent cssTextIndent;
- protected CssTextIndentMob cssTextIndentMob;
+ public CssTextIndent cssTextIndent;
+ public CssTextIndentMob cssTextIndentMob;
/** text-shadow property */
- protected CssTextShadow cssTextShadow;
- protected CssTextShadowATSC cssTextShadowATSC;
+ public CssTextShadow cssTextShadow;
+ public CssTextShadowATSC cssTextShadowATSC;
// line-heigth : see cssFont
/* Box properties */
/** margin properties */
- protected CssMargin cssMargin = new CssMargin();
+ public CssMargin cssMargin = new CssMargin();
/** padding properties */
- protected CssPadding cssPadding = new CssPadding();
+ public CssPadding cssPadding = new CssPadding();
/** border properties */
- protected CssBorder cssBorder = new CssBorder();
- protected CssBorderCSS2 cssBorderCSS2 = new CssBorderCSS2();
- protected CssBorderCSS1 cssBorderCSS1 = new CssBorderCSS1();
+ public CssBorder cssBorder = new CssBorder();
+ public CssBorderCSS2 cssBorderCSS2 = new CssBorderCSS2();
+ public CssBorderCSS1 cssBorderCSS1 = new CssBorderCSS1();
/** width property */
- protected CssWidth cssWidth;
- protected CssWidthMob cssWidthMob;
+ public CssWidth cssWidth;
+ public CssWidthMob cssWidthMob;
/** min-width property */
- protected CssMinWidth cssMinWidth;
- protected CssMinWidthATSC cssMinWidthATSC;
+ public CssMinWidth cssMinWidth;
+ public CssMinWidthATSC cssMinWidthATSC;
/** max-width property */
- protected CssMaxWidth cssMaxWidth;
- protected CssMaxWidthATSC cssMaxWidthATSC;
+ public CssMaxWidth cssMaxWidth;
+ public CssMaxWidthATSC cssMaxWidthATSC;
/** min-height property */
- protected CssMinHeight cssMinHeight;
- protected CssMinHeightATSC cssMinHeightATSC;
+ public CssMinHeight cssMinHeight;
+ public CssMinHeightATSC cssMinHeightATSC;
/** max-height property */
- protected CssMaxHeight cssMaxHeight;
- protected CssMaxHeightATSC cssMaxHeightATSC;
+ public CssMaxHeight cssMaxHeight;
+ public CssMaxHeightATSC cssMaxHeightATSC;
/** height property */
- protected CssHeight cssHeight;
- protected CssHeightMob cssHeightMob;
+ public CssHeight cssHeight;
+ public CssHeightMob cssHeightMob;
/** float property */
- protected CssFloat cssFloat;
+ public CssFloat cssFloat;
/** clear property */
- protected CssClear cssClear;
+ public CssClear cssClear;
/* Classification properties */
/** display property */
- protected CssDisplay cssDisplay;
- protected CssDisplayCSS2 cssDisplayCSS2;
- protected CssDisplayCSS1 cssDisplayCSS1;
+ public CssDisplay cssDisplay;
/** position property */
- protected CssPosition cssPosition;
+ public CssPosition cssPosition;
/** top property */
- protected CssTop cssTop;
+ public CssTop cssTop;
/** left property */
- protected CssLeft cssLeft;
+ public CssLeft cssLeft;
/** right property */
- protected CssRight cssRight;
+ public CssRight cssRight;
/** bottom property */
- protected CssBottom cssBottom;
+ public CssBottom cssBottom;
/** z-index property */
- protected CssZIndex cssZIndex;
+ public CssZIndex cssZIndex;
/** direction property */
- protected CssDirection cssDirection;
- protected CssDirectionATSC cssDirectionATSC;
+ public CssDirection cssDirection;
+ public CssDirectionATSC cssDirectionATSC;
/** unicode-bidi property */
- protected CssUnicodeBidi cssUnicodeBidi;
- protected CssUnicodeBidiATSC cssUnicodeBidiATSC;
+ public CssUnicodeBidi cssUnicodeBidi;
+ public CssUnicodeBidiATSC cssUnicodeBidiATSC;
/** white-space property */
- protected CssWhiteSpace cssWhiteSpace;
+ public CssWhiteSpace cssWhiteSpace;
/** list-style properties */
- protected CssListStyle cssListStyle = new CssListStyle();
- protected CssListStyleCSS2 cssListStyleCSS2 = new CssListStyleCSS2();
- protected CssListStyleCSS1 cssListStyleCSS1 = new CssListStyleCSS1();
+ public CssListStyle cssListStyle = new CssListStyle();
+ public CssListStyleCSS2 cssListStyleCSS2 = new CssListStyleCSS2();
+ public CssListStyleCSS1 cssListStyleCSS1 = new CssListStyleCSS1();
/** overflow property */
- protected CssOverflow cssOverflow;
+ public CssOverflow cssOverflow;
/** clip property */
- protected CssClip cssClip;
+ public CssClip cssClip;
/** visibility property */
- protected CssVisibility cssVisibility;
+ public CssVisibility cssVisibility;
/** content property */
- protected CssContentCSS2 cssContentCSS2;
- protected CssContent cssContent;
+ public CssContentCSS2 cssContentCSS2;
+ public CssContent cssContent;
/** quotes property */
- protected CssQuotes cssQuotes;
- protected CssQuotesATSC cssQuotesATSC;
+ public CssQuotes cssQuotes;
+ public CssQuotesATSC cssQuotesATSC;
/** counter-reset property */
- protected CssCounterReset cssCounterReset;
+ public CssCounterReset cssCounterReset;
/** counter-increment property */
- protected CssCounterIncrement cssCounterIncrement;
+ public CssCounterIncrement cssCounterIncrement;
/** marker-offset property */
- protected CssMarkerOffset cssMarkerOffset;
- protected CssMarkerOffsetATSC cssMarkerOffsetATSC;
+ public CssMarkerOffset cssMarkerOffset;
+ public CssMarkerOffsetATSC cssMarkerOffsetATSC;
/**TV property */
- protected CssListStyleTypeTV cssListStyleTypeTV;
+ public CssListStyleTypeTV cssListStyleTypeTV;
/**TV property */
- protected CssListStyleTV cssListStyleTV;
+ public CssListStyleTV cssListStyleTV;
/**TV property */
- protected CssPositionTV cssPositionTV;
+ public CssPositionTV cssPositionTV;
/**TV property */
- protected CssTextAlignTV cssTextAlignTV;
+ public CssTextAlignTV cssTextAlignTV;
/**TV property */
- protected CssTextDecorationTV cssTextDecorationTV;
+ public CssTextDecorationTV cssTextDecorationTV;
/**TV property */
- protected CssVerticalAlignTV cssVerticalAlignTV;
+ public CssVerticalAlignTV cssVerticalAlignTV;
/*
* Font Properties
@@ -1920,21 +1932,6 @@
return cssDisplay;
}
- public final CssDisplayCSS2 getDisplayCSS2() {
- if (cssDisplayCSS2 == null) {
- cssDisplayCSS2 =
- (CssDisplayCSS2) style.CascadingOrder(new CssDisplayCSS2(), style, selector);
- }
- return cssDisplayCSS2;
- }
-
- public final CssDisplayCSS1 getDisplayCSS1() {
- if (cssDisplayCSS1 == null) {
- cssDisplayCSS1 =
- (CssDisplayCSS1) style.CascadingOrder(new CssDisplayCSS1(), style, selector);
- }
- return cssDisplayCSS1;
- }
/**
@@ -2445,12 +2442,6 @@
cssBottom.print(printer);
if (cssDisplay != null)
cssDisplay.print(printer);
- if (cssDisplayCSS2 != null) {
- cssDisplayCSS2.print(printer);
- }
- if (cssDisplayCSS1 != null) {
- cssDisplayCSS1.print(printer);
- }
if (cssPosition != null)
cssPosition.print(printer);
if (cssZIndex != null)
@@ -2801,7 +2792,7 @@
} else {
CssValue color = cssBackgroundCSS2.getColor();
- if (!color.equals(CssBackgroundColorCSS2.transparent)) {
+ if (!color.equals(CssBackgroundColor.transparent)) {
// It's better to have a color when a background is defined.
warnings.addWarning(new Warning(cssBackgroundCSS2.color,
"no-color", 2, ac));
@@ -3045,7 +3036,7 @@
if (cssMarkerOffset != null) {
//@@ beurk you know what ? 5 is horrible.
if ((cssDisplay == null)
- || (cssDisplay.value != 5)) {
+ || (CssIdent.getIdent("marker").equals(cssDisplay.get()))) {
warnings.addWarning(new Warning(cssMarkerOffset,
"marker", 1, ac));
}
Index: CssVerticalAlign.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssVerticalAlign.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssVerticalAlign.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssVerticalAlign.java 5 Jan 2010 13:49:45 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorderRightColor.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderRightColor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorderRightColor.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssBorderRightColor.java 5 Jan 2010 13:49:41 -0000 1.4
@@ -8,6 +8,7 @@
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;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorderBottomWidthCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderBottomWidthCSS1.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorderBottomWidthCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssBorderBottomWidthCSS1.java 5 Jan 2010 13:49:40 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssDirection.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssDirection.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssDirection.java 14 Sep 2005 15:14:31 -0000 1.2
+++ CssDirection.java 5 Jan 2010 13:49:42 -0000 1.3
@@ -9,6 +9,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssListStyleTypeCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssListStyleTypeCSS1.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssListStyleTypeCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssListStyleTypeCSS1.java 5 Jan 2010 13:49:44 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssMinHeight.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssMinHeight.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssMinHeight.java 14 Sep 2005 15:14:31 -0000 1.2
+++ CssMinHeight.java 5 Jan 2010 13:49:44 -0000 1.3
@@ -9,6 +9,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorderColorCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderColorCSS2.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- CssBorderColorCSS2.java 19 Apr 2006 11:28:05 -0000 1.5
+++ CssBorderColorCSS2.java 5 Jan 2010 13:49:40 -0000 1.6
@@ -10,6 +10,7 @@
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;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBackgroundRepeatMob.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBackgroundRepeatMob.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBackgroundRepeatMob.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssBackgroundRepeatMob.java 5 Jan 2010 13:49:40 -0000 1.4
@@ -7,6 +7,8 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssBackgroundConstants;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssFontVariant.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssFontVariant.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssFontVariant.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssFontVariant.java 5 Jan 2010 13:49:43 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssPaddingRight.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssPaddingRight.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssPaddingRight.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssPaddingRight.java 5 Jan 2010 13:49:45 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorderStyle.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderStyle.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- CssBorderStyle.java 17 Dec 2009 16:39:44 -0000 1.6
+++ CssBorderStyle.java 5 Jan 2010 13:49:41 -0000 1.7
@@ -12,6 +12,7 @@
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;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorderTopColorCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderTopColorCSS2.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssBorderTopColorCSS2.java 14 Sep 2005 15:14:31 -0000 1.4
+++ CssBorderTopColorCSS2.java 5 Jan 2010 13:49:42 -0000 1.5
@@ -8,6 +8,7 @@
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;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssHeightMob.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssHeightMob.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssHeightMob.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssHeightMob.java 5 Jan 2010 13:49:43 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssLeft.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssLeft.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssLeft.java 14 Sep 2005 15:14:31 -0000 1.2
+++ CssLeft.java 5 Jan 2010 13:49:43 -0000 1.3
@@ -9,6 +9,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
--- CssBackgroundColorCSS2.java DELETED ---
Index: CssMinHeightATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssMinHeightATSC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssMinHeightATSC.java 14 Sep 2005 15:14:31 -0000 1.2
+++ CssMinHeightATSC.java 5 Jan 2010 13:49:44 -0000 1.3
@@ -9,6 +9,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
--- CssBackgroundAttachmentCSS2.java DELETED ---
Index: CssFontWeightCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssFontWeightCSS2.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssFontWeightCSS2.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssFontWeightCSS2.java 5 Jan 2010 13:49:43 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorderBottomStyleCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderBottomStyleCSS1.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorderBottomStyleCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssBorderBottomStyleCSS1.java 5 Jan 2010 13:49:40 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorderTopStyleCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderTopStyleCSS1.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorderTopStyleCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssBorderTopStyleCSS1.java 5 Jan 2010 13:49:42 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssFontFamilyCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssFontFamilyCSS1.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssFontFamilyCSS1.java 13 Dec 2006 07:09:09 -0000 1.4
+++ CssFontFamilyCSS1.java 5 Jan 2010 13:49:43 -0000 1.5
@@ -11,6 +11,7 @@
import java.util.Vector;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.Util;
Index: CssBackgroundRepeatCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBackgroundRepeatCSS1.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssBackgroundRepeatCSS1.java 11 Feb 2009 21:41:10 -0000 1.4
+++ CssBackgroundRepeatCSS1.java 5 Jan 2010 13:49:40 -0000 1.5
@@ -7,6 +7,8 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssBackgroundRepeat;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
@@ -14,90 +16,97 @@
import org.w3c.css.values.CssTypes;
import org.w3c.css.values.CssValue;
+import java.util.HashMap;
+
/**
- * <H4>
- * <A NAME="background-repeat">5.3.4 'background-repeat'</A>
- * </H4>
- * <P>
- * <EM>Value:</EM> repeat | repeat-x | repeat-y | no-repeat<BR>
- * <EM>Initial:</EM> repeat<BR>
- * <EM>Applies to:</EM> all elements<BR>
- * <EM>Inherited:</EM> no<BR>
- * <EM>Percentage values:</EM> N/A<BR>
- * <P>
- * If a background image is specified, the value of 'background-repeat' determines
- * how/if the image is repeated.
- * <P>
- * A value of 'repeat' means that the image is repeated both horizontally and
- * vertically. The 'repeat-x' ('repeat-y') value makes the image repeat horizontally
- * (vertically), to create a single band of images from one side to the other.
- * With a value of 'no-repeat', the image is not repeated.
- * <PRE>
- * BODY {
- * background: red url(pendant.gif);
- * background-repeat: repeat-y;
- * }
- * </PRE>
- * <P>
- * In the example above, the image will only be repeated vertically.
+ * <H4>
+ * <A NAME="background-repeat">5.3.4 'background-repeat'</A>
+ * </H4>
+ * <p/>
+ * <EM>Value:</EM> repeat | repeat-x | repeat-y | no-repeat<BR>
+ * <EM>Initial:</EM> repeat<BR>
+ * <EM>Applies to:</EM> all elements<BR>
+ * <EM>Inherited:</EM> no<BR>
+ * <EM>Percentage values:</EM> N/A<BR>
+ * <p/>
+ * If a background image is specified, the value of 'background-repeat' determines
+ * how/if the image is repeated.
+ * <p/>
+ * A value of 'repeat' means that the image is repeated both horizontally and
+ * vertically. The 'repeat-x' ('repeat-y') value makes the image repeat horizontally
+ * (vertically), to create a single band of images from one side to the other.
+ * With a value of 'no-repeat', the image is not repeated.
+ * <PRE>
+ * BODY {
+ * background: red url(pendant.gif);
+ * background-repeat: repeat-y;
+ * }
+ * </PRE>
+ * <p/>
+ * In the example above, the image will only be repeated vertically.
+ *
* @version $Revision$
*/
-public class CssBackgroundRepeatCSS1 extends CssProperty
- implements CssBackgroundConstants {
+public class CssBackgroundRepeatCSS1 extends CssBackgroundRepeat {
- private static final String property_name = "background-repeat";
+ public static HashMap<String, CssIdent> allowed_values;
- int repeat;
+ static {
+ allowed_values = new HashMap<String, CssIdent>();
+ String[] REPEAT = {"repeat", "repeat-x", "repeat-y", "no-repeat"};
+
+ for (String aREPEAT : REPEAT) {
+ allowed_values.put(aREPEAT, CssIdent.getIdent(aREPEAT));
+ }
+ }
+
+ public CssValue value;
- private static int[] hash_values;
/**
* Create a new CssBackgroundRepeatCSS1
*/
public CssBackgroundRepeatCSS1() {
- repeat = 0;
+ value = repeat;
}
/**
* Set the value of the property
+ *
* @param expression The expression for this property
- * @exception InvalidParamException The expression is incorrect
+ * @throws InvalidParamException The expression is incorrect
*/
public CssBackgroundRepeatCSS1(ApplContext ac, CssExpression expression,
- boolean check) throws InvalidParamException {
-
- if(check && expression.getCount() > 1) {
- throw new InvalidParamException("unrecognize", ac);
- }
-
- CssValue val = expression.getValue();
- setByUser();
+ boolean check) throws InvalidParamException {
+ if (check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
- if (val.getType() == CssTypes.CSS_IDENT) {
- int hash = val.hashCode();
- for (int i =0; i < REPEAT.length; i++) {
- if (hash_values[i] == hash) {
- repeat = i;
- expression.next();
- return;
- }
- }
- }
+ CssValue val = expression.getValue();
+ setByUser();
- throw new InvalidParamException("value", expression.getValue(),
- getPropertyName(), ac);
+ if (val.getType() != CssTypes.CSS_IDENT) {
+ throw new InvalidParamException("value", expression.getValue(),
+ getPropertyName(), ac);
+ }
+ value = allowed_values.get(val.toString());
+ if (value == null) {
+ throw new InvalidParamException("value", expression.getValue(),
+ getPropertyName(), ac);
+ }
+ expression.next();
}
public CssBackgroundRepeatCSS1(ApplContext ac, CssExpression expression)
- throws InvalidParamException {
- this(ac, expression, false);
+ throws InvalidParamException {
+ this(ac, expression, false);
}
/**
* Returns the value of this property
*/
public Object get() {
- return REPEAT[repeat];
+ return value;
}
/**
@@ -105,21 +114,14 @@
* e.g. his value equals inherit
*/
public boolean isSoftlyInherited() {
- return repeat == 4;
+ return false;
}
/**
* Returns a string representation of the object.
*/
public String toString() {
- return REPEAT[repeat];
- }
-
- /**
- * Returns the name of this property
- */
- public String getPropertyName() {
- return property_name;
+ return value.toString();
}
/**
@@ -128,34 +130,34 @@
* @param style The CssStyle
*/
public void addToStyle(ApplContext ac, CssStyle style) {
- CssBackgroundCSS1 cssBackground = ((Css1Style) style).cssBackgroundCSS1;
- if (cssBackground.repeat != null)
- style.addRedefinitionWarning(ac, this);
- cssBackground.repeat = this;
+ CssBackgroundCSS1 cssBackground = ((Css1Style) style).cssBackgroundCSS1;
+ if (cssBackground.repeat != null)
+ style.addRedefinitionWarning(ac, this);
+ cssBackground.repeat = this;
}
/**
* Get this property in the style.
*
- * @param style The style where the property is
+ * @param style The style where the property is
* @param resolve if true, resolve the style to find this property
*/
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
- if (resolve) {
- return ((Css1Style) style).getBackgroundRepeatCSS1();
- } else {
- return ((Css1Style) style).cssBackgroundCSS1.repeat;
- }
+ if (resolve) {
+ return ((Css1Style) style).getBackgroundRepeatCSS1();
+ } else {
+ return ((Css1Style) style).cssBackgroundCSS1.repeat;
+ }
}
/**
* Compares two properties for equality.
*
- * @param value The other property.
+ * @param property The other property.
*/
public boolean equals(CssProperty property) {
- return (property instanceof CssBackgroundRepeatCSS1 &&
- repeat == ((CssBackgroundRepeatCSS1) property).repeat);
+ return (property instanceof CssBackgroundRepeatCSS1 &&
+ value == ((CssBackgroundRepeatCSS1) property).value);
}
/**
@@ -163,13 +165,7 @@
* It is used by all macro for the function <code>print</code>
*/
public boolean isDefault() {
- return repeat == 0;
- }
-
- static {
- hash_values = new int[REPEAT.length];
- for (int i = 0; i < REPEAT.length; i++)
- hash_values[i] = REPEAT[i].hashCode();
+ return (repeat == value);
}
}
Index: CssPadding.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssPadding.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssPadding.java 19 Apr 2006 11:28:05 -0000 1.3
+++ CssPadding.java 5 Jan 2010 13:49:44 -0000 1.4
@@ -10,6 +10,7 @@
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;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssColorCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssColorCSS2.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- CssColorCSS2.java 14 Sep 2005 15:14:31 -0000 1.5
+++ CssColorCSS2.java 5 Jan 2010 13:49:42 -0000 1.6
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorderRightStyle.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderRightStyle.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorderRightStyle.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssBorderRightStyle.java 5 Jan 2010 13:49:41 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorderTopCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderTopCSS1.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorderTopCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssBorderTopCSS1.java 5 Jan 2010 13:49:41 -0000 1.4
@@ -9,6 +9,7 @@
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;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorderLeftCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderLeftCSS1.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorderLeftCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssBorderLeftCSS1.java 5 Jan 2010 13:49:41 -0000 1.4
@@ -9,6 +9,7 @@
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;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorderBottomColorCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderBottomColorCSS2.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssBorderBottomColorCSS2.java 14 Sep 2005 15:14:31 -0000 1.4
+++ CssBorderBottomColorCSS2.java 5 Jan 2010 13:49:40 -0000 1.5
@@ -8,6 +8,7 @@
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;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssTextIndent.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssTextIndent.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssTextIndent.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssTextIndent.java 5 Jan 2010 13:49:45 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssVerticalAlignTV.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssVerticalAlignTV.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssVerticalAlignTV.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssVerticalAlignTV.java 5 Jan 2010 13:49:46 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssFontStyleCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssFontStyleCSS1.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssFontStyleCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssFontStyleCSS1.java 5 Jan 2010 13:49:43 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBackgroundPositionCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBackgroundPositionCSS1.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- CssBackgroundPositionCSS1.java 14 Sep 2005 15:14:31 -0000 1.6
+++ CssBackgroundPositionCSS1.java 5 Jan 2010 13:49:39 -0000 1.7
@@ -7,6 +7,8 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssBackgroundConstants;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
@@ -92,7 +94,7 @@
* In the example above, the image is placed in the lower right corner of the
* canvas.
* @version $Revision$
- * @see CssBackgroundAttachment
+ * @see org.w3c.css.properties.css.CssBackgroundAttachment
*/
public class CssBackgroundPositionCSS1 extends CssProperty
implements CssBackgroundConstants, CssOperator {
Index: CssMarginRight.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssMarginRight.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssMarginRight.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssMarginRight.java 5 Jan 2010 13:49:44 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
--- CssBackgroundRepeatCSS2.java DELETED ---
Index: CssMarkerOffset.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssMarkerOffset.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssMarkerOffset.java 14 Sep 2005 15:14:31 -0000 1.2
+++ CssMarkerOffset.java 5 Jan 2010 13:49:44 -0000 1.3
@@ -9,6 +9,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssFontWeight.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssFontWeight.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssFontWeight.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssFontWeight.java 5 Jan 2010 13:49:43 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorderTopWidth.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderTopWidth.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorderTopWidth.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssBorderTopWidth.java 5 Jan 2010 13:49:42 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssUnicodeBidiATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssUnicodeBidiATSC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssUnicodeBidiATSC.java 14 Sep 2005 15:14:31 -0000 1.2
+++ CssUnicodeBidiATSC.java 5 Jan 2010 13:49:45 -0000 1.3
@@ -9,6 +9,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssColor.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssColor.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- CssColor.java 6 Mar 2009 11:17:16 -0000 1.8
+++ CssColor.java 5 Jan 2010 13:49:42 -0000 1.9
@@ -7,14 +7,12 @@
package org.w3c.css.properties.css1;
-import java.util.Vector;
-
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
import org.w3c.css.values.CssFunction;
-import org.w3c.css.values.CssIdent;
import org.w3c.css.values.CssOperator;
import org.w3c.css.values.CssTypes;
import org.w3c.css.values.CssValue;
Index: CssBorderFaceWidthCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderFaceWidthCSS2.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- CssBorderFaceWidthCSS2.java 17 Dec 2009 17:12:43 -0000 1.5
+++ CssBorderFaceWidthCSS2.java 5 Jan 2010 13:49:41 -0000 1.6
@@ -8,11 +8,11 @@
import java.util.HashSet;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssLength;
import org.w3c.css.values.CssNumber;
import org.w3c.css.values.CssTypes;
import org.w3c.css.values.CssValue;
Index: CssBorderTopCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderTopCSS2.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- CssBorderTopCSS2.java 25 Mar 2008 18:43:30 -0000 1.5
+++ CssBorderTopCSS2.java 5 Jan 2010 13:49:41 -0000 1.6
@@ -9,6 +9,7 @@
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;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorderRightColorCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderRightColorCSS1.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorderRightColorCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssBorderRightColorCSS1.java 5 Jan 2010 13:49:41 -0000 1.4
@@ -8,6 +8,7 @@
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;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssWordSpacing.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssWordSpacing.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssWordSpacing.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssWordSpacing.java 5 Jan 2010 13:49:46 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssMaxHeight.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssMaxHeight.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssMaxHeight.java 14 Sep 2005 15:14:31 -0000 1.2
+++ CssMaxHeight.java 5 Jan 2010 13:49:44 -0000 1.3
@@ -9,6 +9,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssLineHeightCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssLineHeightCSS1.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssLineHeightCSS1.java 5 Mar 2006 18:27:27 -0000 1.4
+++ CssLineHeightCSS1.java 5 Jan 2010 13:49:44 -0000 1.5
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorderBottomStyle.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderBottomStyle.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorderBottomStyle.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssBorderBottomStyle.java 5 Jan 2010 13:49:40 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBackgroundColorCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBackgroundColorCSS1.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssBackgroundColorCSS1.java 11 Feb 2009 22:43:15 -0000 1.4
+++ CssBackgroundColorCSS1.java 5 Jan 2010 13:49:39 -0000 1.5
@@ -8,85 +8,85 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssBackgroundColor;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssIdent;
import org.w3c.css.values.CssTypes;
import org.w3c.css.values.CssValue;
/**
- * <H4>
- * 'background-color'
- * </H4>
- * <P>
- * <EM>Value:</EM> <color> | transparent<BR>
- * <EM>Initial:</EM> transparent<BR>
- * <EM>Applies to:</EM> all elements<BR>
- * <EM>Inherited:</EM> no<BR>
- * <EM>Percentage values:</EM> N/A<BR>
- * <P>
- * This property sets the background color of an element.
- * <PRE>
- * H1 { background-color: #F00 }
- * </PRE>
+ * <H4>
+ * 'background-color'
+ * </H4>
+ * <p/>
+ * <EM>Value:</EM> <color> | transparent<BR>
+ * <EM>Initial:</EM> transparent<BR>
+ * <EM>Applies to:</EM> all elements<BR>
+ * <EM>Inherited:</EM> no<BR>
+ * <EM>Percentage values:</EM> N/A<BR>
+ * <p/>
+ * This property sets the background color of an element.
+ * <PRE>
+ * H1 { background-color: #F00 }
+ * </PRE>
+ *
* @version $Revision$
*/
-public class CssBackgroundColorCSS1 extends CssProperty {
+public class CssBackgroundColorCSS1 extends CssBackgroundColor {
CssValue color;
- static CssIdent transparent = new CssIdent("transparent");
-
/**
* Create a new CssBackgroundColorCSS1
*/
public CssBackgroundColorCSS1() {
- color = transparent;
+ color = transparent;
}
/**
* Create a new CssBackgroundColorCSS1
*
* @param expression The expression for this property
- * @exception InvalidParamException Values are incorrect
+ * @throws InvalidParamException Values are incorrect
*/
public CssBackgroundColorCSS1(ApplContext ac, CssExpression expression,
- boolean check) throws InvalidParamException {
+ boolean check) throws InvalidParamException {
- if(check && expression.getCount() > 1) {
- throw new InvalidParamException("unrecognize", ac);
- }
+ if (check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
- setByUser();
- CssValue val = expression.getValue();
+ setByUser();
+ CssValue val = expression.getValue();
- switch (val.getType()) {
- case CssTypes.CSS_COLOR:
- setColor(val);
- break;
- case CssTypes.CSS_IDENT:
- if (transparent.equals(val)) {
- setColor(transparent);
- break;
- }
- if (inherit.equals(val)) {
- setColor(inherit);
- break;
- }
- setColor(new org.w3c.css.values.CssColorCSS1(ac,
- (String) val.get()));
- break;
- default:
- throw new InvalidParamException("value", val.toString(),
- getPropertyName(), ac);
- }
- expression.next();
+ switch (val.getType()) {
+ case CssTypes.CSS_COLOR:
+ setColor(val);
+ break;
+ case CssTypes.CSS_IDENT:
+ if (transparent.equals(val)) {
+ setColor(transparent);
+ break;
+ }
+ if (inherit.equals(val)) {
+ setColor(inherit);
+ break;
+ }
+ setColor(new org.w3c.css.values.CssColorCSS1(ac,
+ (String) val.get()));
+ break;
+ default:
+ throw new InvalidParamException("value", val.toString(),
+ getPropertyName(), ac);
+ }
+ expression.next();
}
public CssBackgroundColorCSS1(ApplContext ac, CssExpression expression)
- throws InvalidParamException {
- this(ac, expression, false);
+ throws InvalidParamException {
+ this(ac, expression, false);
}
/**
@@ -96,18 +96,18 @@
this.color = color;
}
- /**
+ /**
* Returns the value of this property
*/
public Object get() {
- return color;
+ return color;
}
/**
* Returns the color
*/
- public final CssValue getColor() {
- return color;
+ public CssValue getColor() {
+ return color;
}
/**
@@ -115,14 +115,14 @@
* e.g. his value equals inherit
*/
public boolean isSoftlyInherited() {
- return color.equals(inherit);
+ return color.equals(inherit);
}
/**
* Returns a string representation of the object.
*/
public String toString() {
- return color.toString();
+ return color.toString();
}
@@ -132,41 +132,34 @@
* @param style The CssStyle
*/
public void addToStyle(ApplContext ac, CssStyle style) {
- CssBackgroundCSS1 cssBackground = ((Css1Style) style).cssBackgroundCSS1;
- if (cssBackground.color != null)
- style.addRedefinitionWarning(ac, this);
- cssBackground.color = this;
+ CssBackgroundCSS1 cssBackground = ((Css1Style) style).cssBackgroundCSS1;
+ if (cssBackground.color != null)
+ style.addRedefinitionWarning(ac, this);
+ cssBackground.color = this;
}
/**
* Get this property in the style.
*
- * @param style The style where the property is
+ * @param style The style where the property is
* @param resolve if true, resolve the style to find this property
*/
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
- if (resolve) {
- return ((Css1Style) style).getBackgroundColorCSS1();
- } else {
- return ((Css1Style) style).cssBackgroundCSS1.color;
- }
+ if (resolve) {
+ return ((Css1Style) style).getBackgroundColorCSS1();
+ } else {
+ return ((Css1Style) style).cssBackgroundCSS1.color;
+ }
}
/**
* Compares two properties for equality.
*
- * @param value The other property.
+ * @param property The other property.
*/
public boolean equals(CssProperty property) {
- return (property instanceof CssBackgroundColorCSS1 &&
- color.equals( ((CssBackgroundColorCSS1) property).color));
- }
-
- /**
- * Returns the name of this property
- */
- public String getPropertyName() {
- return "background-color";
+ return (property instanceof CssBackgroundColorCSS1 &&
+ color.equals(((CssBackgroundColorCSS1) property).color));
}
/**
@@ -174,7 +167,7 @@
* It is used by all macro for the function <code>print</code>
*/
public boolean isDefault() {
- return color == transparent;
+ return color == transparent;
}
}
Index: CssPositionTV.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssPositionTV.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssPositionTV.java 14 Sep 2005 15:14:31 -0000 1.2
+++ CssPositionTV.java 5 Jan 2010 13:49:45 -0000 1.3
@@ -9,6 +9,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
--- CssBackgroundImage.java DELETED ---
Index: CssFontSizeAdjust.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssFontSizeAdjust.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssFontSizeAdjust.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssFontSizeAdjust.java 5 Jan 2010 13:49:43 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorderTop.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderTop.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorderTop.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssBorderTop.java 5 Jan 2010 13:49:41 -0000 1.4
@@ -9,6 +9,7 @@
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;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorderLeftColor.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderLeftColor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorderLeftColor.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssBorderLeftColor.java 5 Jan 2010 13:49:41 -0000 1.4
@@ -8,6 +8,7 @@
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;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssPaddingLeft.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssPaddingLeft.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssPaddingLeft.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssPaddingLeft.java 5 Jan 2010 13:49:45 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssFontCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssFontCSS1.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssFontCSS1.java 14 Sep 2005 15:14:31 -0000 1.4
+++ CssFontCSS1.java 5 Jan 2010 13:49:43 -0000 1.5
@@ -9,6 +9,7 @@
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;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
--- CssBackgroundRepeat.java DELETED ---
Index: CssCounterIncrement.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssCounterIncrement.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssCounterIncrement.java 14 Sep 2005 15:14:31 -0000 1.2
+++ CssCounterIncrement.java 5 Jan 2010 13:49:42 -0000 1.3
@@ -11,6 +11,7 @@
import java.util.Vector;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
--- CssZIndex.java DELETED ---
Index: CssDirectionATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssDirectionATSC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssDirectionATSC.java 14 Sep 2005 15:14:31 -0000 1.2
+++ CssDirectionATSC.java 5 Jan 2010 13:49:42 -0000 1.3
@@ -9,6 +9,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorderLeftWidthCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderLeftWidthCSS2.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorderLeftWidthCSS2.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssBorderLeftWidthCSS2.java 5 Jan 2010 13:49:41 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssContentCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssContentCSS2.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssContentCSS2.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssContentCSS2.java 5 Jan 2010 13:49:42 -0000 1.4
@@ -11,6 +11,7 @@
import java.util.Vector;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorderColorCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderColorCSS1.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssBorderColorCSS1.java 19 Apr 2006 11:28:05 -0000 1.4
+++ CssBorderColorCSS1.java 5 Jan 2010 13:49:40 -0000 1.5
@@ -10,6 +10,7 @@
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;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorderLeftStyleCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderLeftStyleCSS1.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorderLeftStyleCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssBorderLeftStyleCSS1.java 5 Jan 2010 13:49:41 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorderBottomCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderBottomCSS2.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssBorderBottomCSS2.java 14 Sep 2005 15:14:31 -0000 1.4
+++ CssBorderBottomCSS2.java 5 Jan 2010 13:49:40 -0000 1.5
@@ -9,6 +9,7 @@
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;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorderWidthCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderWidthCSS1.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssBorderWidthCSS1.java 19 Apr 2006 11:28:05 -0000 1.4
+++ CssBorderWidthCSS1.java 5 Jan 2010 13:49:42 -0000 1.5
@@ -9,6 +9,7 @@
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;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssWidth.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssWidth.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssWidth.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssWidth.java 5 Jan 2010 13:49:46 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssListStyle.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssListStyle.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssListStyle.java 27 Feb 2007 22:36:23 -0000 1.4
+++ CssListStyle.java 5 Jan 2010 13:49:44 -0000 1.5
@@ -9,6 +9,7 @@
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;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssFontSizeCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssFontSizeCSS1.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssFontSizeCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssFontSizeCSS1.java 5 Jan 2010 13:49:43 -0000 1.4
@@ -8,6 +8,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssDisplayCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssDisplayCSS1.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssDisplayCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssDisplayCSS1.java 5 Jan 2010 13:49:43 -0000 1.4
@@ -6,185 +6,131 @@
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.css1;
-import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssDisplay;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
import org.w3c.css.values.CssIdent;
+import org.w3c.css.values.CssTypes;
import org.w3c.css.values.CssValue;
+import java.util.HashMap;
+
/**
- * <H4>
- * 'display'
- * </H4>
- * <P>
- * <EM>Value:</EM> block | inline | list-item | none<BR>
- * <EM>Initial:</EM> block<BR>
- * <EM>Applies to:</EM> all elements<BR>
- * <EM>Inherited:</EM> no<BR>
- * <EM>Percentage values:</EM> N/A<BR>
- * <P>
- * This property describes how/if an element is displayed on the canvas (which
- * may be on a printed page, a computer display etc.).
- * <P> An element with a 'display' value of 'block' opens a new box. The box
- * is positioned relative to adjacent boxes according to the CSS <A
- * HREF="#formatting-model">formatting model</A>. Typically, elements like
- * 'H1' and 'P' are of type 'block'. A value of 'list-item' is similar to
- * 'block' except that a list-item marker is added. In HTML, 'LI' will
- * typically have this value.
- * <P>
- * An element with a 'display' value of 'inline' results in a new inline box
- * on the same line as the previous content. The box is dimensioned according
- * to the formatted size of the content. If the content is text, it may span
- * several lines, and there will be a box on each line. The margin, border and
- * padding properties apply to 'inline' elements, but will not have any effect
- * at the line breaks.
- * <P>
- * A value of 'none' turns off the display of the element, including children
- * elements and the surrounding box.
- * <PRE>
- * P { display: block }
- * EM { display: inline }
- * LI { display: list-item }
- * IMG { display: none }
+ * http://www.w3.org/TR/2008/REC-CSS1-20080411/#display
+ * <p/>
+ * <H4>
+ * 'display'
+ * </H4>
+ * <p/>
+ * <EM>Value:</EM> block | inline | list-item | none<BR>
+ * <EM>Initial:</EM> block<BR>
+ * <EM>Applies to:</EM> all elements<BR>
+ * <EM>Inherited:</EM> no<BR>
+ * <EM>Percentage values:</EM> N/A<BR>
+ * <p/>
+ * This property describes how/if an element is displayed on the canvas (which
+ * may be on a printed page, a computer display etc.).
+ * <P> An element with a 'display' value of 'block' opens a new box. The box
+ * is positioned relative to adjacent boxes according to the CSS <A
+ * HREF="#formatting-model">formatting model</A>. Typically, elements like
+ * 'H1' and 'P' are of type 'block'. A value of 'list-item' is similar to
+ * 'block' except that a list-item marker is added. In HTML, 'LI' will
+ * typically have this value.
+ * <p/>
+ * An element with a 'display' value of 'inline' results in a new inline box
+ * on the same line as the previous content. The box is dimensioned according
+ * to the formatted size of the content. If the content is text, it may span
+ * several lines, and there will be a box on each line. The margin, border and
+ * padding properties apply to 'inline' elements, but will not have any effect
+ * at the line breaks.
+ * <p/>
+ * A value of 'none' turns off the display of the element, including children
+ * elements and the surrounding box.
+ * <PRE>
+ * P { display: block }
+ * EM { display: inline }
+ * LI { display: list-item }
+ * IMG { display: none }
* </PRE>
- * <P>
- * The last rule turns off the display of images.
- * <P> The initial value of 'display' is 'block', but a UA will typically have
- * default values for all HTML elements according to the suggested rendering
- * of elements in the HTML specification.
+ * <p/>
+ * The last rule turns off the display of images.
+ * <P> The initial value of 'display' is 'block', but a UA will typically have
+ * default values for all HTML elements according to the suggested rendering
+ * of elements in the HTML specification.
*
* @version $Revision$
*/
-public class CssDisplayCSS1 extends CssProperty {
-
- int value;
+public class CssDisplayCSS1 extends CssDisplay {
- private static String[] DISPLAY = {
- "inline", "block", "list-item", "none", };
+ CssIdent value;
+ public static CssIdent block;
+ public static HashMap<String, CssIdent> allowed_values;
- private static int[] hash_values;
+ static {
+ allowed_values = new HashMap<String, CssIdent>();
+ String[] DISPLAY = {
+ "block", "inline", "list-item", "none"};
+ for (String aDISPLAY : DISPLAY) {
+ allowed_values.put(aDISPLAY, CssIdent.getIdent(aDISPLAY));
+ }
+ block = CssIdent.getIdent("block");
+ }
/**
- * Create a new CssDisplayCSS1
+ * Create a new CssDisplay
*/
public CssDisplayCSS1() {
- // nothing to do
+ // nothing to do
}
/**
- * Create a new CssDisplayCSS1
+ * Create a new CssDisplay
*
+ * @param ac The context
* @param expression The expression for this property
- * @exception InvalidParamException Values are incorect
+ * @param check boolean, if check has to be enforced
+ * @throws InvalidParamException Values are incorect
*/
public CssDisplayCSS1(ApplContext ac, CssExpression expression,
- boolean check) throws InvalidParamException {
-
- if(check && expression.getCount() > 1) {
- throw new InvalidParamException("unrecognize", ac);
- }
-
- CssValue val = expression.getValue();
-
- setByUser();
-
- if ( val instanceof CssIdent) {
- int hash = val.hashCode();
- for (int i = 0; i < DISPLAY.length; i++) {
- if (hash_values[i] == hash) {
- value = i;
- expression.next();
- return;
- }
- }
- }
+ boolean check) throws InvalidParamException {
- throw new InvalidParamException("value", expression.getValue(),
- getPropertyName(), ac);
- }
+ if (check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
- public CssDisplayCSS1(ApplContext ac, CssExpression expression)
- throws InvalidParamException {
- this(ac, expression, false);
- }
+ CssValue val = expression.getValue();
- /**
- * Returns the value of this property
- */
- public Object get() {
- return DISPLAY[value];
- }
+ setByUser();
- /**
- * Returns the name of this property
- */
- public String getPropertyName() {
- return "display";
- }
+ if (val.getType() == CssTypes.CSS_IDENT) {
+ CssIdent id_val = (CssIdent) val;
+ String id_value = id_val.toString();
- /**
- * Returns true if this property is "softly" inherited
- * e.g. his value equals inherit
- */
- public boolean isSoftlyInherited() {
- return value == DISPLAY.length - 1;
- }
+ value = allowed_values.get(id_value);
+ if (value != null) {
+ expression.next();
+ return;
+ }
+ }
- /**
- * Returns a string representation of the object.
- */
- public String toString() {
- return DISPLAY[value];
- }
+ throw new InvalidParamException("value", expression.getValue(),
+ getPropertyName(), ac);
- /**
- * Add this property to the CssStyle.
- *
- * @param style The CssStyle
- */
- public void addToStyle(ApplContext ac, CssStyle style) {
- Css1Style style0 = (Css1Style) style;
- if (style0.cssDisplayCSS1 != null)
- style0.addRedefinitionWarning(ac, this);
- style0.cssDisplayCSS1 = this;
}
- /**
- * Get this property in the style.
- *
- * @param style The style where the property is
- * @param resolve if true, resolve the style to find this property
- */
- public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
- if (resolve) {
- return ((Css1Style) style).getDisplayCSS1();
- } else {
- return ((Css1Style) style).cssDisplayCSS1;
- }
+ public CssDisplayCSS1(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
}
- /**
- * Compares two properties for equality.
- *
- * @param value The other property.
- */
- public boolean equals(CssProperty property) {
- return (property instanceof CssDisplayCSS1 &&
- value == ((CssDisplay) property).value);
- }
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
*/
public boolean isDefault() {
- return value == 0;
+ return (value == block);
}
- static {
- hash_values = new int[DISPLAY.length];
- for (int i = 0; i < DISPLAY.length; i++)
- hash_values[i] = DISPLAY[i].hashCode();
- }
}
Index: CssCounterReset.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssCounterReset.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssCounterReset.java 14 Sep 2005 15:14:31 -0000 1.2
+++ CssCounterReset.java 5 Jan 2010 13:49:42 -0000 1.3
@@ -11,6 +11,7 @@
import java.util.Vector;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssMarginSide.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssMarginSide.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssMarginSide.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssMarginSide.java 5 Jan 2010 13:49:44 -0000 1.4
@@ -6,6 +6,7 @@
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.css1;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssVerticalAlignMob.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssVerticalAlignMob.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssVerticalAlignMob.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssVerticalAlignMob.java 5 Jan 2010 13:49:46 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorderLeftCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderLeftCSS2.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssBorderLeftCSS2.java 14 Sep 2005 15:14:31 -0000 1.4
+++ CssBorderLeftCSS2.java 5 Jan 2010 13:49:41 -0000 1.5
@@ -9,6 +9,7 @@
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;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorderRightCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderRightCSS1.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorderRightCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssBorderRightCSS1.java 5 Jan 2010 13:49:41 -0000 1.4
@@ -9,6 +9,7 @@
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;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssMaxHeightATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssMaxHeightATSC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssMaxHeightATSC.java 14 Sep 2005 15:14:31 -0000 1.2
+++ CssMaxHeightATSC.java 5 Jan 2010 13:49:44 -0000 1.3
@@ -9,6 +9,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssFontStretchCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssFontStretchCSS1.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssFontStretchCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssFontStretchCSS1.java 5 Jan 2010 13:49:43 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorderBottomCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderBottomCSS1.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorderBottomCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssBorderBottomCSS1.java 5 Jan 2010 13:49:40 -0000 1.4
@@ -9,6 +9,7 @@
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;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssTextTransform.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssTextTransform.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssTextTransform.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssTextTransform.java 5 Jan 2010 13:49:45 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssFontFamilyCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssFontFamilyCSS2.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssFontFamilyCSS2.java 13 Dec 2006 07:09:09 -0000 1.4
+++ CssFontFamilyCSS2.java 5 Jan 2010 13:49:43 -0000 1.5
@@ -11,6 +11,7 @@
import java.util.Vector;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.Util;
Index: CssBorderCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderCSS1.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorderCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssBorderCSS1.java 5 Jan 2010 13:49:40 -0000 1.4
@@ -9,6 +9,7 @@
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;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorderBottomStyleCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderBottomStyleCSS2.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorderBottomStyleCSS2.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssBorderBottomStyleCSS2.java 5 Jan 2010 13:49:40 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssFontStyleCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssFontStyleCSS2.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssFontStyleCSS2.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssFontStyleCSS2.java 5 Jan 2010 13:49:43 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
--- CssBackground.java DELETED ---
Index: CssFloat.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssFloat.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssFloat.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssFloat.java 5 Jan 2010 13:49:43 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBackgroundPositionMob.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBackgroundPositionMob.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBackgroundPositionMob.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssBackgroundPositionMob.java 5 Jan 2010 13:49:40 -0000 1.4
@@ -7,6 +7,8 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssBackgroundConstants;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
@@ -91,7 +93,7 @@
* In the example above, the image is placed in the lower right corner of the
* canvas.
* @version $Revision$
- * @see CssBackgroundAttachment
+ * @see org.w3c.css.properties.css.CssBackgroundAttachment
*/
public class CssBackgroundPositionMob extends CssProperty
implements CssBackgroundConstants, CssOperator {
Index: CssListStyleTypeCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssListStyleTypeCSS2.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssListStyleTypeCSS2.java 14 Sep 2005 15:14:31 -0000 1.4
+++ CssListStyleTypeCSS2.java 5 Jan 2010 13:49:44 -0000 1.5
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorderRightColorCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderRightColorCSS2.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssBorderRightColorCSS2.java 14 Sep 2005 15:14:31 -0000 1.4
+++ CssBorderRightColorCSS2.java 5 Jan 2010 13:49:41 -0000 1.5
@@ -8,6 +8,7 @@
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;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssListStylePositionCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssListStylePositionCSS2.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssListStylePositionCSS2.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssListStylePositionCSS2.java 5 Jan 2010 13:49:44 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBackgroundAttachmentCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBackgroundAttachmentCSS1.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssBackgroundAttachmentCSS1.java 11 Feb 2009 22:43:15 -0000 1.4
+++ CssBackgroundAttachmentCSS1.java 5 Jan 2010 13:49:39 -0000 1.5
@@ -7,6 +7,8 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssBackgroundAttachment;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
@@ -14,84 +16,89 @@
import org.w3c.css.values.CssTypes;
import org.w3c.css.values.CssValue;
+import java.util.HashMap;
+
/**
- * <H4>
- * 'background-attachment'
- * </H4>
- * <P>
- * <EM>Value:</EM> scroll | fixed<BR>
- * <EM>Initial:</EM> scroll<BR>
- * <EM>Applies to:</EM> all elements<BR>
- * <EM>Inherited:</EM> no<BR>
- * <EM>Percentage values:</EM> N/A<BR>
- * <P>
- * If a background image is specified, the value of 'background-attachment'
- * determines if it is fixed with regard to the canvas or if it scrolls along
- * with the content.
- * <PRE>
- * BODY {
- * background: red url(pendant.gif);
- * background-repeat: repeat-y;
- * background-attachment: fixed;
- * }
+ * <H4>
+ * 'background-attachment'
+ * </H4>
+ * <p/>
+ * <EM>Value:</EM> scroll | fixed<BR>
+ * <EM>Initial:</EM> scroll<BR>
+ * <EM>Applies to:</EM> all elements<BR>
+ * <EM>Inherited:</EM> no<BR>
+ * <EM>Percentage values:</EM> N/A<BR>
+ * <p/>
+ * If a background image is specified, the value of 'background-attachment'
+ * determines if it is fixed with regard to the canvas or if it scrolls along
+ * with the content.
+ * <PRE>
+ * BODY {
+ * background: red url(pendant.gif);
+ * background-repeat: repeat-y;
+ * background-attachment: fixed;
+ * }
* </PRE>
+ *
* @version $Revision$
*/
-public class CssBackgroundAttachmentCSS1 extends CssProperty
- implements CssBackgroundConstants {
+public class CssBackgroundAttachmentCSS1 extends CssBackgroundAttachment {
- int attachment;
+ static {
+ allowed_values = new HashMap<String, CssIdent>();
+ scroll = CssIdent.getIdent("scroll");
+ allowed_values.put("scroll", scroll);
+ allowed_values.put("fixed", CssIdent.getIdent("fixed"));
+ }
- private static int[] hash_values;
+ CssIdent value;
/**
* Create a new CssBackgroundAttachmentCSS1
*/
public CssBackgroundAttachmentCSS1() {
- // nothing to do
+ value = scroll;
}
/**
* Creates a new CssBackgroundAttachmentCSS1
*
* @param expression The expression for this property
- * @exception InvalidParamException Values are incorrect
+ * @throws InvalidParamException Values are incorrect
*/
public CssBackgroundAttachmentCSS1(ApplContext ac, CssExpression expression,
- boolean check) throws InvalidParamException {
-
- if(check && expression.getCount() > 1) {
- throw new InvalidParamException("unrecognize", ac);
- }
+ boolean check) throws InvalidParamException {
- setByUser();
+ if (check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
- CssValue val = expression.getValue();
+ setByUser();
- if (val.getType() == CssTypes.CSS_IDENT) {
- int hash = val.hashCode();
- for (int i =0; i < ATTACHMENT.length; i++)
- if (hash_values[i] == hash) {
- attachment = i;
- expression.next();
- return;
- }
- }
+ CssValue val = expression.getValue();
- throw new InvalidParamException("value", expression.getValue(),
- getPropertyName(), ac);
+ if (val.getType() == CssTypes.CSS_IDENT) {
+ CssIdent new_val = allowed_values.get(val.toString());
+ if (new_val != null) {
+ value = new_val;
+ expression.next();
+ return;
+ }
+ }
+ throw new InvalidParamException("value", expression.getValue(),
+ getPropertyName(), ac);
}
public CssBackgroundAttachmentCSS1(ApplContext ac, CssExpression expression)
- throws InvalidParamException {
- this(ac, expression, false);
+ throws InvalidParamException {
+ this(ac, expression, false);
}
/**
* Returns the value of this property
*/
public Object get() {
- return ATTACHMENT[attachment];
+ return value;
}
/**
@@ -99,21 +106,14 @@
* e.g. his value equals inherit
*/
public boolean isSoftlyInherited() {
- return attachment == 2;
+ return false;
}
/**
* Returns a string representation of the object.
*/
public String toString() {
- return ATTACHMENT[attachment];
- }
-
- /**
- * Returns the name of this property
- */
- public String getPropertyName() {
- return "background-attachment";
+ return value.toString();
}
/**
@@ -122,34 +122,34 @@
* @param style The CssStyle
*/
public void addToStyle(ApplContext ac, CssStyle style) {
- CssBackgroundCSS1 cssBackground = ((Css1Style) style).cssBackgroundCSS1;
- if (cssBackground.attachment != null)
- style.addRedefinitionWarning(ac, this);
- cssBackground.attachment = this;
+ CssBackgroundCSS1 cssBackground = ((Css1Style) style).cssBackgroundCSS1;
+ if (cssBackground.attachment != null)
+ style.addRedefinitionWarning(ac, this);
+ cssBackground.attachment = this;
}
/**
* Get this property in the style.
*
- * @param style The style where the property is
+ * @param style The style where the property is
* @param resolve if true, resolve the style to find this property
*/
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
- if (resolve) {
- return ((Css1Style) style).getBackgroundAttachmentCSS1();
- } else {
- return ((Css1Style) style).cssBackgroundCSS1.attachment;
- }
+ if (resolve) {
+ return ((Css1Style) style).getBackgroundAttachmentCSS1();
+ } else {
+ return ((Css1Style) style).cssBackgroundCSS1.attachment;
+ }
}
/**
* Compares two properties for equality.
*
- * @param value The other property.
+ * @param property The other property.
*/
public boolean equals(CssProperty property) {
- return (property instanceof CssBackgroundAttachmentCSS1 &&
- attachment == ((CssBackgroundAttachmentCSS1) property).attachment);
+ return (property instanceof CssBackgroundAttachmentCSS1 &&
+ value == ((CssBackgroundAttachmentCSS1) property).value);
}
/**
@@ -157,12 +157,6 @@
* It is used by all macro for the function <code>print</code>
*/
public boolean isDefault() {
- return attachment == 0;
- }
-
- static {
- hash_values = new int[ATTACHMENT.length];
- for (int i = 0; i < ATTACHMENT.length; i++)
- hash_values[i] = ATTACHMENT[i].hashCode();
+ return (scroll == value);
}
}
Index: CssVerticalAlignCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssVerticalAlignCSS1.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssVerticalAlignCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssVerticalAlignCSS1.java 5 Jan 2010 13:49:45 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
--- CssBackgroundImageCSS2.java DELETED ---
Index: CssQuotes.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssQuotes.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssQuotes.java 14 Sep 2005 15:14:31 -0000 1.2
+++ CssQuotes.java 5 Jan 2010 13:49:45 -0000 1.3
@@ -11,6 +11,7 @@
import java.util.Vector;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorderTopWidthCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderTopWidthCSS2.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorderTopWidthCSS2.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssBorderTopWidthCSS2.java 5 Jan 2010 13:49:42 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssFontStyle.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssFontStyle.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssFontStyle.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssFontStyle.java 5 Jan 2010 13:49:43 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorderWidthCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderWidthCSS2.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssBorderWidthCSS2.java 19 Apr 2006 11:28:05 -0000 1.4
+++ CssBorderWidthCSS2.java 5 Jan 2010 13:49:42 -0000 1.5
@@ -9,6 +9,7 @@
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;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorderRight.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderRight.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorderRight.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssBorderRight.java 5 Jan 2010 13:49:41 -0000 1.4
@@ -9,6 +9,7 @@
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;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssMinWidth.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssMinWidth.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssMinWidth.java 14 Sep 2005 15:14:31 -0000 1.2
+++ CssMinWidth.java 5 Jan 2010 13:49:44 -0000 1.3
@@ -9,6 +9,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorderRightCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderRightCSS2.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssBorderRightCSS2.java 14 Sep 2005 15:14:31 -0000 1.4
+++ CssBorderRightCSS2.java 5 Jan 2010 13:49:41 -0000 1.5
@@ -9,6 +9,7 @@
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;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorderTopColorCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderTopColorCSS1.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorderTopColorCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssBorderTopColorCSS1.java 5 Jan 2010 13:49:41 -0000 1.4
@@ -8,6 +8,7 @@
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;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssMargin.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssMargin.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssMargin.java 19 Apr 2006 11:28:05 -0000 1.4
+++ CssMargin.java 5 Jan 2010 13:49:44 -0000 1.5
@@ -9,6 +9,7 @@
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;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssFontSizeAdjustCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssFontSizeAdjustCSS2.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssFontSizeAdjustCSS2.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssFontSizeAdjustCSS2.java 5 Jan 2010 13:49:43 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBackgroundImageMob.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBackgroundImageMob.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBackgroundImageMob.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssBackgroundImageMob.java 5 Jan 2010 13:49:39 -0000 1.4
@@ -8,6 +8,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssFontCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssFontCSS2.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssFontCSS2.java 14 Sep 2005 15:14:31 -0000 1.4
+++ CssFontCSS2.java 5 Jan 2010 13:49:43 -0000 1.5
@@ -9,6 +9,7 @@
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;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorderRightStyleCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderRightStyleCSS2.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorderRightStyleCSS2.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssBorderRightStyleCSS2.java 5 Jan 2010 13:49:41 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssTop.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssTop.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssTop.java 14 Sep 2005 15:14:31 -0000 1.2
+++ CssTop.java 5 Jan 2010 13:49:45 -0000 1.3
@@ -9,6 +9,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorderRightWidth.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderRightWidth.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorderRightWidth.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssBorderRightWidth.java 5 Jan 2010 13:49:41 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorderWidth.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderWidth.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorderWidth.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssBorderWidth.java 5 Jan 2010 13:49:42 -0000 1.4
@@ -9,6 +9,7 @@
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;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssFontSizeCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssFontSizeCSS2.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssFontSizeCSS2.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssFontSizeCSS2.java 5 Jan 2010 13:49:43 -0000 1.4
@@ -8,6 +8,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssTextAlignMob.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssTextAlignMob.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssTextAlignMob.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssTextAlignMob.java 5 Jan 2010 13:49:45 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
--- CssDisplayCSS2.java DELETED ---
--- CssBackgroundPositionCSS2.java DELETED ---
Index: CssClip.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssClip.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssClip.java 14 Sep 2005 15:14:31 -0000 1.2
+++ CssClip.java 5 Jan 2010 13:49:42 -0000 1.3
@@ -9,6 +9,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssMarginBottom.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssMarginBottom.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssMarginBottom.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssMarginBottom.java 5 Jan 2010 13:49:44 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorderBottomWidth.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderBottomWidth.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorderBottomWidth.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssBorderBottomWidth.java 5 Jan 2010 13:49:40 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBoxOffsetFace.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBoxOffsetFace.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBoxOffsetFace.java 14 Sep 2005 15:14:31 -0000 1.2
+++ CssBoxOffsetFace.java 5 Jan 2010 13:49:42 -0000 1.3
@@ -8,6 +8,7 @@
*/
package org.w3c.css.properties.css1;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorderStyleCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderStyleCSS2.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- CssBorderStyleCSS2.java 17 Dec 2009 16:39:45 -0000 1.5
+++ CssBorderStyleCSS2.java 5 Jan 2010 13:49:41 -0000 1.6
@@ -12,6 +12,7 @@
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;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorderTopWidthCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderTopWidthCSS1.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorderTopWidthCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssBorderTopWidthCSS1.java 5 Jan 2010 13:49:42 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssFont.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssFont.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssFont.java 14 Sep 2005 15:14:31 -0000 1.4
+++ CssFont.java 5 Jan 2010 13:49:43 -0000 1.5
@@ -9,6 +9,7 @@
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;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssRight.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssRight.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssRight.java 14 Sep 2005 15:14:31 -0000 1.2
+++ CssRight.java 5 Jan 2010 13:49:45 -0000 1.3
@@ -9,6 +9,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorderLeft.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderLeft.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorderLeft.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssBorderLeft.java 5 Jan 2010 13:49:41 -0000 1.4
@@ -9,6 +9,7 @@
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;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
--- CssProperties.java DELETED ---
Index: CssLetterSpacing.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssLetterSpacing.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssLetterSpacing.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssLetterSpacing.java 5 Jan 2010 13:49:43 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssListStylePosition.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssListStylePosition.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssListStylePosition.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssListStylePosition.java 5 Jan 2010 13:49:44 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssFontStretchCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssFontStretchCSS2.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssFontStretchCSS2.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssFontStretchCSS2.java 5 Jan 2010 13:49:43 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssVisibility.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssVisibility.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssVisibility.java 14 Sep 2005 15:14:31 -0000 1.2
+++ CssVisibility.java 5 Jan 2010 13:49:46 -0000 1.3
@@ -9,6 +9,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorderRightStyleCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderRightStyleCSS1.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorderRightStyleCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssBorderRightStyleCSS1.java 5 Jan 2010 13:49:41 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBackgroundAttachmentMob.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBackgroundAttachmentMob.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBackgroundAttachmentMob.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssBackgroundAttachmentMob.java 5 Jan 2010 13:49:39 -0000 1.4
@@ -7,6 +7,8 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssBackgroundConstants;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBottom.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBottom.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBottom.java 14 Sep 2005 15:14:31 -0000 1.2
+++ CssBottom.java 5 Jan 2010 13:49:42 -0000 1.3
@@ -9,6 +9,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssFontVariantCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssFontVariantCSS2.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssFontVariantCSS2.java 14 Sep 2005 15:14:31 -0000 1.4
+++ CssFontVariantCSS2.java 5 Jan 2010 13:49:43 -0000 1.5
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssMarkerOffsetATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssMarkerOffsetATSC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssMarkerOffsetATSC.java 14 Sep 2005 15:14:31 -0000 1.2
+++ CssMarkerOffsetATSC.java 5 Jan 2010 13:49:44 -0000 1.3
@@ -9,6 +9,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorderFaceColor.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderFaceColor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorderFaceColor.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssBorderFaceColor.java 5 Jan 2010 13:49:40 -0000 1.4
@@ -6,6 +6,7 @@
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.css1;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssTextShadowATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssTextShadowATSC.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssTextShadowATSC.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssTextShadowATSC.java 5 Jan 2010 13:49:45 -0000 1.4
@@ -9,6 +9,7 @@
import java.util.Vector;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssFontVariantCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssFontVariantCSS1.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssFontVariantCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssFontVariantCSS1.java 5 Jan 2010 13:49:43 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorderFaceWidthCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderFaceWidthCSS1.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorderFaceWidthCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssBorderFaceWidthCSS1.java 5 Jan 2010 13:49:40 -0000 1.4
@@ -6,6 +6,7 @@
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.css1;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorderBottomColorCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderBottomColorCSS1.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorderBottomColorCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssBorderBottomColorCSS1.java 5 Jan 2010 13:49:40 -0000 1.4
@@ -8,6 +8,7 @@
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;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorderLeftStyle.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderLeftStyle.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorderLeftStyle.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssBorderLeftStyle.java 5 Jan 2010 13:49:41 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssWidthMob.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssWidthMob.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssWidthMob.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssWidthMob.java 5 Jan 2010 13:49:46 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
--- CssBackgroundCSS2.java DELETED ---
Index: CssFontFamily.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssFontFamily.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssFontFamily.java 13 Dec 2006 07:09:09 -0000 1.4
+++ CssFontFamily.java 5 Jan 2010 13:49:43 -0000 1.5
@@ -11,6 +11,7 @@
import java.util.Vector;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.Util;
Index: CssBackgroundImageCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBackgroundImageCSS1.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssBackgroundImageCSS1.java 11 Feb 2009 21:41:10 -0000 1.4
+++ CssBackgroundImageCSS1.java 5 Jan 2010 13:49:39 -0000 1.5
@@ -8,121 +8,89 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssBackgroundImage;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssIdent;
import org.w3c.css.values.CssTypes;
-import org.w3c.css.values.CssURL;
import org.w3c.css.values.CssValue;
/**
- * <H4>
- * 'background-image'
- * </H4>
- * <P>
- * <EM>Value:</EM> <url> | none<BR>
- * <EM>Initial:</EM> none<BR>
- * <EM>Applies to:</EM> all elements<BR>
- * <EM>Inherited:</EM> no<BR>
- * <EM>Percentage values:</EM> N/A<BR>
- * <P> This property sets the background image of an element. When setting a
- * background image, one should also set a background color that will be used
- * when the image is unavailable. When the image is available, it is overlaid
- * on top of the background color.
- * <PRE>
- * BODY { background-image: url(marble.gif) }
- * P { background-image: none }
- * </PRE>
- * @version $Revision$ */
-public class CssBackgroundImageCSS1 extends CssProperty {
+ * <H4>
+ * 'background-image'
+ * </H4>
+ * <p/>
+ * <EM>Value:</EM> <url> | none<BR>
+ * <EM>Initial:</EM> none<BR>
+ * <EM>Applies to:</EM> all elements<BR>
+ * <EM>Inherited:</EM> no<BR>
+ * <EM>Percentage values:</EM> N/A<BR>
+ * <P> This property sets the background image of an element. When setting a
+ * background image, one should also set a background color that will be used
+ * when the image is unavailable. When the image is available, it is overlaid
+ * on top of the background color.
+ * <PRE>
+ * BODY { background-image: url(marble.gif) }
+ * P { background-image: none }
+ * </PRE>
+ *
+ * @version $Revision$
+ */
+public class CssBackgroundImageCSS1 extends CssBackgroundImage {
CssValue url = null;
- boolean inherited = false;
-
- private static CssIdent none = new CssIdent("none");
/**
* Create a new CssBackgroundImageCSS1
*/
public CssBackgroundImageCSS1() {
- url = none;
+ url = none;
}
/**
* Creates a new CssBackgroundImageCSS1
*
* @param expression The expression for this property
- * @exception InvalidParamException Values are incorrect
+ * @throws InvalidParamException Values are incorrect
*/
public CssBackgroundImageCSS1(ApplContext ac, CssExpression expression,
- boolean check) throws InvalidParamException {
+ boolean check) throws InvalidParamException {
- if(check && expression.getCount() > 1) {
- throw new InvalidParamException("unrecognize", ac);
- }
+ if (check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
- setByUser();
+ setByUser();
- CssValue val = expression.getValue();
+ CssValue val = expression.getValue();
- switch(val.getType()) {
- case CssTypes.CSS_URL:
- url = val;
- break;
- case CssTypes.CSS_IDENT:
- if (inherit.equals(val)) {
- inherited = true;
- break;
- } else if (none.equals(val)) {
- url = none;
- break;
- }
- default:
- throw new InvalidParamException("value", val,
- getPropertyName(), ac);
- }
- expression.next();
+ switch (val.getType()) {
+ case CssTypes.CSS_URL:
+ url = val;
+ break;
+ case CssTypes.CSS_IDENT:
+ if (none.equals(val)) {
+ url = none;
+ break;
+ }
+ default:
+ throw new InvalidParamException("value", val,
+ getPropertyName(), ac);
+ }
+ expression.next();
}
public CssBackgroundImageCSS1(ApplContext ac, CssExpression expression)
- throws InvalidParamException {
- this(ac, expression, false);
- }
-
- /**
- * Returns the value of this property
- */
- public Object get() {
- return url;
- }
-
- /**
- * Returns true if this property is "softly" inherited
- * e.g. his value equals inherit
- */
- public boolean isSoftlyInherited() {
- return inherited;
+ throws InvalidParamException {
+ this(ac, expression, false);
}
/**
* Returns a string representation of the object.
*/
public String toString() {
- if (inherited) {
- return inherit.toString();
- }
- if (url != null) {
- return url.toString();
- }
- return "";
- }
-
- /**
- * Returns the name of this property
- */
- public String getPropertyName() {
- return "background-image";
+ return url.toString();
}
/**
@@ -131,44 +99,36 @@
* @param style The CssStyle
*/
public void addToStyle(ApplContext ac, CssStyle style) {
- CssBackgroundCSS1 cssBackground = ((Css1Style) style).cssBackgroundCSS1;
- if (cssBackground.image != null)
- style.addRedefinitionWarning(ac, this);
- cssBackground.image = this;
+ CssBackgroundCSS1 cssBackground = ((Css1Style) style).cssBackgroundCSS1;
+ if (cssBackground.image != null) {
+ style.addRedefinitionWarning(ac, this);
+ }
+ cssBackground.image = this;
}
/**
* Get this property in the style.
*
- * @param style The style where the property is
+ * @param style The style where the property is
* @param resolve if true, resolve the style to find this property
*/
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
- if (resolve) {
- return ((Css1Style) style).getBackgroundImageCSS1();
- } else {
- return ((Css1Style) style).cssBackgroundCSS1.image;
- }
+ if (resolve) {
+ return ((Css1Style) style).getBackgroundImageCSS1();
+ } else {
+ return ((Css1Style) style).cssBackgroundCSS1.image;
+ }
}
/**
* Compares two properties for equality.
*
- * @param value The other property.
+ * @param property The other property.
*/
public boolean equals(CssProperty property) {
- return ((url == null && property == null) ||
- (property instanceof CssBackgroundImageCSS1 &&
- url != null &&
- url.equals(((CssBackgroundImageCSS1) property).url)));
- }
-
- /**
- * Is the value of this property is a default value.
- * It is used by all macro for the function <code>print</code>
- */
- public boolean isDefault() {
- return url == none;
+ return ((url == null && property == null) ||
+ (property instanceof CssBackgroundImageCSS1 &&
+ url != null &&
+ url.equals(((CssBackgroundImageCSS1) property).url)));
}
-
}
Index: CssTextShadow.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssTextShadow.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssTextShadow.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssTextShadow.java 5 Jan 2010 13:49:45 -0000 1.4
@@ -9,6 +9,7 @@
import java.util.Vector;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorder.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorder.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssBorder.java 5 Jan 2010 13:49:40 -0000 1.4
@@ -9,6 +9,7 @@
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;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBackgroundTV.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBackgroundTV.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBackgroundTV.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssBackgroundTV.java 5 Jan 2010 13:49:40 -0000 1.4
@@ -9,6 +9,12 @@
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;
+import org.w3c.css.properties.css.CssProperty;
+import org.w3c.css.properties.css2.CssBackgroundColorCSS2;
+import org.w3c.css.properties.css2.CssBackgroundImageCSS2;
+import org.w3c.css.properties.css2.CssBackgroundPositionCSS2;
+import org.w3c.css.properties.css2.CssBackgroundRepeatCSS2;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
@@ -46,10 +52,10 @@
* have been specified.
*
* @version $Revision$
- * @see CssBackgroundColor
- * @see CssBackgroundImage
- * @see CssBackgroundRepeat
- * @see CssBackgroundPosition
+ * @see org.w3c.css.properties.css.CssBackgroundColor
+ * @see org.w3c.css.properties.css.CssBackgroundImage
+ * @see org.w3c.css.properties.css.CssBackgroundRepeat
+ * @see org.w3c.css.properties.css.CssBackgroundPosition
*/
public class CssBackgroundTV extends CssProperty
implements CssOperator, CssBackgroundConstants {
@@ -95,10 +101,9 @@
image = new CssBackgroundImageCSS2();
image.url = inherit;
repeat = new CssBackgroundRepeatCSS2();
- repeat.repeat = REPEAT.length - 1;
+// repeat.repeat = REPEAT.length - 1;
position = new CssBackgroundPositionCSS2();
- position.first = inherit;
- position.second = inherit;
+ position.value = inherit;
same = true;
expression.next();
return;
@@ -340,7 +345,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: CssBorderBottomColor.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderBottomColor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorderBottomColor.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssBorderBottomColor.java 5 Jan 2010 13:49:40 -0000 1.4
@@ -8,6 +8,7 @@
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;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorderCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderCSS2.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssBorderCSS2.java 14 Sep 2005 15:14:31 -0000 1.4
+++ CssBorderCSS2.java 5 Jan 2010 13:49:40 -0000 1.5
@@ -9,6 +9,7 @@
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;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorderTopColor.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderTopColor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorderTopColor.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssBorderTopColor.java 5 Jan 2010 13:49:41 -0000 1.4
@@ -8,6 +8,7 @@
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;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssPaddingBottom.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssPaddingBottom.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssPaddingBottom.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssPaddingBottom.java 5 Jan 2010 13:49:45 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorderRightWidthCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderRightWidthCSS1.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorderRightWidthCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssBorderRightWidthCSS1.java 5 Jan 2010 13:49:41 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssListStyleCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssListStyleCSS2.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssListStyleCSS2.java 14 Sep 2005 15:14:31 -0000 1.4
+++ CssListStyleCSS2.java 5 Jan 2010 13:49:44 -0000 1.5
@@ -9,6 +9,7 @@
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;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssMinWidthATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssMinWidthATSC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssMinWidthATSC.java 14 Sep 2005 15:14:31 -0000 1.2
+++ CssMinWidthATSC.java 5 Jan 2010 13:49:44 -0000 1.3
@@ -9,6 +9,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssUnicodeBidi.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssUnicodeBidi.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssUnicodeBidi.java 14 Sep 2005 15:14:31 -0000 1.2
+++ CssUnicodeBidi.java 5 Jan 2010 13:49:45 -0000 1.3
@@ -9,6 +9,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssListStyleTV.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssListStyleTV.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssListStyleTV.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssListStyleTV.java 5 Jan 2010 13:49:44 -0000 1.4
@@ -9,6 +9,7 @@
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;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssListStylePositionCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssListStylePositionCSS1.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssListStylePositionCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssListStylePositionCSS1.java 5 Jan 2010 13:49:44 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssWhiteSpace.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssWhiteSpace.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssWhiteSpace.java 14 Sep 2005 15:14:31 -0000 1.4
+++ CssWhiteSpace.java 5 Jan 2010 13:49:46 -0000 1.5
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssClear.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssClear.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssClear.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssClear.java 5 Jan 2010 13:49:42 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBackgroundCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBackgroundCSS1.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- CssBackgroundCSS1.java 14 Sep 2005 15:14:31 -0000 1.5
+++ CssBackgroundCSS1.java 5 Jan 2010 13:49:39 -0000 1.6
@@ -9,6 +9,9 @@
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;
+import org.w3c.css.properties.css.CssBackgroundConstants;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
@@ -16,43 +19,43 @@
import org.w3c.css.values.CssValue;
/**
- * <H4>
- * <A NAME="background">5.3.7 'background'</A>
- * </H4>
- * <P>
- * <EM>Value:</EM> <background-color> || <background-image> ||
- * <background-repeat> || <background-attachment> ||
- * <background-position><BR>
- * <EM>Initial:</EM> not defined for shorthand properties<BR>
- * <EM>Applies to:</EM> all elements<BR>
- * <EM>Inherited:</EM> no<BR>
- * <EM>Percentage values:</EM> allowed on <background-position><BR>
- * <P>
- * The 'background' property is a shorthand property for setting the individual
- * background properties (i.e., 'background-color', 'background-image',
- * 'background-repeat', 'background-attachment' and 'background-position') at
- * the same place in the style sheet.
- * <P>
- * Possible values on the 'background' properties are the set of all possible
- * values on the individual properties.
- * <PRE>
- * BODY { background: red }
- * P { background: url(chess.png) gray 50% repeat fixed }
+ * <H4>
+ * <A NAME="background">5.3.7 'background'</A>
+ * </H4>
+ * <p/>
+ * <EM>Value:</EM> <background-color> || <background-image> ||
+ * <background-repeat> || <background-attachment> ||
+ * <background-position><BR>
+ * <EM>Initial:</EM> not defined for shorthand properties<BR>
+ * <EM>Applies to:</EM> all elements<BR>
+ * <EM>Inherited:</EM> no<BR>
+ * <EM>Percentage values:</EM> allowed on <background-position><BR>
+ * <p/>
+ * The 'background' property is a shorthand property for setting the individual
+ * background properties (i.e., 'background-color', 'background-image',
+ * 'background-repeat', 'background-attachment' and 'background-position') at
+ * the same place in the style sheet.
+ * <p/>
+ * Possible values on the 'background' properties are the set of all possible
+ * values on the individual properties.
+ * <PRE>
+ * BODY { background: red }
+ * P { background: url(chess.png) gray 50% repeat fixed }
* </PRE>
- * <P> The 'background' property always sets all the individual background
- * properties. In the first rule of the above example, only a value for
- * 'background-color' has been given and the other individual properties are
- * set to their initial value. In the second rule, all individual properties
- * have been specified.
+ * <P> The 'background' property always sets all the individual background
+ * properties. In the first rule of the above example, only a value for
+ * 'background-color' has been given and the other individual properties are
+ * set to their initial value. In the second rule, all individual properties
+ * have been specified.
*
* @version $Revision$
- * @see CssBackgroundColor
- * @see CssBackgroundImage
- * @see CssBackgroundRepeat
- * @see CssBackgroundAttachment
- * @see CssBackgroundPosition
+ * @see org.w3c.css.properties.css.CssBackgroundColor
+ * @see org.w3c.css.properties.css.CssBackgroundImage
+ * @see org.w3c.css.properties.css.CssBackgroundRepeat
+ * @see org.w3c.css.properties.css.CssBackgroundAttachment
+ * @see org.w3c.css.properties.css.CssBackgroundPosition
*/
-public class CssBackgroundCSS1 extends CssProperty
+public class CssBackgroundCSS1 extends CssBackground
implements CssOperator, CssBackgroundConstants {
CssBackgroundColorCSS1 color;
@@ -73,173 +76,162 @@
* Set the value of the property
*
* @param expression The expression for this property
- * @exception InvalidParamException The expression is incorrect
+ * @throws InvalidParamException The expression is incorrect
*/
public CssBackgroundCSS1(ApplContext ac, CssExpression expression,
- boolean check) throws InvalidParamException {
+ boolean check) throws InvalidParamException {
- CssValue val = expression.getValue();
- char op = SPACE;
- boolean find = true;
+ CssValue val;
+ char op;
+ boolean find = true;
- // too many values
- if(check && expression.getCount() > 6) {
- throw new InvalidParamException("unrecognize", ac);
- }
+ // too many values
+ if (check && expression.getCount() > 6) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
- setByUser();
+ setByUser();
- while (find) {
- find = false;
- val = expression.getValue();
- op = expression.getOperator();
+ while (find) {
+ find = false;
+ val = expression.getValue();
+ op = expression.getOperator();
- if (val == null) {
- break;
- }
+ if (val == null) {
+ break;
+ }
- if (color == null) {
- try {
- color = new CssBackgroundColorCSS1(ac, expression);
- find = true;
- } catch (InvalidParamException e) {
- }
- }
- if (!find && image == null) {
- try {
- image = new CssBackgroundImageCSS1(ac, expression);
- find = true;
- } catch (InvalidParamException e) {
- // nothing to do, repeat will test this value
- }
- }
- if (!find && repeat == null) {
- try {
- repeat = new CssBackgroundRepeatCSS1(ac, expression);
- find = true;
- } catch (InvalidParamException e) {
- // nothing to do, attachment will test this value
- }
- }
- if (!find && attachment == null) {
- try {
- attachment = new CssBackgroundAttachmentCSS1(ac, expression);
- find = true;
- } catch (InvalidParamException e) {
- // nothing to do, position will test this value
- }
- }
- if (!find && position == null) {
- try {
- position = new CssBackgroundPositionCSS1(ac, expression);
- find = true;
- } catch (InvalidParamException e) {
- // nothing to do
- }
- }
- if (op != SPACE) {
- throw new InvalidParamException("operator",
- ((new Character(op)).toString()),
- ac);
- }
- if(check && !find && val != null) {
- throw new InvalidParamException("unrecognize", ac);
- }
- }
- /*
- if (color == null)
- color = new CssBackgroundColorCSS1();
- if (image == null)
- image = new CssBackgroundImageCSS1();
- if (repeat == null)
- repeat = new CssBackgroundRepeatCSS1();
- if (attachment == null)
- attachment = new CssBackgroundAttachmentCSS1();
- if (position == null)
- position = new CssBackgroundPositionCSS1();
- */
+ if (color == null) {
+ try {
+ color = new CssBackgroundColorCSS1(ac, expression);
+ find = true;
+ } catch (InvalidParamException e) {
+ }
+ }
+ if (!find && image == null) {
+ try {
+ image = new CssBackgroundImageCSS1(ac, expression);
+ find = true;
+ } catch (InvalidParamException e) {
+ // nothing to do, repeat will test this value
+ }
+ }
+ if (!find && repeat == null) {
+ try {
+ repeat = new CssBackgroundRepeatCSS1(ac, expression);
+ find = true;
+ } catch (InvalidParamException e) {
+ // nothing to do, attachment will test this value
+ }
+ }
+ if (!find && attachment == null) {
+ try {
+ attachment = new CssBackgroundAttachmentCSS1(ac, expression);
+ find = true;
+ } catch (InvalidParamException e) {
+ // nothing to do, position will test this value
+ }
+ }
+ if (!find && position == null) {
+ try {
+ position = new CssBackgroundPositionCSS1(ac, expression);
+ find = true;
+ } catch (InvalidParamException e) {
+ // nothing to do
+ }
+ }
+ if (op != SPACE) {
+ throw new InvalidParamException("operator",
+ ((new Character(op)).toString()),
+ ac);
+ }
+ if (check && !find && val != null) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+ }
+ /*
+ if (color == null)
+ color = new CssBackgroundColorCSS1();
+ if (image == null)
+ image = new CssBackgroundImageCSS1();
+ if (repeat == null)
+ repeat = new CssBackgroundRepeatCSS1();
+ if (attachment == null)
+ attachment = new CssBackgroundAttachmentCSS1();
+ if (position == null)
+ position = new CssBackgroundPositionCSS1();
+ */
}
public CssBackgroundCSS1(ApplContext ac, CssExpression expression)
- throws InvalidParamException {
- this(ac, expression, false);
+ throws InvalidParamException {
+ this(ac, expression, false);
}
/**
* Returns the value of this property
*/
public Object get() {
- return color;
+ return color;
}
/**
* Returns the color
*/
public final CssValue getColor() {
- if (color == null) {
- return null;
- } else {
- return color.getColor();
- }
+ if (color == null) {
+ return null;
+ } else {
+ return color.getColor();
+ }
}
/**
* Returns the name of this property
*/
public String getPropertyName() {
- return "background";
+ return "background";
}
/**
* Returns a string representation of the object.
*/
public String toString() {
- String ret = "";
- if(color != null) {
- ret += color;
- }
- if(image != null) {
- if(ret != null) {
- ret += " ";
- }
- ret += image;
- }
- if(repeat != null) {
- if(ret != null) {
- ret += " ";
- }
- ret += repeat;
- }
- if(attachment != null) {
- if(ret != null) {
- ret += " ";
- }
- ret += attachment;
- }
- if(position != null) {
- if(ret != null) {
- ret += " ";
- }
- ret += position;
- }
- return ret;
- /*
- if (same) {
- return inherit.toString();
- } else {
- String ret = "";
- if (color.byUser)
- ret += " " + color.toString();
- if (image.byUser)
- ret += " " + image.toString();
- if (image.byUser)
- ret += " " + repeat.toString();
- if (attachment.byUser)
- ret += " " + attachment.toString();
- if (position.byUser)
- ret += " " + position.toString();
- return ret.trim();
- }*/
+ StringBuilder sb = new StringBuilder();
+ boolean first = true;
+ if (color != null) {
+ sb.append(color);
+ first = false;
+ }
+ if (image != null) {
+ if (!first) {
+ sb.append(' ');
+ }
+ sb.append(image);
+ first = false;
+ }
+ if (repeat != null) {
+ if (!first) {
+ sb.append(' ');
+ }
+ first = false;
+ sb.append(repeat);
+ }
+ if (attachment != null) {
+ if (!first) {
+ sb.append(' ');
+ }
+ first = false;
+ sb.append(attachment);
+ }
+ if (position != null) {
+ if (!first) {
+ sb.append(' ');
+ }
+ first = false;
+ sb.append(position);
+ }
+ return sb.toString();
}
/**
@@ -247,21 +239,21 @@
* Overrides this method for a macro
*/
public void setImportant() {
- if(color != null) {
- color.important = true;
- }
- if(image != null) {
- image.important = true;
- }
- if(repeat != null) {
- repeat.important = true;
- }
- if(attachment != null) {
- attachment.important = true;
- }
- if(position != null) {
- position.important = true;
- }
+ if (color != null) {
+ color.important = true;
+ }
+ if (image != null) {
+ image.important = true;
+ }
+ if (repeat != null) {
+ repeat.important = true;
+ }
+ if (attachment != null) {
+ attachment.important = true;
+ }
+ if (position != null) {
+ position.important = true;
+ }
}
/**
@@ -269,11 +261,11 @@
* Overrides this method for a macro
*/
public boolean getImportant() {
- return ((color == null || color.important) &&
- (image == null || image.important) &&
- (repeat == null || repeat.important) &&
- (attachment == null || attachment.important) &&
- (position == null || position.important));
+ return ((color == null || color.important) &&
+ (image == null || image.important) &&
+ (repeat == null || repeat.important) &&
+ (attachment == null || attachment.important) &&
+ (position == null || position.important));
}
/**
@@ -284,31 +276,31 @@
* @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);
- }
+ 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);
+ }
}
/**
@@ -319,22 +311,22 @@
* @see org.w3c.css.css.StyleSheetParser#handleRule
*/
public void setSelectors(CssSelectors selector) {
- super.setSelectors(selector);
- if (color != null) {
- color.setSelectors(selector);
- }
- if (image != null) {
- image.setSelectors(selector);
- }
- if (repeat != null) {
- repeat.setSelectors(selector);
- }
- if (attachment != null) {
- attachment.setSelectors(selector);
- }
- if (position != null) {
- position.setSelectors(selector);
- }
+ super.setSelectors(selector);
+ if (color != null) {
+ color.setSelectors(selector);
+ }
+ if (image != null) {
+ image.setSelectors(selector);
+ }
+ if (repeat != null) {
+ repeat.setSelectors(selector);
+ }
+ if (attachment != null) {
+ attachment.setSelectors(selector);
+ }
+ if (position != null) {
+ position.setSelectors(selector);
+ }
}
/**
@@ -343,72 +335,72 @@
* @param style The CssStyle
*/
public void addToStyle(ApplContext ac, CssStyle style) {
- ((Css1Style) style).cssBackgroundCSS1.same = same;
- ((Css1Style) style).cssBackgroundCSS1.byUser = byUser;
+ ((Css1Style) style).cssBackgroundCSS1.same = same;
+ ((Css1Style) style).cssBackgroundCSS1.byUser = byUser;
- if(color != null) {
- color.addToStyle(ac, style);
- }
- if(image != null) {
- image.addToStyle(ac, style);
- }
- if(repeat != null) {
- repeat.addToStyle(ac, style);
- }
- if(attachment != null) {
- attachment.addToStyle(ac, style);
- }
- if(position != null) {
- position.addToStyle(ac, style);
- }
+ if (color != null) {
+ color.addToStyle(ac, style);
+ }
+ if (image != null) {
+ image.addToStyle(ac, style);
+ }
+ if (repeat != null) {
+ repeat.addToStyle(ac, style);
+ }
+ if (attachment != null) {
+ attachment.addToStyle(ac, style);
+ }
+ if (position != null) {
+ position.addToStyle(ac, style);
+ }
}
/**
* Get this property in the style.
*
- * @param style The style where the property is
+ * @param style The style where the property is
* @param resolve if true, resolve the style to find this property
*/
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
- if (resolve) {
- return ((Css1Style) style).getBackgroundCSS1();
- } else {
- return ((Css1Style) style).cssBackgroundCSS1;
- }
+ if (resolve) {
+ return ((Css1Style) style).getBackgroundCSS1();
+ } else {
+ return ((Css1Style) style).cssBackgroundCSS1;
+ }
}
/**
* Compares two properties for equality.
*
- * @param value The other property.
+ * @param property The other property.
*/
public boolean equals(CssProperty property) {
- return false; // FIXME
+ return false; // FIXME
}
/**
* Update the source file and the line.
* Overrides this method for a macro
*
- * @param line The line number where this property is defined
+ * @param line The line number where this property is defined
* @param source The source file where this property is defined
*/
public void setInfo(int line, String source) {
- super.setInfo(line, source);
- if(color != null) {
- color.setInfo(line, source);
- }
- if(image != null) {
- image.setInfo(line, source);
- }
- if(repeat != null) {
- repeat.setInfo(line, source);
- }
- if(attachment != null) {
- attachment.setInfo(line, source);
- }
- if(position != null) {
- position.setInfo(line, source);
- }
+ super.setInfo(line, source);
+ if (color != null) {
+ color.setInfo(line, source);
+ }
+ if (image != null) {
+ image.setInfo(line, source);
+ }
+ if (repeat != null) {
+ repeat.setInfo(line, source);
+ }
+ if (attachment != null) {
+ attachment.setInfo(line, source);
+ }
+ if (position != null) {
+ position.setInfo(line, source);
+ }
}
}
Index: CssListStyleImageCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssListStyleImageCSS1.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssListStyleImageCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssListStyleImageCSS1.java 5 Jan 2010 13:49:44 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssTextAlignTV.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssTextAlignTV.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssTextAlignTV.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssTextAlignTV.java 5 Jan 2010 13:49:45 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssTextIndentMob.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssTextIndentMob.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssTextIndentMob.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssTextIndentMob.java 5 Jan 2010 13:49:45 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssMaxWidthATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssMaxWidthATSC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssMaxWidthATSC.java 14 Sep 2005 15:14:31 -0000 1.2
+++ CssMaxWidthATSC.java 5 Jan 2010 13:49:44 -0000 1.3
@@ -9,6 +9,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
--- CssBackgroundConstants.java DELETED ---
Index: CssBorderLeftStyleCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderLeftStyleCSS2.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorderLeftStyleCSS2.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssBorderLeftStyleCSS2.java 5 Jan 2010 13:49:41 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorderLeftColorCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderLeftColorCSS1.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorderLeftColorCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssBorderLeftColorCSS1.java 5 Jan 2010 13:49:41 -0000 1.4
@@ -8,6 +8,7 @@
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;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssQuotesATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssQuotesATSC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssQuotesATSC.java 14 Sep 2005 15:14:31 -0000 1.2
+++ CssQuotesATSC.java 5 Jan 2010 13:49:45 -0000 1.3
@@ -11,6 +11,7 @@
import java.util.Vector;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssMarginTop.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssMarginTop.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssMarginTop.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssMarginTop.java 5 Jan 2010 13:49:44 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssTextDecorationMob.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssTextDecorationMob.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssTextDecorationMob.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssTextDecorationMob.java 5 Jan 2010 13:49:45 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssMarginLeft.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssMarginLeft.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssMarginLeft.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssMarginLeft.java 5 Jan 2010 13:49:44 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorderLeftColorCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderLeftColorCSS2.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssBorderLeftColorCSS2.java 14 Sep 2005 15:14:31 -0000 1.4
+++ CssBorderLeftColorCSS2.java 5 Jan 2010 13:49:41 -0000 1.5
@@ -8,6 +8,7 @@
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;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssOverflow.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssOverflow.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssOverflow.java 14 Sep 2005 15:14:31 -0000 1.2
+++ CssOverflow.java 5 Jan 2010 13:49:44 -0000 1.3
@@ -9,6 +9,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorderRightWidthCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderRightWidthCSS2.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorderRightWidthCSS2.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssBorderRightWidthCSS2.java 5 Jan 2010 13:49:41 -0000 1.4
@@ -7,6 +7,7 @@
package org.w3c.css.properties.css1;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Index: CssBorderFaceWidth.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderFaceWidth.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorderFaceWidth.java 14 Sep 2005 15:14:31 -0000 1.3
+++ CssBorderFaceWidth.java 5 Jan 2010 13:49:40 -0000 1.4
@@ -6,6 +6,7 @@
// Please first read the full copyright statement in file COPYRIGHT.html
package org.w3c.css.properties.css1;
+import org.w3c.css.properties.css.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
Received on Tuesday, 5 January 2010 13:50:29 UTC