- From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
- Date: Wed, 14 Sep 2005 15:15:00 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/properties/css2/table
In directory hutz:/tmp/cvs-serv9389/org/w3c/css/properties/css2/table
Modified Files:
BorderCollapse.java BorderCollapseATSC.java BorderSpacing.java
BorderSpacingATSC.java CaptionSide.java ColumnSpan.java
ColumnSpanATSC.java EmptyCells.java EmptyCellsATSC.java
RowSpan.java RowSpanATSC.java SpeakHeader.java
SpeakHeaderATSC.java TableLayout.java TableLayoutATSC.java
TableProperties.java
Log Message:
>From Jean-Guilhem Rouel (again!)
Reformatting of code
Fix for bug 774 [1] (even more warnings)
Fix for bug 768 [2]
Modification of the soap output format (each warning list and error list has
the URI it refers to)
[1] http://www.w3.org/Bugs/Public/show_bug.cgi?id=774
[2] http://www.w3.org/Bugs/Public/show_bug.cgi?id=768
Index: RowSpanATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css2/table/RowSpanATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- RowSpanATSC.java 23 Aug 2005 16:33:50 -0000 1.1
+++ RowSpanATSC.java 14 Sep 2005 15:14:58 -0000 1.2
@@ -21,29 +21,29 @@
/**
*/
public class RowSpanATSC extends TableProperty {
-
+
CssValue value;
-
+
/**
* Create a new RowSpanATSC
- */
+ */
public RowSpanATSC() {
value = new CssNumber(null, 1);
}
-
+
/**
* Creates a new CssRowSpanATSC
*
* @param expression the expression of the size
* @exception InvalidParamException The expression is incorrect
- */
+ */
public RowSpanATSC(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
setByUser();
@@ -59,27 +59,27 @@
expression.next();
return;
} else {
- throw new InvalidParamException("integer",
- val.toString(),
+ throw new InvalidParamException("integer",
+ val.toString(),
getPropertyName(), ac);
}
- }
-
+ }
+
throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
}
-
- public RowSpanATSC(ApplContext ac, CssExpression expression)
+
+ public RowSpanATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value
- */
+ */
public Object get() {
return value;
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -87,22 +87,22 @@
public boolean isSoftlyInherited() {
return value == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
-
+
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "row-span";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -115,13 +115,13 @@
}
style0.rowSpanATSC = 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 ((Css2Style) style).getRowSpanATSC();
@@ -129,20 +129,20 @@
return ((Css2Style) style).rowSpanATSC;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
if (value == null) {
- return (property instanceof RowSpanATSC &&
+ return (property instanceof RowSpanATSC &&
((RowSpanATSC) property).value == value);
} else {
- return (property instanceof RowSpanATSC &&
+ return (property instanceof RowSpanATSC &&
((RowSpanATSC) property).value.equals(value));
}
}
-
+
}
Index: TableProperties.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css2/table/TableProperties.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- TableProperties.java 23 Aug 2005 16:33:50 -0000 1.1
+++ TableProperties.java 14 Sep 2005 15:14:58 -0000 1.2
@@ -20,11 +20,11 @@
public static String getString(CssProperty property, String prop) {
return properties.getProperty(property.getPropertyName() + "." + prop);
}
-
+
public static boolean getInheritance(CssProperty property) {
return getString(property, "inherited").equals("true");
}
-
+
static {
properties = new Utf8Properties();
try {
Index: BorderSpacingATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css2/table/BorderSpacingATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- BorderSpacingATSC.java 23 Aug 2005 16:33:50 -0000 1.1
+++ BorderSpacingATSC.java 14 Sep 2005 15:14:58 -0000 1.2
@@ -23,30 +23,30 @@
/**
*/
public class BorderSpacingATSC extends TableProperty implements CssOperator {
-
+
CssValue value;
CssLength second;
/**
* Create a new BorderSpacingATSC
- */
+ */
public BorderSpacingATSC() {
}
-
+
/**
* Creates a new CssBorderSpacingATSC
*
* @param expression the expression of the size
* @exception InvalidParamException The expression is incorrect
- */
+ */
public BorderSpacingATSC(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 2) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
CssLength le = getLength(val);
setByUser();
@@ -72,28 +72,28 @@
return;
}
}
-
+
} else {
- throw new InvalidParamException("value",
- val.toString(),
+ throw new InvalidParamException("value",
+ val.toString(),
getPropertyName(), ac);
}
expression.next();
}
-
- public BorderSpacingATSC(ApplContext ac, CssExpression expression)
+
+ public BorderSpacingATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value
- */
+ */
public Object get() {
return value;
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -101,7 +101,7 @@
public boolean isSoftlyInherited() {
return value == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -112,15 +112,15 @@
return value.toString();
}
}
-
-
+
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "border-spacing";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -133,13 +133,13 @@
}
style0.borderSpacingATSC = 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 ((Css2Style) style).getBorderSpacingATSC();
@@ -147,22 +147,22 @@
return ((Css2Style) style).borderSpacingATSC;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
if (value == null) {
- return (property instanceof BorderSpacingATSC &&
+ return (property instanceof BorderSpacingATSC &&
((BorderSpacingATSC) property).value == value);
} else {
- return (property instanceof BorderSpacingATSC &&
+ return (property instanceof BorderSpacingATSC &&
((BorderSpacingATSC) property).value.equals(value));
}
}
-
+
CssLength getLength(CssValue val) throws InvalidParamException {
if (val instanceof CssLength) {
return (CssLength) val;
Index: RowSpan.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css2/table/RowSpan.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- RowSpan.java 23 Aug 2005 16:33:50 -0000 1.1
+++ RowSpan.java 14 Sep 2005 15:14:58 -0000 1.2
@@ -21,29 +21,29 @@
/**
*/
public class RowSpan extends TableProperty {
-
+
CssValue value;
-
+
/**
* Create a new RowSpan
- */
+ */
public RowSpan() {
value = new CssNumber(null, 1);
}
-
+
/**
* Creates a new CssRowSpan
*
* @param expression the expression of the size
* @exception InvalidParamException The expression is incorrect
- */
+ */
public RowSpan(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
setByUser();
@@ -57,27 +57,27 @@
expression.next();
return;
} else {
- throw new InvalidParamException("integer",
- val.toString(),
+ throw new InvalidParamException("integer",
+ val.toString(),
getPropertyName(), ac);
}
- }
-
+ }
+
throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
}
-
- public RowSpan(ApplContext ac, CssExpression expression)
+
+ public RowSpan(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value
- */
+ */
public Object get() {
return value;
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -85,22 +85,22 @@
public boolean isSoftlyInherited() {
return value == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
-
+
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "row-span";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -113,13 +113,13 @@
}
style0.rowSpan = 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 ((Css2Style) style).getRowSpan();
@@ -127,20 +127,20 @@
return ((Css2Style) style).rowSpan;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
if (value == null) {
- return (property instanceof RowSpan &&
+ return (property instanceof RowSpan &&
((RowSpan) property).value == value);
} else {
- return (property instanceof RowSpan &&
+ return (property instanceof RowSpan &&
((RowSpan) property).value.equals(value));
}
}
-
+
}
Index: BorderCollapse.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css2/table/BorderCollapse.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- BorderCollapse.java 23 Aug 2005 16:33:50 -0000 1.1
+++ BorderCollapse.java 14 Sep 2005 15:14:58 -0000 1.2
@@ -21,32 +21,32 @@
/**
*/
public class BorderCollapse extends TableProperty {
-
+
CssValue value;
-
+
private static CssIdent collapse = new CssIdent("collapse");
private static CssIdent separate = new CssIdent("separate");
/**
* Create a new BorderCollapse
- */
+ */
public BorderCollapse() {
value = collapse;
}
-
+
/**
* Creates a new CssBorderCollapse
*
* @param expression the expression of the size
* @exception InvalidParamException The expression is incorrect
- */
+ */
public BorderCollapse(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
setByUser();
@@ -57,26 +57,26 @@
} else if (val.equals(separate)) {
value = separate;
} else {
- throw new InvalidParamException("value",
- val.toString(),
+ throw new InvalidParamException("value",
+ val.toString(),
getPropertyName(), ac);
}
expression.next();
}
-
- public BorderCollapse(ApplContext ac, CssExpression expression)
+
+ public BorderCollapse(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value
- */
+ */
public Object get() {
return value;
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -84,22 +84,22 @@
public boolean isSoftlyInherited() {
return value == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
-
+
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "border-collapse";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -112,13 +112,13 @@
}
style0.borderCollapse = 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 ((Css2Style) style).getBorderCollapse();
@@ -126,20 +126,20 @@
return ((Css2Style) style).borderCollapse;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
if (value == null) {
- return (property instanceof BorderCollapse &&
+ return (property instanceof BorderCollapse &&
((BorderCollapse) property).value == value);
} else {
- return (property instanceof BorderCollapse &&
+ return (property instanceof BorderCollapse &&
((BorderCollapse) property).value.equals(value));
}
}
-
+
}
Index: BorderCollapseATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css2/table/BorderCollapseATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- BorderCollapseATSC.java 23 Aug 2005 16:33:50 -0000 1.1
+++ BorderCollapseATSC.java 14 Sep 2005 15:14:58 -0000 1.2
@@ -21,32 +21,32 @@
/**
*/
public class BorderCollapseATSC extends TableProperty {
-
+
CssValue value;
-
+
private static CssIdent collapse = new CssIdent("collapse");
private static CssIdent separate = new CssIdent("separate");
/**
* Create a new BorderCollapseATSC
- */
+ */
public BorderCollapseATSC() {
value = collapse;
}
-
+
/**
* Creates a new CssBorderCollapseATSC
*
* @param expression the expression of the size
* @exception InvalidParamException The expression is incorrect
- */
+ */
public BorderCollapseATSC(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
setByUser();
@@ -59,26 +59,26 @@
} else if (val.equals(separate)) {
value = separate;
} else {
- throw new InvalidParamException("value",
- val.toString(),
+ throw new InvalidParamException("value",
+ val.toString(),
getPropertyName(), ac);
}
expression.next();
}
-
- public BorderCollapseATSC(ApplContext ac, CssExpression expression)
+
+ public BorderCollapseATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value
- */
+ */
public Object get() {
return value;
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -86,22 +86,22 @@
public boolean isSoftlyInherited() {
return value == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
-
+
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "border-collapse";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -114,13 +114,13 @@
}
style0.borderCollapseATSC = 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 ((Css2Style) style).getBorderCollapseATSC();
@@ -128,20 +128,20 @@
return ((Css2Style) style).borderCollapseATSC;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
if (value == null) {
- return (property instanceof BorderCollapseATSC &&
+ return (property instanceof BorderCollapseATSC &&
((BorderCollapseATSC) property).value == value);
} else {
- return (property instanceof BorderCollapseATSC &&
+ return (property instanceof BorderCollapseATSC &&
((BorderCollapseATSC) property).value.equals(value));
}
}
-
+
}
Index: TableLayout.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css2/table/TableLayout.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- TableLayout.java 23 Aug 2005 16:33:50 -0000 1.1
+++ TableLayout.java 14 Sep 2005 15:14:58 -0000 1.2
@@ -21,32 +21,32 @@
/**
*/
public class TableLayout extends TableProperty {
-
+
CssValue value;
-
+
private static CssIdent auto = new CssIdent("auto");
private static CssIdent fixed = new CssIdent("fixed");
/**
* Create a new TableLayout
- */
+ */
public TableLayout() {
value = auto;
}
-
+
/**
* Creates a new CssTableLayout
*
* @param expression the expression of the size
* @exception InvalidParamException The expression is incorrect
- */
+ */
public TableLayout(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
setByUser();
@@ -57,26 +57,26 @@
} else if (val.equals(fixed)) {
value = fixed;
} else {
- throw new InvalidParamException("value",
- val.toString(),
+ throw new InvalidParamException("value",
+ val.toString(),
getPropertyName(), ac);
}
expression.next();
}
-
- public TableLayout(ApplContext ac, CssExpression expression)
+
+ public TableLayout(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value
- */
+ */
public Object get() {
return value;
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -84,22 +84,22 @@
public boolean isSoftlyInherited() {
return value == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
-
+
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "table-layout";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -112,13 +112,13 @@
}
style0.tableLayout = 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 ((Css2Style) style).getTableLayout();
@@ -126,20 +126,20 @@
return ((Css2Style) style).tableLayout;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
if (value == null) {
- return (property instanceof TableLayout &&
+ return (property instanceof TableLayout &&
((TableLayout) property).value == value);
} else {
- return (property instanceof TableLayout &&
+ return (property instanceof TableLayout &&
((TableLayout) property).value.equals(value));
}
}
-
+
}
Index: BorderSpacing.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css2/table/BorderSpacing.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- BorderSpacing.java 23 Aug 2005 16:33:50 -0000 1.1
+++ BorderSpacing.java 14 Sep 2005 15:14:58 -0000 1.2
@@ -23,30 +23,30 @@
/**
*/
public class BorderSpacing extends TableProperty implements CssOperator {
-
+
CssValue value;
CssLength second;
/**
* Create a new BorderSpacing
- */
+ */
public BorderSpacing() {
}
-
+
/**
* Creates a new CssBorderSpacing
*
* @param expression the expression of the size
* @exception InvalidParamException The expression is incorrect
- */
+ */
public BorderSpacing(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 2) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
CssLength le = getLength(val);
setByUser();
@@ -58,8 +58,8 @@
value = inherit;
} else if (le != null) {
value = le;
- if (expression.getOperator() == SPACE) {
- expression.next();
+ if (expression.getOperator() == SPACE) {
+ expression.next();
val = expression.getValue();
if(val != null && val.equals(inherit)) {
throw new InvalidParamException("unrecognize", ac);
@@ -71,28 +71,28 @@
return;
}
}
-
+
} else {
- throw new InvalidParamException("value",
- val.toString(),
+ throw new InvalidParamException("value",
+ val.toString(),
getPropertyName(), ac);
}
expression.next();
}
-
- public BorderSpacing(ApplContext ac, CssExpression expression)
+
+ public BorderSpacing(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value
- */
+ */
public Object get() {
return value;
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -100,7 +100,7 @@
public boolean isSoftlyInherited() {
return value == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -111,15 +111,15 @@
return value.toString();
}
}
-
-
+
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "border-spacing";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -132,13 +132,13 @@
}
style0.borderSpacing = 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 ((Css2Style) style).getBorderSpacing();
@@ -146,22 +146,22 @@
return ((Css2Style) style).borderSpacing;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
if (value == null) {
- return (property instanceof BorderSpacing &&
+ return (property instanceof BorderSpacing &&
((BorderSpacing) property).value == value);
} else {
- return (property instanceof BorderSpacing &&
+ return (property instanceof BorderSpacing &&
((BorderSpacing) property).value.equals(value));
}
}
-
+
CssLength getLength(CssValue val) throws InvalidParamException {
if (val instanceof CssLength) {
return (CssLength) val;
Index: ColumnSpanATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css2/table/ColumnSpanATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ColumnSpanATSC.java 23 Aug 2005 16:33:50 -0000 1.1
+++ ColumnSpanATSC.java 14 Sep 2005 15:14:58 -0000 1.2
@@ -21,29 +21,29 @@
/**
*/
public class ColumnSpanATSC extends TableProperty {
-
+
CssValue value;
-
+
/**
* Create a new ColumnSpanATSC
- */
+ */
public ColumnSpanATSC() {
value = new CssNumber(null, 1);
}
-
+
/**
* Creates a new CssColumnSpanATSC
*
* @param expression the expression of the size
* @exception InvalidParamException The expression is incorrect
- */
+ */
public ColumnSpanATSC(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
setByUser();
@@ -59,27 +59,27 @@
expression.next();
return;
} else {
- throw new InvalidParamException("integer",
- val.toString(),
+ throw new InvalidParamException("integer",
+ val.toString(),
getPropertyName(), ac);
}
- }
-
+ }
+
throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
}
-
- public ColumnSpanATSC(ApplContext ac, CssExpression expression)
+
+ public ColumnSpanATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value
- */
+ */
public Object get() {
return value;
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -87,22 +87,22 @@
public boolean isSoftlyInherited() {
return value == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
-
+
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "column-span";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -115,13 +115,13 @@
}
style0.columnSpanATSC = 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 ((Css2Style) style).getColumnSpanATSC();
@@ -129,20 +129,20 @@
return ((Css2Style) style).columnSpanATSC;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
if (value == null) {
- return (property instanceof ColumnSpanATSC &&
+ return (property instanceof ColumnSpanATSC &&
((ColumnSpanATSC) property).value == value);
} else {
- return (property instanceof ColumnSpanATSC &&
+ return (property instanceof ColumnSpanATSC &&
((ColumnSpanATSC) property).value.equals(value));
}
}
-
+
}
Index: SpeakHeaderATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css2/table/SpeakHeaderATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- SpeakHeaderATSC.java 23 Aug 2005 16:33:50 -0000 1.1
+++ SpeakHeaderATSC.java 14 Sep 2005 15:14:58 -0000 1.2
@@ -21,32 +21,32 @@
/**
*/
public class SpeakHeaderATSC extends TableProperty {
-
+
CssValue value;
-
+
private static CssIdent once = new CssIdent("once");
private static CssIdent always = new CssIdent("always");
/**
* Create a new SpeakHeaderATSC
- */
+ */
public SpeakHeaderATSC() {
value = once;
}
-
+
/**
* Creates a new CssSpeakHeaderATSC
*
* @param expression the expression of the size
* @exception InvalidParamException The expression is incorrect
- */
+ */
public SpeakHeaderATSC(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
setByUser();
@@ -59,26 +59,26 @@
} else if (val.equals(always)) {
value = always;
} else {
- throw new InvalidParamException("value",
- val.toString(),
+ throw new InvalidParamException("value",
+ val.toString(),
getPropertyName(), ac);
}
expression.next();
}
-
- public SpeakHeaderATSC(ApplContext ac, CssExpression expression)
+
+ public SpeakHeaderATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value
- */
+ */
public Object get() {
return value;
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -86,22 +86,22 @@
public boolean isSoftlyInherited() {
return value == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
-
+
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "speak-header";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -114,13 +114,13 @@
}
style0.speakHeaderATSC = 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 ((Css2Style) style).getSpeakHeaderATSC();
@@ -128,20 +128,20 @@
return ((Css2Style) style).speakHeaderATSC;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
if (value == null) {
- return (property instanceof SpeakHeaderATSC &&
+ return (property instanceof SpeakHeaderATSC &&
((SpeakHeaderATSC) property).value == value);
} else {
- return (property instanceof SpeakHeaderATSC &&
+ return (property instanceof SpeakHeaderATSC &&
((SpeakHeaderATSC) property).value.equals(value));
}
}
-
+
}
Index: ColumnSpan.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css2/table/ColumnSpan.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ColumnSpan.java 23 Aug 2005 16:33:50 -0000 1.1
+++ ColumnSpan.java 14 Sep 2005 15:14:58 -0000 1.2
@@ -21,29 +21,29 @@
/**
*/
public class ColumnSpan extends TableProperty {
-
+
CssValue value;
-
+
/**
* Create a new ColumnSpan
- */
+ */
public ColumnSpan() {
value = new CssNumber(null, 1);
}
-
+
/**
* Creates a new CssColumnSpan
*
* @param expression the expression of the size
* @exception InvalidParamException The expression is incorrect
- */
+ */
public ColumnSpan(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
setByUser();
@@ -57,27 +57,27 @@
expression.next();
return;
} else {
- throw new InvalidParamException("integer",
- val.toString(),
+ throw new InvalidParamException("integer",
+ val.toString(),
getPropertyName(), ac);
}
- }
-
+ }
+
throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
}
-
- public ColumnSpan(ApplContext ac, CssExpression expression)
+
+ public ColumnSpan(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value
- */
+ */
public Object get() {
return value;
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -85,22 +85,22 @@
public boolean isSoftlyInherited() {
return value == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
-
+
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "column-span";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -113,13 +113,13 @@
}
style0.columnSpan = 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 ((Css2Style) style).getColumnSpan();
@@ -127,20 +127,20 @@
return ((Css2Style) style).columnSpan;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
if (value == null) {
- return (property instanceof ColumnSpan &&
+ return (property instanceof ColumnSpan &&
((ColumnSpan) property).value == value);
} else {
- return (property instanceof ColumnSpan &&
+ return (property instanceof ColumnSpan &&
((ColumnSpan) property).value.equals(value));
}
}
-
+
}
Index: TableLayoutATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css2/table/TableLayoutATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- TableLayoutATSC.java 23 Aug 2005 16:33:50 -0000 1.1
+++ TableLayoutATSC.java 14 Sep 2005 15:14:58 -0000 1.2
@@ -21,32 +21,32 @@
/**
*/
public class TableLayoutATSC extends TableProperty {
-
+
CssValue value;
-
+
private static CssIdent auto = new CssIdent("auto");
private static CssIdent fixed = new CssIdent("fixed");
/**
* Create a new TableLayoutATSC
- */
+ */
public TableLayoutATSC() {
value = auto;
}
-
+
/**
* Creates a new CssTableLayoutATSC
*
* @param expression the expression of the size
* @exception InvalidParamException The expression is incorrect
- */
+ */
public TableLayoutATSC(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
setByUser();
@@ -59,26 +59,26 @@
} else if (val.equals(fixed)) {
value = fixed;
} else {
- throw new InvalidParamException("value",
- val.toString(),
+ throw new InvalidParamException("value",
+ val.toString(),
getPropertyName(), ac);
}
expression.next();
}
-
- public TableLayoutATSC(ApplContext ac, CssExpression expression)
+
+ public TableLayoutATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value
- */
+ */
public Object get() {
return value;
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -86,22 +86,22 @@
public boolean isSoftlyInherited() {
return value == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
-
+
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "table-layout";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -114,13 +114,13 @@
}
style0.tableLayoutATSC = 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 ((Css2Style) style).getTableLayoutATSC();
@@ -128,20 +128,20 @@
return ((Css2Style) style).tableLayoutATSC;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
if (value == null) {
- return (property instanceof TableLayoutATSC &&
+ return (property instanceof TableLayoutATSC &&
((TableLayoutATSC) property).value == value);
} else {
- return (property instanceof TableLayoutATSC &&
+ return (property instanceof TableLayoutATSC &&
((TableLayoutATSC) property).value.equals(value));
}
}
-
+
}
Index: SpeakHeader.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css2/table/SpeakHeader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- SpeakHeader.java 23 Aug 2005 16:33:50 -0000 1.1
+++ SpeakHeader.java 14 Sep 2005 15:14:58 -0000 1.2
@@ -21,32 +21,32 @@
/**
*/
public class SpeakHeader extends TableProperty {
-
+
CssValue value;
-
+
private static CssIdent once = new CssIdent("once");
private static CssIdent always = new CssIdent("always");
/**
* Create a new SpeakHeader
- */
+ */
public SpeakHeader() {
value = once;
}
-
+
/**
* Creates a new CssSpeakHeader
*
* @param expression the expression of the size
* @exception InvalidParamException The expression is incorrect
- */
+ */
public SpeakHeader(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
setByUser();
@@ -57,26 +57,26 @@
} else if (val.equals(always)) {
value = always;
} else {
- throw new InvalidParamException("value",
- val.toString(),
+ throw new InvalidParamException("value",
+ val.toString(),
getPropertyName(), ac);
}
expression.next();
}
-
- public SpeakHeader(ApplContext ac, CssExpression expression)
+
+ public SpeakHeader(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value
- */
+ */
public Object get() {
return value;
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -84,22 +84,22 @@
public boolean isSoftlyInherited() {
return value == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
-
+
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "speak-header";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -112,13 +112,13 @@
}
style0.speakHeader = 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 ((Css2Style) style).getSpeakHeader();
@@ -126,20 +126,20 @@
return ((Css2Style) style).speakHeader;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
if (value == null) {
- return (property instanceof SpeakHeader &&
+ return (property instanceof SpeakHeader &&
((SpeakHeader) property).value == value);
} else {
- return (property instanceof SpeakHeader &&
+ return (property instanceof SpeakHeader &&
((SpeakHeader) property).value.equals(value));
}
}
-
+
}
Index: CaptionSide.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css2/table/CaptionSide.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CaptionSide.java 1 Sep 2005 11:51:21 -0000 1.2
+++ CaptionSide.java 14 Sep 2005 15:14:58 -0000 1.3
@@ -21,9 +21,9 @@
/**
*/
public class CaptionSide extends TableProperty {
-
+
CssValue value;
-
+
protected static CssIdent top = new CssIdent("top");
protected static CssIdent bottom = new CssIdent("bottom");
protected static CssIdent right = new CssIdent("right");
@@ -31,24 +31,24 @@
/**
* Create a new CaptionSide
- */
+ */
public CaptionSide() {
value = top;
}
-
+
/**
* Creates a new CssCaptionSide
*
* @param expression the expression of the size
* @exception InvalidParamException The expression is incorrect
- */
+ */
public CaptionSide(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
setByUser();
@@ -63,19 +63,19 @@
} else if (val.equals(right)) {
value = right;
} else {
- throw new InvalidParamException("value",
- val.toString(),
+ throw new InvalidParamException("value",
+ val.toString(),
getPropertyName(), ac);
}
expression.next();
}
-
- public CaptionSide(ApplContext ac, CssExpression expression)
+
+ public CaptionSide(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* @return Returns the value.
*/
@@ -92,11 +92,11 @@
/**
* Returns the current value
- */
+ */
public Object get() {
return value;
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -104,22 +104,22 @@
public boolean isSoftlyInherited() {
return value == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
-
+
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "caption-side";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -132,13 +132,13 @@
}
style0.captionSide = 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 ((Css2Style) style).getCaptionSide();
@@ -146,20 +146,20 @@
return ((Css2Style) style).captionSide;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
if (value == null) {
- return (property instanceof CaptionSide &&
+ return (property instanceof CaptionSide &&
((CaptionSide) property).value == value);
} else {
- return (property instanceof CaptionSide &&
+ return (property instanceof CaptionSide &&
((CaptionSide) property).value.equals(value));
}
}
-
+
}
Index: EmptyCellsATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css2/table/EmptyCellsATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- EmptyCellsATSC.java 23 Aug 2005 16:33:50 -0000 1.1
+++ EmptyCellsATSC.java 14 Sep 2005 15:14:58 -0000 1.2
@@ -21,32 +21,32 @@
/**
*/
public class EmptyCellsATSC extends TableProperty {
-
+
CssValue value;
-
+
private static CssIdent show = new CssIdent("show");
private static CssIdent hide = new CssIdent("hide");
/**
* Create a new EmptyCellsATSC
- */
+ */
public EmptyCellsATSC() {
value = show;
}
-
+
/**
* Creates a new CssEmptyCellsATSC
*
* @param expression the expression of the size
* @exception InvalidParamException The expression is incorrect
- */
+ */
public EmptyCellsATSC(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
setByUser();
@@ -59,26 +59,26 @@
} else if (val.equals(hide)) {
value = hide;
} else {
- throw new InvalidParamException("value",
- val.toString(),
+ throw new InvalidParamException("value",
+ val.toString(),
getPropertyName(), ac);
}
expression.next();
}
-
- public EmptyCellsATSC(ApplContext ac, CssExpression expression)
+
+ public EmptyCellsATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value
- */
+ */
public Object get() {
return value;
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -86,22 +86,22 @@
public boolean isSoftlyInherited() {
return value == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
-
+
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "empty-cells";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -114,13 +114,13 @@
}
style0.emptyCellsATSC = 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 ((Css2Style) style).getEmptyCellsATSC();
@@ -128,20 +128,20 @@
return ((Css2Style) style).emptyCellsATSC;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
if (value == null) {
- return (property instanceof EmptyCellsATSC &&
+ return (property instanceof EmptyCellsATSC &&
((EmptyCellsATSC) property).value == value);
} else {
- return (property instanceof EmptyCellsATSC &&
+ return (property instanceof EmptyCellsATSC &&
((EmptyCellsATSC) property).value.equals(value));
}
}
-
+
}
Index: EmptyCells.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css2/table/EmptyCells.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- EmptyCells.java 23 Aug 2005 16:33:50 -0000 1.1
+++ EmptyCells.java 14 Sep 2005 15:14:58 -0000 1.2
@@ -21,32 +21,32 @@
/**
*/
public class EmptyCells extends TableProperty {
-
+
CssValue value;
-
+
private static CssIdent show = new CssIdent("show");
private static CssIdent hide = new CssIdent("hide");
/**
* Create a new EmptyCells
- */
+ */
public EmptyCells() {
value = show;
}
-
+
/**
* Creates a new CssEmptyCells
*
* @param expression the expression of the size
* @exception InvalidParamException The expression is incorrect
- */
+ */
public EmptyCells(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
setByUser();
@@ -57,26 +57,26 @@
} else if (val.equals(hide)) {
value = hide;
} else {
- throw new InvalidParamException("value",
- val.toString(),
+ throw new InvalidParamException("value",
+ val.toString(),
getPropertyName(), ac);
}
expression.next();
}
-
- public EmptyCells(ApplContext ac, CssExpression expression)
+
+ public EmptyCells(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value
- */
+ */
public Object get() {
return value;
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -84,22 +84,22 @@
public boolean isSoftlyInherited() {
return value == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
-
+
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "empty-cells";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -112,13 +112,13 @@
}
style0.emptyCells = 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 ((Css2Style) style).getEmptyCells();
@@ -126,20 +126,20 @@
return ((Css2Style) style).emptyCells;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
if (value == null) {
- return (property instanceof EmptyCells &&
+ return (property instanceof EmptyCells &&
((EmptyCells) property).value == value);
} else {
- return (property instanceof EmptyCells &&
+ return (property instanceof EmptyCells &&
((EmptyCells) property).value.equals(value));
}
}
-
+
}
Received on Wednesday, 14 September 2005 15:16:45 UTC