- From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
- Date: Thu, 01 Sep 2005 11:51:23 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/properties/css1
In directory hutz:/tmp/cvs-serv16812/org/w3c/css/properties/css1
Modified Files:
CssBackgroundCSS2.java CssBackgroundColorCSS2.java
CssBackgroundPositionCSS1.java CssBackgroundPositionCSS2.java
CssBorderBottomCSS2.java CssBorderBottomColorCSS2.java
CssBorderCSS2.java CssBorderColorCSS2.java
CssBorderFaceColorCSS2.java CssBorderLeftCSS2.java
CssBorderLeftColorCSS2.java CssBorderRightCSS2.java
CssBorderRightColorCSS2.java CssBorderTopCSS2.java
CssBorderTopColorCSS2.java CssColorCSS2.java
CssContentCSS2.java CssDisplayCSS2.java CssListStyleCSS2.java
CssListStyleConstants.java CssListStyleTypeCSS2.java
CssTextAlign.java CssWhiteSpace.java
Log Message:
>From Jean-Guilhem Rouel:
CSS 2.1 first implementation
Index: CssListStyleConstants.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssListStyleConstants.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssListStyleConstants.java 23 Aug 2005 16:23:12 -0000 1.1
+++ CssListStyleConstants.java 1 Sep 2005 11:51:21 -0000 1.2
@@ -6,6 +6,10 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.2 2005/09/01 11:51:21 ylafon
+ * From Jean-Guilhem Rouel:
+ * CSS 2.1 first implementation
+ *
* Revision 1.1 2005/08/23 16:23:12 ylafon
* Patch by Jean-Guilhem Rouel
*
@@ -88,6 +92,14 @@
"none"
};
+ public static String[] LISTSTYLETYPECSS2 = {
+ "disc", "circle", "square", "decimal", "decimal-leading-zero",
+ "lower-roman", "upper-roman", "lower-greek", "lower-alpha",
+ "lower-latin", "upper-alpha", "upper-latin", "hebrew", "armenian",
+ "georgian", "cjk-ideographic", "hiragana", "katakana", "hiragana-iroha",
+ "katakana-iroha", "none", "inherit"
+ };
+
public static String[] LISTSTYLETYPETV = {
"disc", "circle", "square", "decimal",
"lower-roman", "upper-roman",
Index: CssBorderLeftCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderLeftCSS2.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssBorderLeftCSS2.java 23 Aug 2005 16:23:12 -0000 1.1
+++ CssBorderLeftCSS2.java 1 Sep 2005 11:51:21 -0000 1.2
@@ -6,6 +6,10 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.2 2005/09/01 11:51:21 ylafon
+ * From Jean-Guilhem Rouel:
+ * CSS 2.1 first implementation
+ *
* Revision 1.1 2005/08/23 16:23:12 ylafon
* Patch by Jean-Guilhem Rouel
*
@@ -178,6 +182,27 @@
}
/**
+ * @param color The color to set.
+ */
+ public void setColor(CssBorderLeftColorCSS2 color) {
+ this.color = color;
+ }
+
+ /**
+ * @param style The style to set.
+ */
+ public void setStyle(CssBorderLeftStyleCSS2 style) {
+ this.style = style;
+ }
+
+ /**
+ * @param width The width to set.
+ */
+ public void setWidth(CssBorderLeftWidthCSS2 width) {
+ this.width = width;
+ }
+
+ /**
* Returns the value of this property
*/
public Object get() {
Index: CssColorCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssColorCSS2.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssColorCSS2.java 26 Aug 2005 14:09:49 -0000 1.2
+++ CssColorCSS2.java 1 Sep 2005 11:51:21 -0000 1.3
@@ -6,6 +6,10 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.3 2005/09/01 11:51:21 ylafon
+ * From Jean-Guilhem Rouel:
+ * CSS 2.1 first implementation
+ *
* Revision 1.2 2005/08/26 14:09:49 ylafon
* All changes made by Jean-Guilhem Rouel:
*
@@ -123,6 +127,13 @@
}
/**
+ * @param color The color to set.
+ */
+ public void setColor(CssValue color) {
+ this.color = color;
+ }
+
+ /**
* Set the value of the property
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
Index: CssBorderBottomColorCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderBottomColorCSS2.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssBorderBottomColorCSS2.java 23 Aug 2005 16:23:12 -0000 1.1
+++ CssBorderBottomColorCSS2.java 1 Sep 2005 11:51:21 -0000 1.2
@@ -6,6 +6,10 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.2 2005/09/01 11:51:21 ylafon
+ * From Jean-Guilhem Rouel:
+ * CSS 2.1 first implementation
+ *
* Revision 1.1 2005/08/23 16:23:12 ylafon
* Patch by Jean-Guilhem Rouel
*
@@ -49,122 +53,136 @@
* @version $Revision$
*/
public class CssBorderBottomColorCSS2 extends CssProperty {
-
- CssBorderFaceColorCSS2 face;
-
- /**
- * Create a new CssBorderBottomColorCSS2
- */
- public CssBorderBottomColorCSS2() {
- face = new CssBorderFaceColorCSS2();
- }
-
- /**
- * Create a new CssBorderBottomColor with an another CssBorderFaceColor
- *
- * @param another An another face.
- */
- public CssBorderBottomColorCSS2(CssBorderFaceColorCSS2 another) {
-
- setByUser();
-
- face = another;
- }
-
- /**
- * Create a new CssBorderBottomColor
- *
- * @param expression The expression for this property.
- * @exception InvalidParamException Values are incorrect
- */
- public CssBorderBottomColorCSS2(ApplContext ac, CssExpression expression,
- boolean check) throws InvalidParamException {
-
- if(check && expression.getCount() > 1) {
- throw new InvalidParamException("unrecognize", ac);
- }
-
- setByUser();
- face = new CssBorderFaceColorCSS2(ac, expression);
- }
-
- public CssBorderBottomColorCSS2(ApplContext ac, CssExpression expression)
- throws InvalidParamException {
+
+ CssBorderFaceColorCSS2 face;
+
+ /**
+ * Create a new CssBorderBottomColorCSS2
+ */
+ public CssBorderBottomColorCSS2() {
+ face = new CssBorderFaceColorCSS2();
+ }
+
+ /**
+ * Create a new CssBorderBottomColor with an another CssBorderFaceColor
+ *
+ * @param another An another face.
+ */
+ public CssBorderBottomColorCSS2(CssBorderFaceColorCSS2 another) {
+
+ setByUser();
+
+ face = another;
+ }
+
+ /**
+ * Create a new CssBorderBottomColor
+ *
+ * @param expression The expression for this property.
+ * @exception InvalidParamException Values are incorrect
+ */
+ public CssBorderBottomColorCSS2(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+
+ if(check && expression.getCount() > 1) {
+ throw new InvalidParamException("unrecognize", ac);
+ }
+
+ setByUser();
+ face = new CssBorderFaceColorCSS2(ac, expression);
+ }
+
+ public CssBorderBottomColorCSS2(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
this(ac, expression, false);
- }
-
- /**
- * Returns the value of this property
- */
- public Object get() {
- return face;
- }
-
- /**
- * Returns the color of this property
- */
- public CssValue getColor() {
- return face.getColor();
- }
-
- /**
- * Returns a string representation of the object.
- */
- public String toString() {
- return face.toString();
- }
-
- /**
- * Returns the name of this property
- */
- public String getPropertyName() {
- return "border-bottom-color";
- }
-
- /**
- * Add this property to the CssStyle.
- *
- * @param style The CssStyle
- */
- public void addToStyle(ApplContext ac, CssStyle style) {
- CssBorderBottomCSS2 bottom = ((Css1Style) style).cssBorderCSS2.bottom;
- if (bottom.color != null)
- style.addRedefinitionWarning(ac, this);
- bottom.color = 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).getBorderBottomColorCSS2();
- } else {
- return ((Css1Style) style).cssBorderCSS2.getBottom().color;
+ }
+
+ /**
+ * Returns the value of this property
+ */
+ public Object get() {
+ return face;
+ }
+
+ /**
+ * @return Returns the face.
+ */
+ public CssBorderFaceColorCSS2 getFace() {
+ return face;
+ }
+
+ /**
+ * @param face The face to set.
+ */
+ public void setFace(CssBorderFaceColorCSS2 face) {
+ this.face = face;
+ }
+
+ /**
+ * Returns the color of this property
+ */
+ public CssValue getColor() {
+ return face.getColor();
+ }
+
+ /**
+ * Returns a string representation of the object.
+ */
+ public String toString() {
+ return face.toString();
+ }
+
+ /**
+ * Returns the name of this property
+ */
+ public String getPropertyName() {
+ return "border-bottom-color";
+ }
+
+ /**
+ * Add this property to the CssStyle.
+ *
+ * @param style The CssStyle
+ */
+ public void addToStyle(ApplContext ac, CssStyle style) {
+ CssBorderBottomCSS2 bottom = ((Css1Style) style).cssBorderCSS2.bottom;
+ if (bottom.color != null)
+ style.addRedefinitionWarning(ac, this);
+ bottom.color = 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).getBorderBottomColorCSS2();
+ } else {
+ return ((Css1Style) style).cssBorderCSS2.getBottom().color;
+ }
+ }
+
+ /**
+ * Compares two properties for equality.
+ *
+ * @param value The other property.
+ */
+ public boolean equals(CssProperty property) {
+ return (property instanceof CssBorderBottomColorCSS2 && face.equals(((CssBorderBottomColorCSS2) property).face));
+ }
+
+ /**
+ * Print this property.
+ *
+ * @param printer The printer.
+ * @see #toString()
+ * @see #getPropertyName()
+ */
+ public void print(CssPrinterStyle printer) {
+ if (face != null && !face.isDefault())
+ printer.print(this);
}
- }
-
- /**
- * Compares two properties for equality.
- *
- * @param value The other property.
- */
- public boolean equals(CssProperty property) {
- return (property instanceof CssBorderBottomColorCSS2 && face.equals(((CssBorderBottomColorCSS2) property).face));
- }
-
- /**
- * Print this property.
- *
- * @param printer The printer.
- * @see #toString()
- * @see #getPropertyName()
- */
- public void print(CssPrinterStyle printer) {
- if (face != null && !face.isDefault())
- printer.print(this);
- }
}
Index: CssBackgroundPositionCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBackgroundPositionCSS1.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBackgroundPositionCSS1.java 29 Aug 2005 09:52:21 -0000 1.3
+++ CssBackgroundPositionCSS1.java 1 Sep 2005 11:51:21 -0000 1.4
@@ -6,6 +6,10 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.4 2005/09/01 11:51:21 ylafon
+ * From Jean-Guilhem Rouel:
+ * CSS 2.1 first implementation
+ *
* Revision 1.3 2005/08/29 09:52:21 ylafon
* Jean-Guilhem Rouel: Fixes issues with the background property
*
@@ -202,17 +206,7 @@
throw new InvalidParamException("operator",
((new Character(op)).toString()),
ac);
-
- if (val.equals(inherit)) {
- if(expression.getCount() > 1) {
- throw new InvalidParamException("unrecognize", ac);
- }
- first = inherit;
- second = inherit;
- expression.next();
- return;
- }
-
+
CssValue next = expression.getNextValue();
if(val instanceof CssIdent) {
Index: CssListStyleTypeCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssListStyleTypeCSS2.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssListStyleTypeCSS2.java 23 Aug 2005 16:23:12 -0000 1.1
+++ CssListStyleTypeCSS2.java 1 Sep 2005 11:51:21 -0000 1.2
@@ -6,6 +6,10 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.2 2005/09/01 11:51:21 ylafon
+ * From Jean-Guilhem Rouel:
+ * CSS 2.1 first implementation
+ *
* Revision 1.1 2005/08/23 16:23:12 ylafon
* Patch by Jean-Guilhem Rouel
*
@@ -105,7 +109,7 @@
if ( val instanceof CssIdent) {
int hash = val.hashCode();
- for (int i = 0; i < LISTSTYLETYPE.length; i++)
+ for (int i = 0; i < LISTSTYLETYPECSS2.length; i++)
if (hash_values[i] == hash) {
value = i;
expression.next();
@@ -122,10 +126,24 @@
}
/**
+ * @return Returns the value.
+ */
+ public int getValue() {
+ return value;
+ }
+
+ /**
+ * @param value The value to set.
+ */
+ public void setValue(int value) {
+ this.value = value;
+ }
+
+ /**
* Returns the value of this property
*/
public Object get() {
- return LISTSTYLETYPE[value];
+ return LISTSTYLETYPECSS2[value];
}
/**
@@ -140,14 +158,14 @@
* e.g. his value equals inherit
*/
public boolean isSoftlyInherited() {
- return value == (LISTSTYLETYPE.length - 1);
+ return value == (LISTSTYLETYPECSS2.length - 1);
}
/**
* Returns a string representation of the object.
*/
public String toString() {
- return LISTSTYLETYPE[value];
+ return LISTSTYLETYPECSS2[value];
}
/**
@@ -195,8 +213,8 @@
}
static {
- hash_values = new int[LISTSTYLETYPE.length];
- for (int i = 0; i < LISTSTYLETYPE.length; i++)
- hash_values[i] = LISTSTYLETYPE[i].hashCode();
+ hash_values = new int[LISTSTYLETYPECSS2.length];
+ for (int i = 0; i < LISTSTYLETYPECSS2.length; i++)
+ hash_values[i] = LISTSTYLETYPECSS2[i].hashCode();
}
}
Index: CssBorderRightColorCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderRightColorCSS2.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssBorderRightColorCSS2.java 23 Aug 2005 16:23:12 -0000 1.1
+++ CssBorderRightColorCSS2.java 1 Sep 2005 11:51:21 -0000 1.2
@@ -6,6 +6,10 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.2 2005/09/01 11:51:21 ylafon
+ * From Jean-Guilhem Rouel:
+ * CSS 2.1 first implementation
+ *
* Revision 1.1 2005/08/23 16:23:12 ylafon
* Patch by Jean-Guilhem Rouel
*
@@ -97,6 +101,20 @@
}
/**
+ * @return Returns the face.
+ */
+ public CssBorderFaceColorCSS2 getFace() {
+ return face;
+ }
+
+ /**
+ * @param face The face to set.
+ */
+ public void setFace(CssBorderFaceColorCSS2 face) {
+ this.face = face;
+ }
+
+ /**
* Returns the value of this property
*/
public Object get() {
Index: CssTextAlign.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssTextAlign.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssTextAlign.java 23 Aug 2005 16:23:12 -0000 1.1
+++ CssTextAlign.java 1 Sep 2005 11:51:21 -0000 1.2
@@ -6,6 +6,10 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.2 2005/09/01 11:51:21 ylafon
+ * From Jean-Guilhem Rouel:
+ * CSS 2.1 first implementation
+ *
* Revision 1.1 2005/08/23 16:23:12 ylafon
* Patch by Jean-Guilhem Rouel
*
@@ -142,9 +146,37 @@
public CssTextAlign(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
- }
+ }
/**
+ * @return Returns the value.
+ */
+ public int getValue() {
+ return value;
+ }
+
+ /**
+ * @param value The value to set.
+ */
+ public void setValue(int value) {
+ this.value = value;
+ }
+
+ /**
+ * @return Returns the valueString.
+ */
+ public CssValue getValueString() {
+ return valueString;
+ }
+
+ /**
+ * @param valueString The valueString to set.
+ */
+ public void setValueString(CssValue valueString) {
+ this.valueString = valueString;
+ }
+
+ /**
* Returns the value of this property
*/
public Object get() {
Index: CssBackgroundCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBackgroundCSS2.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBackgroundCSS2.java 29 Aug 2005 09:52:21 -0000 1.3
+++ CssBackgroundCSS2.java 1 Sep 2005 11:51:21 -0000 1.4
@@ -6,6 +6,10 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.4 2005/09/01 11:51:21 ylafon
+ * From Jean-Guilhem Rouel:
+ * CSS 2.1 first implementation
+ *
* Revision 1.3 2005/08/29 09:52:21 ylafon
* Jean-Guilhem Rouel: Fixes issues with the background property
*
@@ -241,9 +245,93 @@
public CssBackgroundCSS2(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
+ }
+
+ /**
+ * @return Returns the attachment.
+ */
+ public CssBackgroundAttachmentCSS2 getAttachment() {
+ return attachment;
+ }
+
+ /**
+ * @param attachment The attachment to set.
+ */
+ public void setAttachment(CssBackgroundAttachmentCSS2 attachment) {
+ this.attachment = attachment;
+ }
+
+ /**
+ * @return Returns the image.
+ */
+ public CssBackgroundImageCSS2 getImage() {
+ return image;
+ }
+
+ /**
+ * @param image The image to set.
+ */
+ public void setImage(CssBackgroundImageCSS2 image) {
+ this.image = image;
+ }
+
+ /**
+ * @return Returns the repeat.
+ */
+ public CssBackgroundRepeatCSS2 getRepeat() {
+ return repeat;
+ }
+
+ /**
+ * @param repeat The repeat to set.
+ */
+ public void setRepeat(CssBackgroundRepeatCSS2 repeat) {
+ this.repeat = repeat;
+ }
+
+ /**
+ * @return Returns the same.
+ */
+ public boolean isSame() {
+ return same;
+ }
+
+ /**
+ * @param same The same to set.
+ */
+ public void setSame(boolean same) {
+ this.same = same;
+ }
+
+ /**
+ * Returns the color
+ */
+ public final CssBackgroundColorCSS2 getColor2() {
+ return color;
}
/**
+ * @param color The color to set.
+ */
+ public void setColor(CssBackgroundColorCSS2 color) {
+ this.color = color;
+ }
+
+ /**
+ * @return Returns the position.
+ */
+ public CssBackgroundPositionCSS2 getPosition() {
+ return position;
+ }
+
+ /**
+ * @param position The position to set.
+ */
+ public void setPosition(CssBackgroundPositionCSS2 position) {
+ this.position = position;
+ }
+
+ /**
* Returns the value of this property
*/
public Object get() {
Index: CssBorderCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderCSS2.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssBorderCSS2.java 23 Aug 2005 16:23:12 -0000 1.1
+++ CssBorderCSS2.java 1 Sep 2005 11:51:21 -0000 1.2
@@ -6,6 +6,10 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.2 2005/09/01 11:51:21 ylafon
+ * From Jean-Guilhem Rouel:
+ * CSS 2.1 first implementation
+ *
* Revision 1.1 2005/08/23 16:23:12 ylafon
* Patch by Jean-Guilhem Rouel
*
@@ -171,6 +175,34 @@
}
/**
+ * @param bottom The bottom to set.
+ */
+ public void setBottom(CssBorderBottomCSS2 bottom) {
+ this.bottom = bottom;
+ }
+
+ /**
+ * @param left The left to set.
+ */
+ public void setLeft(CssBorderLeftCSS2 left) {
+ this.left = left;
+ }
+
+ /**
+ * @param right The right to set.
+ */
+ public void setRight(CssBorderRightCSS2 right) {
+ this.right = right;
+ }
+
+ /**
+ * @param top The top to set.
+ */
+ public void setTop(CssBorderTopCSS2 top) {
+ this.top = top;
+ }
+
+ /**
* Returns a string representation of the object.
*/
public String toString() {
Index: CssListStyleCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssListStyleCSS2.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssListStyleCSS2.java 23 Aug 2005 16:23:12 -0000 1.1
+++ CssListStyleCSS2.java 1 Sep 2005 11:51:21 -0000 1.2
@@ -6,6 +6,10 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.2 2005/09/01 11:51:21 ylafon
+ * From Jean-Guilhem Rouel:
+ * CSS 2.1 first implementation
+ *
* Revision 1.1 2005/08/23 16:23:12 ylafon
* Patch by Jean-Guilhem Rouel
*
@@ -217,6 +221,62 @@
}
/**
+ * @return Returns the inheritedValue.
+ */
+ public boolean isInheritedValue() {
+ return inheritedValue;
+ }
+
+ /**
+ * @param inheritedValue The inheritedValue to set.
+ */
+ public void setInheritedValue(boolean inheritedValue) {
+ this.inheritedValue = inheritedValue;
+ }
+
+ /**
+ * @return Returns the listStyleImage.
+ */
+ public CssListStyleImageCSS2 getListStyleImage() {
+ return listStyleImage;
+ }
+
+ /**
+ * @param listStyleImage The listStyleImage to set.
+ */
+ public void setListStyleImage(CssListStyleImageCSS2 listStyleImage) {
+ this.listStyleImage = listStyleImage;
+ }
+
+ /**
+ * @return Returns the listStylePosition.
+ */
+ public CssListStylePositionCSS2 getListStylePosition() {
+ return listStylePosition;
+ }
+
+ /**
+ * @param listStylePosition The listStylePosition to set.
+ */
+ public void setListStylePosition(CssListStylePositionCSS2 listStylePosition) {
+ this.listStylePosition = listStylePosition;
+ }
+
+ /**
+ * @return Returns the listStyleType.
+ */
+ public CssListStyleTypeCSS2 getListStyleType() {
+ return listStyleType;
+ }
+
+ /**
+ * @param listStyleType The listStyleType to set.
+ */
+ public void setListStyleType(CssListStyleTypeCSS2 listStyleType) {
+ this.listStyleType = listStyleType;
+ }
+
+ /**
* Returns the value of this property
*/
public Object get() {
Index: CssBorderTopColorCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderTopColorCSS2.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssBorderTopColorCSS2.java 23 Aug 2005 16:23:12 -0000 1.1
+++ CssBorderTopColorCSS2.java 1 Sep 2005 11:51:21 -0000 1.2
@@ -6,6 +6,10 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.2 2005/09/01 11:51:21 ylafon
+ * From Jean-Guilhem Rouel:
+ * CSS 2.1 first implementation
+ *
* Revision 1.1 2005/08/23 16:23:12 ylafon
* Patch by Jean-Guilhem Rouel
*
@@ -92,6 +96,20 @@
}
/**
+ * @return Returns the face.
+ */
+ public CssBorderFaceColorCSS2 getFace() {
+ return face;
+ }
+
+ /**
+ * @param face The face to set.
+ */
+ public void setFace(CssBorderFaceColorCSS2 face) {
+ this.face = face;
+ }
+
+ /**
* Returns the value of this property
*/
public Object get() {
Index: CssBorderBottomCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderBottomCSS2.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssBorderBottomCSS2.java 23 Aug 2005 16:23:12 -0000 1.1
+++ CssBorderBottomCSS2.java 1 Sep 2005 11:51:21 -0000 1.2
@@ -6,6 +6,10 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.2 2005/09/01 11:51:21 ylafon
+ * From Jean-Guilhem Rouel:
+ * CSS 2.1 first implementation
+ *
* Revision 1.1 2005/08/23 16:23:12 ylafon
* Patch by Jean-Guilhem Rouel
*
@@ -179,6 +183,27 @@
}
/**
+ * @param color The color to set.
+ */
+ public void setColor(CssBorderBottomColorCSS2 color) {
+ this.color = color;
+ }
+
+ /**
+ * @param style The style to set.
+ */
+ public void setStyle(CssBorderBottomStyleCSS2 style) {
+ this.style = style;
+ }
+
+ /**
+ * @param width The width to set.
+ */
+ public void setWidth(CssBorderBottomWidthCSS2 width) {
+ this.width = width;
+ }
+
+ /**
* Returns the value of this property
*/
public Object get() {
Index: CssWhiteSpace.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssWhiteSpace.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssWhiteSpace.java 23 Aug 2005 16:23:12 -0000 1.1
+++ CssWhiteSpace.java 1 Sep 2005 11:51:21 -0000 1.2
@@ -6,6 +6,10 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.2 2005/09/01 11:51:21 ylafon
+ * From Jean-Guilhem Rouel:
+ * CSS 2.1 first implementation
+ *
* Revision 1.1 2005/08/23 16:23:12 ylafon
* Patch by Jean-Guilhem Rouel
*
@@ -132,6 +136,20 @@
}
/**
+ * @return Returns the value.
+ */
+ public int getValue() {
+ return value;
+ }
+
+ /**
+ * @param value The value to set.
+ */
+ public void setValue(int value) {
+ this.value = value;
+ }
+
+ /**
* Returns the value of this property
*/
public Object get() {
Index: CssBorderRightCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderRightCSS2.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssBorderRightCSS2.java 23 Aug 2005 16:23:12 -0000 1.1
+++ CssBorderRightCSS2.java 1 Sep 2005 11:51:21 -0000 1.2
@@ -6,6 +6,10 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.2 2005/09/01 11:51:21 ylafon
+ * From Jean-Guilhem Rouel:
+ * CSS 2.1 first implementation
+ *
* Revision 1.1 2005/08/23 16:23:12 ylafon
* Patch by Jean-Guilhem Rouel
*
@@ -179,6 +183,27 @@
}
/**
+ * @param color The color to set.
+ */
+ public void setColor(CssBorderRightColorCSS2 color) {
+ this.color = color;
+ }
+
+ /**
+ * @param style The style to set.
+ */
+ public void setStyle(CssBorderRightStyleCSS2 style) {
+ this.style = style;
+ }
+
+ /**
+ * @param width The width to set.
+ */
+ public void setWidth(CssBorderRightWidthCSS2 width) {
+ this.width = width;
+ }
+
+ /**
* Returns the value of this property
*/
public Object get() {
Index: CssBorderFaceColorCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderFaceColorCSS2.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssBorderFaceColorCSS2.java 23 Aug 2005 16:23:12 -0000 1.1
+++ CssBorderFaceColorCSS2.java 1 Sep 2005 11:51:21 -0000 1.2
@@ -6,6 +6,10 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.2 2005/09/01 11:51:21 ylafon
+ * From Jean-Guilhem Rouel:
+ * CSS 2.1 first implementation
+ *
* Revision 1.1 2005/08/23 16:23:12 ylafon
* Patch by Jean-Guilhem Rouel
*
@@ -94,8 +98,6 @@
face = val;
} else if (val.equals(CssProperty.inherit)) {
face = CssProperty.inherit;
- } else if(val.equals(CssProperty.transparent)) {
- face = CssProperty.transparent;
} else if (val instanceof CssIdent) {
face = new org.w3c.css.values.CssColorCSS2(ac, (String) val.get());
} else {
@@ -111,6 +113,20 @@
}
/**
+ * @return Returns the face.
+ */
+ public CssValue getFace() {
+ return face;
+ }
+
+ /**
+ * @param face The face to set.
+ */
+ public void setFace(CssValue face) {
+ this.face = face;
+ }
+
+ /**
* Returns the internal color
*/
public CssValue getColor() {
Index: CssContentCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssContentCSS2.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssContentCSS2.java 23 Aug 2005 16:23:12 -0000 1.1
+++ CssContentCSS2.java 1 Sep 2005 11:51:21 -0000 1.2
@@ -49,8 +49,6 @@
boolean check) throws InvalidParamException {
CssValue val = expression.getValue();
- int counter = 0;
- char op = expression.getOperator();
setByUser();
if (val.equals(inherit)) {
@@ -61,7 +59,21 @@
expression.next();
return;
}
+
+ addContent(ac, expression);
+ }
+
+ /**
+ * @param ac
+ * @param expression
+ * @throws InvalidParamException
+ */
+ protected void addContent(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ CssValue val = expression.getValue();
+ int counter = 0;
+ char op = expression.getOperator();
while ((op == CssOperator.SPACE)
&& (counter < expression.getCount())) {
if (val instanceof CssIdent) {
@@ -167,15 +179,28 @@
val = expression.getValue();
op = expression.getOperator();
}
-
}
public CssContentCSS2(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
- }
+ }
/**
+ * @return Returns the values.
+ */
+ public Vector getValues() {
+ return values;
+ }
+
+ /**
+ * @param values The values to set.
+ */
+ public void setValues(Vector values) {
+ this.values = values;
+ }
+
+ /**
* Returns the value of this property
*/
public Object get() {
Index: CssBackgroundColorCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBackgroundColorCSS2.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssBackgroundColorCSS2.java 23 Aug 2005 16:23:12 -0000 1.1
+++ CssBackgroundColorCSS2.java 1 Sep 2005 11:51:21 -0000 1.2
@@ -6,6 +6,10 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.2 2005/09/01 11:51:21 ylafon
+ * From Jean-Guilhem Rouel:
+ * CSS 2.1 first implementation
+ *
* Revision 1.1 2005/08/23 16:23:12 ylafon
* Patch by Jean-Guilhem Rouel
*
@@ -84,7 +88,7 @@
CssValue color;
- static CssIdent transparent = new CssIdent("transparent");
+ protected static CssIdent transparent = new CssIdent("transparent");
/**
* Create a new CssBackgroundColorCSS2
@@ -132,9 +136,16 @@
public CssBackgroundColorCSS2(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
- }
+ }
/**
+ * @param color The color to set.
+ */
+ public void setColor(CssValue color) {
+ this.color = color;
+ }
+
+ /**
* Returns the value of this property
*/
public Object get() {
Index: CssBorderLeftColorCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderLeftColorCSS2.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssBorderLeftColorCSS2.java 23 Aug 2005 16:23:12 -0000 1.1
+++ CssBorderLeftColorCSS2.java 1 Sep 2005 11:51:21 -0000 1.2
@@ -6,6 +6,10 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.2 2005/09/01 11:51:21 ylafon
+ * From Jean-Guilhem Rouel:
+ * CSS 2.1 first implementation
+ *
* Revision 1.1 2005/08/23 16:23:12 ylafon
* Patch by Jean-Guilhem Rouel
*
@@ -95,6 +99,20 @@
}
/**
+ * @return Returns the face.
+ */
+ public CssBorderFaceColorCSS2 getFace() {
+ return face;
+ }
+
+ /**
+ * @param face The face to set.
+ */
+ public void setFace(CssBorderFaceColorCSS2 face) {
+ this.face = face;
+ }
+
+ /**
* Returns the value of this property
*/
public Object get() {
Index: CssBorderColorCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderColorCSS2.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssBorderColorCSS2.java 23 Aug 2005 16:23:12 -0000 1.1
+++ CssBorderColorCSS2.java 1 Sep 2005 11:51:21 -0000 1.2
@@ -6,6 +6,10 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.2 2005/09/01 11:51:21 ylafon
+ * From Jean-Guilhem Rouel:
+ * CSS 2.1 first implementation
+ *
* Revision 1.1 2005/08/23 16:23:12 ylafon
* Patch by Jean-Guilhem Rouel
*
@@ -45,6 +49,7 @@
import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
import org.w3c.css.values.CssOperator;
+import org.w3c.css.values.CssValue;
/**
* <H4>
@@ -82,6 +87,10 @@
CssBorderRightColorCSS2 right;
CssBorderLeftColorCSS2 left;
+ public CssBorderColorCSS2() {
+
+ }
+
/**
* Create a new CssBorderColorCSS2 with all four sides
*/
@@ -106,10 +115,12 @@
setByUser();
+ CssValue val;
+
switch (expression.getCount()) {
case 1:
- /*
- CssValue val = expression.getValue();
+
+ val = expression.getValue();
if (val.equals(transparent)) {
top = new CssBorderTopColorCSS2();
top.face.face = transparent;
@@ -118,56 +129,63 @@
top = new CssBorderTopColorCSS2();
top.face.face = inherit;
expression.next();
- } else{*/
- top = new CssBorderTopColorCSS2(ac, expression);
- bottom = new CssBorderBottomColorCSS2((CssBorderFaceColorCSS2) top.get());
- right = new CssBorderRightColorCSS2((CssBorderFaceColorCSS2) top.get());
- left = new CssBorderLeftColorCSS2((CssBorderFaceColorCSS2) top.get());
+ } else{
+ top = new CssBorderTopColorCSS2(ac, expression);
+// bottom = new CssBorderBottomColorCSS2((CssBorderFaceColorCSS2) top.get());
+// right = new CssBorderRightColorCSS2((CssBorderFaceColorCSS2) top.get());
+// left = new CssBorderLeftColorCSS2((CssBorderFaceColorCSS2) top.get());
+ }
break;
case 2:
if (expression.getOperator() != SPACE)
throw new InvalidParamException("operator",
((new Character(expression.getOperator())).toString()),
ac);
- if(expression.getValue().equals(inherit)) {
+ val = expression.getValue();
+ if(val.equals(inherit) || val.equals(transparent)) {
throw new InvalidParamException("unrecognize", ac);
}
top = new CssBorderTopColorCSS2(ac, expression);
- if(expression.getValue().equals(inherit)) {
+ val = expression.getValue();
+ if(val.equals(inherit) || val.equals(transparent)) {
throw new InvalidParamException("unrecognize", ac);
}
right = new CssBorderRightColorCSS2(ac, expression);
- bottom = new CssBorderBottomColorCSS2((CssBorderFaceColorCSS2) top.get());
- left = new CssBorderLeftColorCSS2((CssBorderFaceColorCSS2) right.get());
+// bottom = new CssBorderBottomColorCSS2((CssBorderFaceColorCSS2) top.get());
+// left = new CssBorderLeftColorCSS2((CssBorderFaceColorCSS2) right.get());
break;
case 3:
if (expression.getOperator() != SPACE)
throw new InvalidParamException("operator",
((new Character(expression.getOperator())).toString()),
ac);
- if(expression.getValue().equals(inherit)) {
+ val = expression.getValue();
+ if(val.equals(inherit) || val.equals(transparent)) {
throw new InvalidParamException("unrecognize", ac);
}
top = new CssBorderTopColorCSS2(ac, expression);
if (expression.getOperator() != SPACE)
throw new InvalidParamException("operator",
((new Character(expression.getOperator())).toString()), ac);
- if(expression.getValue().equals(inherit)) {
+ val = expression.getValue();
+ if(val.equals(inherit) || val.equals(transparent)) {
throw new InvalidParamException("unrecognize", ac);
}
right = new CssBorderRightColorCSS2(ac, expression);
- if(expression.getValue().equals(inherit)) {
+ val = expression.getValue();
+ if(val.equals(inherit) || val.equals(transparent)) {
throw new InvalidParamException("unrecognize", ac);
}
bottom = new CssBorderBottomColorCSS2(ac, expression);
- left = new CssBorderLeftColorCSS2((CssBorderFaceColorCSS2) right.get());
+// left = new CssBorderLeftColorCSS2((CssBorderFaceColorCSS2) right.get());
break;
case 4:
if (expression.getOperator() != SPACE)
throw new InvalidParamException("operator",
((new Character(expression.getOperator())).toString()),
ac);
- if(expression.getValue().equals(inherit)) {
+ val = expression.getValue();
+ if(val.equals(inherit) || val.equals(transparent)) {
throw new InvalidParamException("unrecognize", ac);
}
top = new CssBorderTopColorCSS2(ac, expression);
@@ -175,7 +193,8 @@
throw new InvalidParamException("operator",
((new Character(expression.getOperator())).toString()),
ac);
- if(expression.getValue().equals(inherit)) {
+ val = expression.getValue();
+ if(val.equals(inherit) || val.equals(transparent)) {
throw new InvalidParamException("unrecognize", ac);
}
right = new CssBorderRightColorCSS2(ac, expression);
@@ -183,11 +202,13 @@
throw new InvalidParamException("operator",
((new Character(expression.getOperator())).toString()),
ac);
- if(expression.getValue().equals(inherit)) {
+ val = expression.getValue();
+ if(val.equals(inherit) || val.equals(transparent)) {
throw new InvalidParamException("unrecognize", ac);
}
bottom = new CssBorderBottomColorCSS2(ac, expression);
- if(expression.getValue().equals(inherit)) {
+ val = expression.getValue();
+ if(val.equals(inherit) || val.equals(transparent)) {
throw new InvalidParamException("unrecognize", ac);
}
left = new CssBorderLeftColorCSS2(ac, expression);
@@ -205,6 +226,62 @@
}
/**
+ * @return Returns the bottom.
+ */
+ public CssBorderBottomColorCSS2 getBottom() {
+ return bottom;
+ }
+
+ /**
+ * @param bottom The bottom to set.
+ */
+ public void setBottom(CssBorderBottomColorCSS2 bottom) {
+ this.bottom = bottom;
+ }
+
+ /**
+ * @return Returns the left.
+ */
+ public CssBorderLeftColorCSS2 getLeft() {
+ return left;
+ }
+
+ /**
+ * @param left The left to set.
+ */
+ public void setLeft(CssBorderLeftColorCSS2 left) {
+ this.left = left;
+ }
+
+ /**
+ * @return Returns the right.
+ */
+ public CssBorderRightColorCSS2 getRight() {
+ return right;
+ }
+
+ /**
+ * @param right The right to set.
+ */
+ public void setRight(CssBorderRightColorCSS2 right) {
+ this.right = right;
+ }
+
+ /**
+ * @return Returns the top.
+ */
+ public CssBorderTopColorCSS2 getTop() {
+ return top;
+ }
+
+ /**
+ * @param top The top to set.
+ */
+ public void setTop(CssBorderTopColorCSS2 top) {
+ this.top = top;
+ }
+
+ /**
* Returns the value of this property
*/
public Object get() {
@@ -222,7 +299,7 @@
* Returns a string representation of the object.
*/
public String toString() {
- /*String ret = "";
+ String ret = "";
if(top != null) {
ret += top + " ";
}
@@ -235,8 +312,8 @@
if(left != null) {
ret += left;
}
- return ret.trim();*/
-
+ return ret.trim();
+ /*
if (right.face.equals(left.face)) {
if (top.face.equals(bottom.face)) {
if (top.face.equals(right.face)) {
@@ -250,7 +327,7 @@
} else {
return top + " " + right + " " + bottom + " " + left;
}
-
+ */
}
/**
Index: CssBorderTopCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderTopCSS2.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssBorderTopCSS2.java 23 Aug 2005 16:23:12 -0000 1.1
+++ CssBorderTopCSS2.java 1 Sep 2005 11:51:21 -0000 1.2
@@ -6,6 +6,10 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.2 2005/09/01 11:51:21 ylafon
+ * From Jean-Guilhem Rouel:
+ * CSS 2.1 first implementation
+ *
* Revision 1.1 2005/08/23 16:23:12 ylafon
* Patch by Jean-Guilhem Rouel
*
@@ -182,6 +186,48 @@
}
/**
+ * @return Returns the color.
+ */
+ public CssBorderTopColorCSS2 getColor2() {
+ return color;
+ }
+
+ /**
+ * @return Returns the style.
+ */
+ public CssBorderTopStyleCSS2 getStyle2() {
+ return style;
+ }
+
+ /**
+ * @return Returns the width.
+ */
+ public CssBorderTopWidthCSS2 getWidth2() {
+ return width;
+ }
+
+ /**
+ * @param color The color to set.
+ */
+ public void setColor(CssBorderTopColorCSS2 color) {
+ this.color = color;
+ }
+
+ /**
+ * @param style The style to set.
+ */
+ public void setStyle(CssBorderTopStyleCSS2 style) {
+ this.style = style;
+ }
+
+ /**
+ * @param width The width to set.
+ */
+ public void setWidth(CssBorderTopWidthCSS2 width) {
+ this.width = width;
+ }
+
+ /**
* Returns the value of this property
*/
public Object get() {
Index: CssDisplayCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssDisplayCSS2.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssDisplayCSS2.java 23 Aug 2005 16:23:12 -0000 1.1
+++ CssDisplayCSS2.java 1 Sep 2005 11:51:21 -0000 1.2
@@ -6,6 +6,10 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.2 2005/09/01 11:51:21 ylafon
+ * From Jean-Guilhem Rouel:
+ * CSS 2.1 first implementation
+ *
* Revision 1.1 2005/08/23 16:23:12 ylafon
* Patch by Jean-Guilhem Rouel
*
@@ -150,9 +154,23 @@
public CssDisplayCSS2(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
- }
+ }
/**
+ * @return Returns the value.
+ */
+ public int getValue() {
+ return value;
+ }
+
+ /**
+ * @param value The value to set.
+ */
+ public void setValue(int value) {
+ this.value = value;
+ }
+
+ /**
* Returns the value of this property
*/
public Object get() {
Index: CssBackgroundPositionCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBackgroundPositionCSS2.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBackgroundPositionCSS2.java 29 Aug 2005 09:52:21 -0000 1.3
+++ CssBackgroundPositionCSS2.java 1 Sep 2005 11:51:21 -0000 1.4
@@ -6,6 +6,10 @@
// Please first read the full copyright statement in file COPYRIGHT.html
/*
* $Log$
+ * Revision 1.4 2005/09/01 11:51:21 ylafon
+ * From Jean-Guilhem Rouel:
+ * CSS 2.1 first implementation
+ *
* Revision 1.3 2005/08/29 09:52:21 ylafon
* Jean-Guilhem Rouel: Fixes issues with the background property
*
@@ -241,26 +245,9 @@
else {
first = val;
}
- }
- // a keyword and a percentage/length
- else if(next instanceof CssLength || next instanceof CssPercentage
- || next instanceof CssNumber) {
- if(isHorizontal(index1)) {
- if(next instanceof CssNumber) {
- next = ((CssNumber) next).getLength();
- }
- first = val;
- second = next;
- }
- // if the keyword is the first value, it can only be an
- // horizontal one
- else {
- throw new InvalidParamException("incompatible",
- val, next, ac);
- }
- }
+ }
// only one value
- else if(next == null) {
+ else if(next == null || !check) {
first = val;
}
// the second value is invalid
@@ -268,35 +255,13 @@
throw new InvalidParamException("value", next,
getPropertyName(), ac);
}
- else {
- first = val;
- }
}
else if(val instanceof CssLength || val instanceof CssPercentage ||
val instanceof CssNumber) {
if(val instanceof CssNumber) {
val = ((CssNumber) val).getLength();
}
- // a percentage/length and an keyword
- if(next instanceof CssIdent) {
- int index = IndexOfIdent((String) next.get());
- if(check && index == -1) {
- throw new InvalidParamException("value", next, "background-position", ac);
- }
- // the keyword must be a vertical one
- if(isVertical(index)) {
- first = val;
- second = next;
- }
- else if(check) {
- throw new InvalidParamException("incompatible",
- val, next, ac);
- }
- else {
- first = val;
- }
- }
- else if(next instanceof CssLength || next instanceof CssPercentage
+ if(next instanceof CssLength || next instanceof CssPercentage
|| next instanceof CssNumber) {
if(next instanceof CssNumber) {
next = ((CssNumber) next).getLength();
@@ -311,7 +276,7 @@
throw new InvalidParamException("incompatible", val, next, ac);
}
}
- else if(check){
+ else if(check) {
throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
@@ -403,12 +368,12 @@
}*/
}
- private boolean isHorizontal(int index) {
+ protected boolean isHorizontal(int index) {
return index == POSITION_LEFT || index == POSITION_RIGHT ||
index == POSITION_CENTER;
}
- private boolean isVertical(int index) {
+ protected boolean isVertical(int index) {
return index == POSITION_TOP || index == POSITION_BOTTOM ||
index == POSITION_CENTER;
}
@@ -419,6 +384,34 @@
}
/**
+ * @return Returns the first.
+ */
+ public CssValue getFirst() {
+ return first;
+ }
+
+ /**
+ * @param first The first to set.
+ */
+ public void setFirst(CssValue first) {
+ this.first = first;
+ }
+
+ /**
+ * @return Returns the second.
+ */
+ public CssValue getSecond() {
+ return second;
+ }
+
+ /**
+ * @param second The second to set.
+ */
+ public void setSecond(CssValue second) {
+ this.second = second;
+ }
+
+ /**
* Returns the value of this property
*/
public Object get() {
@@ -534,7 +527,7 @@
return first.equals(DefaultValue0) && second.equals(DefaultValue0);
}
- private int IndexOfIdent(String ident) {
+ protected int IndexOfIdent(String ident) {
int hash = ident.hashCode();
for (int i = 0; i < POSITION.length; i++)
if (hash_values[i] == hash)
Received on Thursday, 1 September 2005 11:51:44 UTC