- From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
- Date: Wed, 14 Sep 2005 15:14:20 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/properties/atsc
In directory hutz:/tmp/cvs-serv9389/org/w3c/css/properties/atsc
Modified Files:
ATSCColor.java ATSCDynamicRefresh.java ATSCNavDown.java
ATSCNavIndex.java ATSCNavLeft.java ATSCNavRight.java
ATSCNavUp.java ATSCStyle.java AscentATSC.java
BaselineATSC.java BboxATSC.java CapHeightATSC.java
CenterlineATSC.java CssBackgroundATSC.java
CssBackgroundAttachmentATSC.java CssBackgroundColorATSC.java
CssBackgroundImageATSC.java CssBackgroundPositionATSC.java
CssBackgroundRepeatATSC.java CssBorderATSC.java
CssBorderBottomATSC.java CssBorderBottomColorATSC.java
CssBorderBottomStyleATSC.java CssBorderBottomWidthATSC.java
CssBorderColorATSC.java CssBorderFaceColorATSC.java
CssBorderFaceStyleATSC.java CssBorderFaceWidthATSC.java
CssBorderLeftATSC.java CssBorderLeftColorATSC.java
CssBorderLeftStyleATSC.java CssBorderLeftWidthATSC.java
CssBorderRightATSC.java CssBorderRightColorATSC.java
CssBorderRightStyleATSC.java CssBorderRightWidthATSC.java
CssBorderStyleATSC.java CssBorderTopATSC.java
CssBorderTopColorATSC.java CssBorderTopStyleATSC.java
CssBorderTopWidthATSC.java CssBorderWidthATSC.java
DefinitionSrcATSC.java DescentATSC.java MathlineATSC.java
Panose1ATSC.java SlopeATSC.java SrcATSC.java StemhATSC.java
StemvATSC.java ToplineATSC.java UnitsPerEmATSC.java
WidthsATSC.java XHeightATSC.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: CenterlineATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/CenterlineATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CenterlineATSC.java 23 Aug 2005 16:23:11 -0000 1.1
+++ CenterlineATSC.java 14 Sep 2005 15:14:18 -0000 1.2
@@ -19,29 +19,29 @@
/**
*/
public class CenterlineATSC extends CssProperty {
-
+
CssValue value;
-
+
/**
* Create a new CenterlineATSC
*/
public CenterlineATSC() {
// nothing to do
}
-
+
/**
* Creates a new CenterlineATSC
*
* @param expression the unicode em
* @exception InvalidParamException values are incorrect
- */
+ */
public CenterlineATSC(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() >1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
setByUser();
@@ -51,37 +51,37 @@
value = val;
expression.next();
} else {
- throw new InvalidParamException("value", expression.getValue(),
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
}
-
+
public CenterlineATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value
- */
+ */
public Object get() {
return value;
}
-
+
/**
* Returns a string representation of the object.
*/
- public String toString() {
+ public String toString() {
return value.toString();
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "centerline";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -94,13 +94,13 @@
}
style0.centerlineATSC = 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 ((ATSCStyle) style).getCenterlineATSC();
@@ -108,23 +108,23 @@
return ((ATSCStyle) style).centerlineATSC;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
// @@TODO
return false;
}
-
+
/**
* 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 false;
}
-
+
}
Index: XHeightATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/XHeightATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- XHeightATSC.java 23 Aug 2005 16:23:11 -0000 1.1
+++ XHeightATSC.java 14 Sep 2005 15:14:18 -0000 1.2
@@ -19,29 +19,29 @@
/**
*/
public class XHeightATSC extends CssProperty {
-
+
CssValue value;
-
+
/**
* Create a new XHeightATSC
*/
public XHeightATSC() {
// nothing to do
}
-
+
/**
* Creates a new XHeightATSC
*
* @param expression the unicode em
* @exception InvalidParamException values are incorrect
- */
+ */
public XHeightATSC(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
setByUser();
@@ -51,37 +51,37 @@
value = val;
expression.next();
} else {
- throw new InvalidParamException("value", expression.getValue(),
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
}
-
+
public XHeightATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value
- */
+ */
public Object get() {
return value;
}
-
+
/**
* Returns a string representation of the object.
*/
- public String toString() {
+ public String toString() {
return value.toString();
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "x-height";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -94,13 +94,13 @@
}
style0.xHeightATSC = 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 ((ATSCStyle) style).getXHeightATSC();
@@ -108,23 +108,23 @@
return ((ATSCStyle) style).xHeightATSC;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
// @@TODO
return false;
}
-
+
/**
* 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 false;
}
-
+
}
Index: CssBorderLeftATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/CssBorderLeftATSC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderLeftATSC.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorderLeftATSC.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -51,65 +51,65 @@
* @version $Revision$
*/
public class CssBorderLeftATSC extends CssProperty implements CssOperator {
-
+
CssBorderLeftWidthATSC width;
CssBorderLeftStyleATSC style;
CssBorderLeftColorATSC color;
-
+
/**
* Create a new CssBorderLeftATSC
*/
public CssBorderLeftATSC() {
- }
-
+ }
+
/**
* Create a new CssBorderLeftATSC
*
* @param expression The expression for this property
* @exception InvalidParamException The expression is incorrect
- */
+ */
public CssBorderLeftATSC(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
CssValue val = null;
char op = SPACE;
boolean find = true;
-
+
if(check && expression.getCount() > 3) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
boolean manyValues = (expression.getCount() > 1);
-
+
setByUser();
-
+
while (find) {
find = false;
- val = expression.getValue();
- op = expression.getOperator();
+ val = expression.getValue();
+ op = expression.getOperator();
if (val == null)
break;
-
+
// if there are many values, we can't have inherit as one of them
if(manyValues && val.equals(inherit)) {
throw new InvalidParamException("unrecognize", null, null, ac);
}
-
+
if (op != SPACE)
- throw new InvalidParamException("operator",
+ throw new InvalidParamException("operator",
((new Character(op)).toString()),
- ac);
+ ac);
if (width == null) {
try {
- width = new CssBorderLeftWidthATSC(ac, expression);
+ width = new CssBorderLeftWidthATSC(ac, expression);
find = true;
} catch(InvalidParamException e){
- // nothing to do, style will test this value
+ // nothing to do, style will test this value
}
}
if (!find && style == null) {
try {
- style = new CssBorderLeftStyleATSC(ac, expression);
+ style = new CssBorderLeftStyleATSC(ac, expression);
find = true;
} catch(InvalidParamException e){
// nothing to do, color will test this value
@@ -118,23 +118,23 @@
if (!find && color == null) {
// throws an exception if the value is not valid
color = new CssBorderLeftColorATSC(ac, expression);
- find = true;
+ find = true;
}
}
}
-
+
public CssBorderLeftATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return width;
}
-
+
/**
* Returns the color property
*/
@@ -145,7 +145,7 @@
return null;
}
}
-
+
/**
* Returns the width property
*/
@@ -156,7 +156,7 @@
return null;
}
}
-
+
/**
* Returns the style property
*/
@@ -167,7 +167,7 @@
return null;
}
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -190,18 +190,18 @@
}
return ret;
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "border-left";
}
-
+
/**
* Set this property to be important.
* Overrides this method for a macro
- */
+ */
public void setImportant() {
if(width != null) {
width.setImportant();
@@ -213,7 +213,7 @@
color.setImportant();
}
}
-
+
/**
* Returns true if this property is important.
* Overrides this method for a macro
@@ -223,15 +223,15 @@
(style == null || style.getImportant()) &&
(color == null || color.getImportant()));
}
-
-
+
+
/**
* Print this property.
*
* @param printer The printer.
* @see #toString()
* @see #getPropertyName()
- */
+ */
public void print(CssPrinterStyle printer) {
if ((width != null && style != null &&
color != null) &&
@@ -248,9 +248,9 @@
if (color != null)
color.print(printer);
}
-
+
}
-
+
/**
* Set the context.
* Overrides this method for a macro
@@ -270,7 +270,7 @@
color.setSelectors(selector);
}
}
-
+
/**
* Add this property to the CssStyle
*
@@ -287,13 +287,13 @@
color.addToStyle(ac, style);
}
}
-
+
/**
* 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 ((ATSCStyle) style).getBorderLeftATSC();
@@ -301,16 +301,16 @@
return ((ATSCStyle) style).cssBorderATSC.getLeft();
}
}
-
+
/**
* Update the source file and the line.
* Overrides this method for a macro
*
* @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);
+ super.setInfo(line, source);
if(width != null) {
width.setInfo(line, source);
}
@@ -321,24 +321,24 @@
color.setInfo(line, source);
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
if (property instanceof CssBorderLeftATSC) {
CssBorderLeftATSC left = (CssBorderLeftATSC) property;
- return (width.equals(left.width) && style.equals(left.style)
+ return (width.equals(left.width) && style.equals(left.style)
&& color.equals(left.color));
} else {
return false;
}
}
-
+
void check() {
- if ((style != null)
+ if ((style != null)
&& (style.face.value == 0)) {
if (width != null) {
width.face.value = new CssLength();
Index: ATSCNavRight.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/ATSCNavRight.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ATSCNavRight.java 23 Aug 2005 16:23:11 -0000 1.1
+++ ATSCNavRight.java 14 Sep 2005 15:14:18 -0000 1.2
@@ -50,11 +50,11 @@
if(check && expression.getCount() >1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
this.ac = ac;
setByUser(); // tell this property is set by the user
CssValue val = expression.getValue();
-
+
if (val instanceof CssNumber) {
navright = val;
expression.next();
@@ -74,7 +74,7 @@
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Add this property to the CssStyle.
*
Index: ATSCColor.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/ATSCColor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ATSCColor.java 8 Sep 2005 12:23:33 -0000 1.2
+++ ATSCColor.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -35,58 +35,59 @@
* @version $Revision$
*/
public class ATSCColor extends CssProperty {
-
+
CssValue color;
-
+
/**
* Create a new ATSCColor
*/
public ATSCColor() {
color = inherit;
- }
-
+ }
+
/**
* Set the value of the property
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public ATSCColor(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.equals(inherit)) {
color = inherit;
expression.next();
- } else if (val instanceof org.w3c.css.values.ATSCColor) {
+ } else if (val instanceof org.w3c.css.values.ATSCColor ||
+ val instanceof org.w3c.css.values.CssColor) {
color = val;
expression.next();
} else if (val instanceof CssIdent) {
color = new org.w3c.css.values.ATSCColor(ac, (String) val.get());
expression.next();
} else {
- throw new InvalidParamException("value", expression.getValue(),
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
}
-
+
public ATSCColor(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return color;
}
-
+
/**
* Returns the color
*/
@@ -101,7 +102,7 @@
return (org.w3c.css.values.ATSCColor) color;
}
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -109,14 +110,14 @@
public boolean isSoftlyInherited() {
return color.equals(inherit);
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return color.toString();
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -129,13 +130,13 @@
}
style0.ATSCcolor = 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 ((ATSCStyle) style).getColorATSC();
@@ -143,22 +144,22 @@
return ((ATSCStyle) style).ATSCcolor;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof ATSCColor &&
+ return (property instanceof ATSCColor &&
color.equals(((ATSCColor) property).color));
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "color";
}
-
+
}
Index: ToplineATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/ToplineATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ToplineATSC.java 23 Aug 2005 16:23:11 -0000 1.1
+++ ToplineATSC.java 14 Sep 2005 15:14:18 -0000 1.2
@@ -19,29 +19,29 @@
/**
*/
public class ToplineATSC extends CssProperty {
-
+
CssValue value;
-
+
/**
* Create a new ToplineATSC
*/
public ToplineATSC() {
// nothing to do
}
-
+
/**
* Creates a new ToplineATSC
*
* @param expression the unicode em
* @exception InvalidParamException values are incorrect
- */
+ */
public ToplineATSC(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
setByUser();
@@ -51,37 +51,37 @@
value = val;
expression.next();
} else {
- throw new InvalidParamException("value", expression.getValue(),
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
}
-
+
public ToplineATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value
- */
+ */
public Object get() {
return value;
}
-
+
/**
* Returns a string representation of the object.
*/
- public String toString() {
+ public String toString() {
return value.toString();
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "topline";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -94,13 +94,13 @@
}
style0.toplineATSC = 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 ((ATSCStyle) style).getToplineATSC();
@@ -108,23 +108,23 @@
return ((ATSCStyle) style).toplineATSC;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
// @@TODO
return false;
}
-
+
/**
* 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 false;
}
-
+
}
Index: UnitsPerEmATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/UnitsPerEmATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- UnitsPerEmATSC.java 23 Aug 2005 16:23:11 -0000 1.1
+++ UnitsPerEmATSC.java 14 Sep 2005 15:14:18 -0000 1.2
@@ -19,29 +19,29 @@
/**
*/
public class UnitsPerEmATSC extends CssProperty {
-
+
CssValue value;
-
+
/**
* Create a new UnitsPerEmATSC
*/
public UnitsPerEmATSC() {
// nothing to do
}
-
+
/**
* Creates a new UnitsPerEmATSC
*
* @param expression the unicode em
* @exception InvalidParamException values are incorrect
- */
+ */
public UnitsPerEmATSC(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
setByUser();
@@ -51,37 +51,37 @@
value = val;
expression.next();
} else {
- throw new InvalidParamException("value", expression.getValue(),
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
}
-
+
public UnitsPerEmATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value
- */
+ */
public Object get() {
return value;
}
-
+
/**
* Returns a string representation of the object.
*/
- public String toString() {
+ public String toString() {
return value.toString();
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "units-per-em";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -94,13 +94,13 @@
}
style0.unitsPerEmATSC = 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 ((ATSCStyle) style).getUnitsPerEmATSC();
@@ -108,23 +108,23 @@
return ((ATSCStyle) style).unitsPerEmATSC;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
// @@TODO
return false;
}
-
+
/**
* 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 false;
}
-
+
}
Index: CssBorderColorATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/CssBorderColorATSC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderColorATSC.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorderColorATSC.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -36,9 +36,9 @@
* If no color value is specified, the value of the 'color' property of the
* element itself will take its place:
* <PRE>
- * P {
- * color: black;
- * background: white;
+ * P {
+ * color: black;
+ * background: white;
* border: solid;
* }
* </PRE>
@@ -48,14 +48,14 @@
* @version $Revision$
*/
public class CssBorderColorATSC extends CssProperty implements CssOperator {
-
+
CssBorderTopColorATSC top;
CssBorderBottomColorATSC bottom;
CssBorderRightColorATSC right;
CssBorderLeftColorATSC left;
//private static CssIdent transparent = new CssIdent("transparent");
-
+
/**
* Create a new CssBorderColorATSC with all four sides
*/
@@ -67,19 +67,19 @@
this.bottom = bottom;
this.left = left;
this.right = right;
- }
-
+ }
+
/**
* Create a new CssBorderATSC
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssBorderColorATSC(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
setByUser();
-
+
switch (expression.getCount()) {
case 1:
/*
@@ -98,9 +98,9 @@
right = new CssBorderRightColorATSC((CssBorderFaceColorATSC) top.get());
left = new CssBorderLeftColorATSC((CssBorderFaceColorATSC) top.get());
break;
- case 2:
+ case 2:
if (expression.getOperator() != SPACE)
- throw new InvalidParamException("operator",
+ throw new InvalidParamException("operator",
((new Character(expression.getOperator())).toString()),
ac);
if(expression.getValue().equals(inherit)) {
@@ -116,15 +116,15 @@
break;
case 3:
if (expression.getOperator() != SPACE)
- throw new InvalidParamException("operator",
- ((new Character(expression.getOperator())).toString()),
+ throw new InvalidParamException("operator",
+ ((new Character(expression.getOperator())).toString()),
ac);
if(expression.getValue().equals(inherit)) {
throw new InvalidParamException("unrecognize", ac);
}
top = new CssBorderTopColorATSC(ac, expression);
if (expression.getOperator() != SPACE)
- throw new InvalidParamException("operator",
+ throw new InvalidParamException("operator",
((new Character(expression.getOperator())).toString()), ac);
if(expression.getValue().equals(inherit)) {
throw new InvalidParamException("unrecognize", ac);
@@ -138,7 +138,7 @@
break;
case 4:
if (expression.getOperator() != SPACE)
- throw new InvalidParamException("operator",
+ throw new InvalidParamException("operator",
((new Character(expression.getOperator())).toString()),
ac);
if(expression.getValue().equals(inherit)) {
@@ -146,7 +146,7 @@
}
top = new CssBorderTopColorATSC(ac, expression);
if (expression.getOperator() != SPACE)
- throw new InvalidParamException("operator",
+ throw new InvalidParamException("operator",
((new Character(expression.getOperator())).toString()),
ac);
if(expression.getValue().equals(inherit)) {
@@ -154,7 +154,7 @@
}
right = new CssBorderRightColorATSC(ac, expression);
if (expression.getOperator() != SPACE)
- throw new InvalidParamException("operator",
+ throw new InvalidParamException("operator",
((new Character(expression.getOperator())).toString()),
ac);
if(expression.getValue().equals(inherit)) {
@@ -172,26 +172,26 @@
}
}
}
-
+
public CssBorderColorATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return top;
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "border-color";
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -210,11 +210,11 @@
return top + " " + right + " " + bottom + " " + left;
}
}
-
+
/**
* Set this property to be important.
* Overrides this method for a macro
- */
+ */
public void setImportant() {
if(top != null) {
top.setImportant();
@@ -229,7 +229,7 @@
bottom.setImportant();
}
}
-
+
/**
* Returns true if this property is important.
* Overrides this method for a macro
@@ -240,14 +240,14 @@
(left == null || left.getImportant()) &&
(bottom == null || bottom.getImportant()));
}
-
+
/**
* Print this property.
*
* @param printer The printer.
* @see #toString()
* @see #getPropertyName()
- */
+ */
public void print(CssPrinterStyle printer) {
if ((top != null && right != null &&
left != null && bottom != null) &&
@@ -269,9 +269,9 @@
if (bottom != null)
bottom.print(printer);
}
-
+
}
-
+
/**
* Set the context.
* Overrides this method for a macro
@@ -294,7 +294,7 @@
left.setSelectors(selector);
}
}
-
+
/**
* Add this property to the CssStyle
*
@@ -314,25 +314,25 @@
bottom.addToStyle(ac, style);
}
}
-
+
/**
* 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) {
- throw new IllegalStateException("Can't invoke this method on the property " +
+ throw new IllegalStateException("Can't invoke this method on the property " +
getPropertyName());
}
-
+
/**
* Update the source file and the line.
* Overrides this method for a macro
*
* @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(top != null) {
@@ -348,14 +348,14 @@
bottom.setInfo(line, source);
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
return false;
}
-
+
}
Index: CssBorderRightColorATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/CssBorderRightColorATSC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderRightColorATSC.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorderRightColorATSC.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -20,28 +20,28 @@
* @version $Revision$
*/
public class CssBorderRightColorATSC extends CssProperty {
-
+
CssBorderFaceColorATSC face;
-
+
/**
* Create a new CssBorderRightColorATSC
*/
public CssBorderRightColorATSC() {
face = new CssBorderFaceColorATSC();
}
-
+
/**
* Create a new CssBorderRightColorATSC with an another CssBorderFaceColorATSC
*
* @param another The another side.
*/
public CssBorderRightColorATSC(CssBorderFaceColorATSC another) {
-
+
setByUser();
-
+
face = another;
}
-
+
/**
* Create a new CssBorderRightColorATSC
*
@@ -50,48 +50,48 @@
*/
public CssBorderRightColorATSC(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
face = new CssBorderFaceColorATSC(ac, expression);
}
-
+
public CssBorderRightColorATSC(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-right-color";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -103,13 +103,13 @@
style.addRedefinitionWarning(ac, this);
right.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 ((ATSCStyle) style).getBorderRightColorATSC();
@@ -117,22 +117,22 @@
return ((ATSCStyle) style).cssBorderATSC.getRight().color;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssBorderRightColorATSC &&
+ return (property instanceof CssBorderRightColorATSC &&
face.equals(((CssBorderRightColorATSC) property).face));
}
-
+
/**
* Print this property.
*
* @param printer The printer.
- */
+ */
public void print(CssPrinterStyle printer) {
if (!face.isDefault())
printer.print(this);
Index: CssBorderLeftWidthATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/CssBorderLeftWidthATSC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderLeftWidthATSC.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorderLeftWidthATSC.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -46,16 +46,16 @@
* @version $Revision$
*/
public class CssBorderLeftWidthATSC extends CssProperty {
-
+
CssBorderFaceWidthATSC face;
-
+
/**
* Create a new CssBorderLeftWidthATSC
*/
public CssBorderLeftWidthATSC() {
face = new CssBorderFaceWidthATSC();
}
-
+
/**
* Create a new CssBorderLeftWidthATSC with an another CssBorderFaceWidthATSC
*
@@ -63,10 +63,10 @@
*/
public CssBorderLeftWidthATSC(CssBorderFaceWidthATSC another) {
setByUser();
-
+
face = another;
}
-
+
/**
* Create a new CssBorderLeftWidthATSC
*
@@ -75,48 +75,48 @@
*/
public CssBorderLeftWidthATSC(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
face = new CssBorderFaceWidthATSC(ac, expression);
}
-
+
public CssBorderLeftWidthATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return face;
}
-
+
/**
* Return the value of this property
*/
public CssValue getValue() {
return face.getValue();
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return face.toString();
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "border-left-width";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -128,13 +128,13 @@
style.addRedefinitionWarning(ac, this);
left.width = 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 ((ATSCStyle) style).getBorderLeftWidthATSC();
@@ -142,15 +142,15 @@
return ((ATSCStyle) style).cssBorderATSC.getLeft().width;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssBorderLeftWidthATSC &&
+ return (property instanceof CssBorderLeftWidthATSC &&
face.equals(((CssBorderLeftWidthATSC) property).face));
}
-
+
}
Index: SrcATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/SrcATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- SrcATSC.java 23 Aug 2005 16:23:11 -0000 1.1
+++ SrcATSC.java 14 Sep 2005 15:14:18 -0000 1.2
@@ -24,39 +24,39 @@
/**
* @version $Revision$
*/
-public class SrcATSC extends CssProperty
+public class SrcATSC extends CssProperty
implements CssOperator {
-
+
Vector values = new Vector();
-
+
/**
* Create a new SrcATSC
*/
public SrcATSC() {
}
-
+
/**
* Create a new SrcATSC
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
- public SrcATSC(ApplContext ac, CssExpression expression, boolean check)
+ */
+ public SrcATSC(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
CssValue val;
char op;
-
+
boolean manyValues = expression.getCount() > 1;
-
+
setByUser();
do {
val = expression.getValue();
op = expression.getOperator();
-
+
if(manyValues && val.equals(inherit)) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
if (val instanceof CssURL) {
values.addElement(val);
expression.next();
@@ -75,34 +75,34 @@
values.addElement(recognizeFontFaceName(ac, (CssFunction) val));
expression.next();
} else {
- throw new InvalidParamException("value",
- val.toString(),
+ throw new InvalidParamException("value",
+ val.toString(),
getPropertyName(), ac);
}
// @@HACK
values.addElement(", ");
} while (op == COMMA);
}
-
+
public SrcATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return null;
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "src";
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -114,7 +114,7 @@
}
return ret;
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -127,13 +127,13 @@
}
style0.srcATSC = 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 ((ATSCStyle) style).getSrcATSC();
@@ -141,25 +141,25 @@
return ((ATSCStyle) style).srcATSC;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
return false;
}
-
+
/**
* 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 false;
}
-
- private CssFunction recognizeFormat(ApplContext ac, CssFunction val)
+
+ private CssFunction recognizeFormat(ApplContext ac, CssFunction val)
throws InvalidParamException {
if (val.getName().equals("format")) {
CssExpression params = val.getParameters();
@@ -169,28 +169,28 @@
op = params.getOperator();
if (params.getValue() instanceof CssString) {
// nothing
- } else {
- throw new InvalidParamException("format",
- val,
+ } else {
+ throw new InvalidParamException("format",
+ val,
getPropertyName(), ac);
}
params.next();
} while (op == COMMA);
- if (!params.end()) {
- throw new InvalidParamException("format",
- val,
+ if (!params.end()) {
+ throw new InvalidParamException("format",
+ val,
getPropertyName(), ac);
}
params.starts();
return val;
} else {
- throw new InvalidParamException("format",
- val,
+ throw new InvalidParamException("format",
+ val,
getPropertyName(), ac);
}
}
- private CssFunction recognizeFontFaceName(ApplContext ac, CssFunction func)
+ private CssFunction recognizeFontFaceName(ApplContext ac, CssFunction func)
throws InvalidParamException {
if (func.getName().equals("local")) {
CssExpression params = func.getParameters();
@@ -200,9 +200,9 @@
if (params.getValue() instanceof CssString) {
if (params.getCount() == 1) {
return func;
- } else {
- throw new InvalidParamException("local",
- func,
+ } else {
+ throw new InvalidParamException("local",
+ func,
getPropertyName(), ac);
}
}
@@ -211,23 +211,23 @@
op = params.getOperator();
if (params.getValue() instanceof CssIdent) {
// nothing
- } else {
- throw new InvalidParamException("local",
- func,
+ } else {
+ throw new InvalidParamException("local",
+ func,
getPropertyName(), ac);
}
params.next();
} while (op == COMMA);
- if (!params.end()) {
- throw new InvalidParamException("local",
- func,
+ if (!params.end()) {
+ throw new InvalidParamException("local",
+ func,
getPropertyName(), ac);
}
params.starts();
return func;
} else {
- throw new InvalidParamException("local",
- func,
+ throw new InvalidParamException("local",
+ func,
getPropertyName(), ac);
}
}
Index: ATSCStyle.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/ATSCStyle.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ATSCStyle.java 23 Aug 2005 16:23:11 -0000 1.1
+++ ATSCStyle.java 14 Sep 2005 15:14:18 -0000 1.2
@@ -45,7 +45,7 @@
CssBackgroundRepeatATSC cssBackgroundRepeatATSC;
CssBackgroundAttachmentATSC cssBackgroundAttachmentATSC;
CssBackgroundPositionATSC cssBackgroundPositionATSC;
- CssBackgroundATSC cssBackgroundATSC;
+ CssBackgroundATSC cssBackgroundATSC = new CssBackgroundATSC(); //shortcut
protected CssBorderATSC cssBorderATSC = new CssBorderATSC();
Index: CssBackgroundRepeatATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/CssBackgroundRepeatATSC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBackgroundRepeatATSC.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBackgroundRepeatATSC.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -35,7 +35,7 @@
* (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 {
+ * BODY {
* background: red url(pendant.gif);
* background-repeat: repeat-y;
* }
@@ -45,33 +45,33 @@
* @version $Revision$
*/
public class CssBackgroundRepeatATSC extends CssProperty implements CssBackgroundConstants {
-
+
int repeat;
-
+
private static int[] hash_values;
-
+
/**
* Create a new CssBackgroundRepeatATSC
*/
public CssBackgroundRepeatATSC() {
repeat = 0;
- }
-
+ }
+
/**
* Set the value of the property
* @param expression The expression for this property
* @exception InvalidParamException The expression is incorrect
- */
+ */
public CssBackgroundRepeatATSC(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 < REPEAT.length; i++) {
@@ -83,23 +83,23 @@
}
}
-
- throw new InvalidParamException("value", expression.getValue(),
+
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
-
+
public CssBackgroundRepeatATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return REPEAT[repeat];
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -107,21 +107,21 @@
public boolean isSoftlyInherited() {
return repeat == 4;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return REPEAT[repeat];
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "background-repeat";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -133,13 +133,13 @@
style.addRedefinitionWarning(ac, this);
cssBackground.repeat = 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 ((ATSCStyle) style).getBackgroundRepeatATSC();
@@ -147,25 +147,25 @@
return ((ATSCStyle) style).cssBackgroundATSC.repeat;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssBackgroundRepeatATSC &&
+ return (property instanceof CssBackgroundRepeatATSC &&
repeat == ((CssBackgroundRepeatATSC) property).repeat);
}
-
+
/**
* 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 repeat == 0;
}
-
+
static {
hash_values = new int[REPEAT.length];
for (int i = 0; i < REPEAT.length; i++)
Index: WidthsATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/WidthsATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- WidthsATSC.java 23 Aug 2005 16:23:11 -0000 1.1
+++ WidthsATSC.java 14 Sep 2005 15:14:18 -0000 1.2
@@ -23,31 +23,31 @@
/**
*/
public class WidthsATSC extends CssProperty implements CssOperator {
-
+
Vector values = new Vector();
-
+
/**
* Create a new WidthsATSC
*/
public WidthsATSC() {
// nothing to do
}
-
+
/**
* Creates a new WidthsATSC
*
* @param expression the unicode em
* @exception InvalidParamException values are incorrect
- */
+ */
public WidthsATSC(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
boolean manyValues = expression.getCount() > 1;
-
+
CssValue val;
char op;
//int i = 0;
- setByUser();
+ setByUser();
{
val = expression.getValue();
ac.getFrame().addWarning("atsc", val.toString());
@@ -56,23 +56,23 @@
do {
val = expression.getValue();
op = expression.getOperator();
-
+
if(manyValues && val.equals(inherit)) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
if (val instanceof CssUnicodeRange) {
values.addElement(val);
if (op != SPACE) {
- throw new InvalidParamException("operator",
+ throw new InvalidParamException("operator",
new Character(op),
getPropertyName(), ac);
}
if (expression.end()) {
- throw new InvalidParamException("few-value",
+ throw new InvalidParamException("few-value",
getPropertyName(), ac);
}
- expression.next();
+ expression.next();
}
do {
op = expression.getOperator();
@@ -81,7 +81,7 @@
values.addElement(" ");
values.addElement(val);
} else {
- throw new InvalidParamException("value",
+ throw new InvalidParamException("value",
val,
getPropertyName(), ac);
}
@@ -91,23 +91,23 @@
} while (op == CssOperator.COMMA);
}
-
+
public WidthsATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value
- */
+ */
public Object get() {
return values.elementAt(0);
}
-
+
/**
* Returns a string representation of the object.
*/
- public String toString() {
+ public String toString() {
String ret = "";
int i = 0;
while (i < (values.size() - 2)) {
@@ -116,14 +116,14 @@
}
return ret;
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "widths";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -136,13 +136,13 @@
}
style0.widthsATSC = 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 ((ATSCStyle) style).getWidthsATSC();
@@ -150,23 +150,23 @@
return ((ATSCStyle) style).widthsATSC;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
// @@TODO
return false;
}
-
+
/**
* 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 false;
}
-
+
}
Index: ATSCNavUp.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/ATSCNavUp.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ATSCNavUp.java 23 Aug 2005 16:23:11 -0000 1.1
+++ ATSCNavUp.java 14 Sep 2005 15:14:18 -0000 1.2
@@ -50,11 +50,11 @@
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
this.ac = ac;
setByUser(); // tell this property is set by the user
CssValue val = expression.getValue();
-
+
if (val instanceof CssNumber) {
navup = val;
expression.next();
@@ -69,12 +69,12 @@
getPropertyName(), ac);
}
}
-
+
public ATSCNavUp(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Add this property to the CssStyle.
*
Index: CssBackgroundPositionATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/CssBackgroundPositionATSC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBackgroundPositionATSC.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBackgroundPositionATSC.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -124,16 +124,16 @@
if(check && expression.getCount() > 2) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
CssValue val = expression.getValue();
char op = expression.getOperator();
-
+
if (op != SPACE)
- throw new InvalidParamException("operator",
+ throw new InvalidParamException("operator",
((new Character(op)).toString()),
ac);
-
+
if (val.equals(inherit)) {
if(expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
@@ -143,8 +143,8 @@
expression.next();
return;
}
-
- CssValue next = expression.getNextValue();
+
+ CssValue next = expression.getNextValue();
if(val instanceof CssIdent) {
int index1 = IndexOfIdent((String) val.get());
@@ -156,10 +156,10 @@
if((isHorizontal(index1) && isVertical(index2)) ||
(isHorizontal(index2) && isVertical(index1))) {
first = val;
- second = next;
+ second = next;
}
// both are horizontal or vertical but not 'center'
- else if(check){
+ else if(check){
throw new InvalidParamException("incompatible",
val, next, ac);
}
@@ -177,8 +177,8 @@
first = val;
second = next;
}
- // if the keyword is the first value, it can only be an
- // horizontal one
+ // if the keyword is the first value, it can only be an
+ // horizontal one
else {
throw new InvalidParamException("incompatible",
val, next, ac);
@@ -189,8 +189,8 @@
first = val;
}
// the second value is invalid
- else if(check) {
- throw new InvalidParamException("value", next,
+ else if(check) {
+ throw new InvalidParamException("value", next,
getPropertyName(), ac);
}
else {
@@ -234,16 +234,16 @@
}
}
else if(check){
- throw new InvalidParamException("value", expression.getValue(),
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
-
+
// we only move the cursor if we found valid values
- if(first != null) {
- expression.next();
+ if(first != null) {
+ expression.next();
}
- if(second != null) {
- expression.next();
+ if(second != null) {
+ expression.next();
}
}
@@ -251,17 +251,17 @@
throws InvalidParamException {
this(ac, expression, false);
}
-
+
private boolean isHorizontal(int index) {
return index == POSITION_LEFT || index == POSITION_RIGHT ||
index == POSITION_CENTER;
}
-
+
private boolean isVertical(int index) {
return index == POSITION_TOP || index == POSITION_BOTTOM ||
index == POSITION_CENTER;
}
-
+
/**
* Returns the value of this property
*/
Index: CssBackgroundImageATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/CssBackgroundImageATSC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBackgroundImageATSC.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBackgroundImageATSC.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -36,9 +36,9 @@
* </PRE>
* @version $Revision$ */
public class CssBackgroundImageATSC extends CssProperty {
-
+
CssValue url;
-
+
private static CssIdent none = new CssIdent("none");
/**
@@ -46,21 +46,21 @@
*/
public CssBackgroundImageATSC() {
url = none;
- }
-
+ }
+
/**
* Creates a new CssBackgroundImageATSC
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssBackgroundImageATSC(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
CssValue val = expression.getValue();
@@ -74,23 +74,23 @@
url = none;
expression.next();
} else {
- throw new InvalidParamException("value", expression.getValue(),
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
}
-
+
public CssBackgroundImageATSC(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
@@ -98,21 +98,21 @@
public boolean isSoftlyInherited() {
return url.equals(inherit);
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return url.toString();
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "background-image";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -124,13 +124,13 @@
style.addRedefinitionWarning(ac, this);
cssBackground.image = 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 ((ATSCStyle) style).getBackgroundImageATSC();
@@ -138,23 +138,23 @@
return ((ATSCStyle) style).cssBackgroundATSC.image;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssBackgroundImageATSC &&
+ return (property instanceof CssBackgroundImageATSC &&
url.equals(((CssBackgroundImageATSC) 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;
}
-
+
}
Index: StemvATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/StemvATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- StemvATSC.java 23 Aug 2005 16:23:11 -0000 1.1
+++ StemvATSC.java 14 Sep 2005 15:14:18 -0000 1.2
@@ -19,29 +19,29 @@
/**
*/
public class StemvATSC extends CssProperty {
-
+
CssValue value;
-
+
/**
* Create a new StemvATSC
*/
public StemvATSC() {
// nothing to do
}
-
+
/**
* Creates a new StemvATSC
*
* @param expression the unicode em
* @exception InvalidParamException values are incorrect
- */
+ */
public StemvATSC(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
setByUser();
@@ -51,37 +51,37 @@
value = val;
expression.next();
} else {
- throw new InvalidParamException("value", expression.getValue(),
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
}
-
+
public StemvATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value
- */
+ */
public Object get() {
return value;
}
-
+
/**
* Returns a string representation of the object.
*/
- public String toString() {
+ public String toString() {
return value.toString();
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "stemv";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -94,13 +94,13 @@
}
style0.stemvATSC = 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 ((ATSCStyle) style).getStemvATSC();
@@ -108,23 +108,23 @@
return ((ATSCStyle) style).stemvATSC;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
// @@TODO
return false;
}
-
+
/**
* 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 false;
}
-
+
}
Index: CssBorderLeftStyleATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/CssBorderLeftStyleATSC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderLeftStyleATSC.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorderLeftStyleATSC.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -18,16 +18,16 @@
* @version $Revision$
*/
public class CssBorderLeftStyleATSC extends CssProperty {
-
+
CssBorderFaceStyleATSC face;
-
+
/**
* Create a new CssBorderLeftStyleATSC
*/
public CssBorderLeftStyleATSC() {
face = new CssBorderFaceStyleATSC();
}
-
+
/**
* Create a new CssBorderLeftStyleATSC with an another CssBorderFaceStyleATSC
*
@@ -35,10 +35,10 @@
*/
public CssBorderLeftStyleATSC(CssBorderFaceStyleATSC another) {
setByUser();
-
+
face = another;
}
-
+
/**
* Create a new CssBorderLeftStyleATSC
*
@@ -47,48 +47,48 @@
*/
public CssBorderLeftStyleATSC(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
face = new CssBorderFaceStyleATSC(ac, expression);
}
-
+
public CssBorderLeftStyleATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return face;
}
-
+
/**
* Returns the value
*/
public String getStyle() {
return face.getStyle();
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return face.toString();
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "border-left-style";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -100,13 +100,13 @@
style.addRedefinitionWarning(ac, this);
left.style = 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 ((ATSCStyle) style).getBorderLeftStyleATSC();
@@ -114,14 +114,14 @@
return ((ATSCStyle) style).cssBorderATSC.getLeft().style;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
return (property instanceof CssBorderLeftStyleATSC && face.equals(((CssBorderLeftStyleATSC) property).face));
}
-
+
}
Index: CssBorderTopWidthATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/CssBorderTopWidthATSC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderTopWidthATSC.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorderTopWidthATSC.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -46,16 +46,16 @@
* @version $Revision$
*/
public class CssBorderTopWidthATSC extends CssProperty {
-
+
CssBorderFaceWidthATSC face;
-
+
/**
* Create a new CssBorderTopWidth
*/
public CssBorderTopWidthATSC() {
face = new CssBorderFaceWidthATSC();
}
-
+
/**
* Create a new CssBorderTopWidth with an another CssBorderFaceWidth
*
@@ -63,10 +63,10 @@
*/
public CssBorderTopWidthATSC(CssBorderFaceWidthATSC another) {
setByUser();
-
+
face = another;
}
-
+
/**
* Create a new CssBorderTopWidthATSC
*
@@ -75,48 +75,48 @@
*/
public CssBorderTopWidthATSC(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
face = new CssBorderFaceWidthATSC(ac, expression);
}
-
+
public CssBorderTopWidthATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return face;
}
-
+
/**
* Return the value of this property
*/
public CssValue getValue() {
return face.getValue();
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return face.toString();
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "border-top-width";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -130,13 +130,13 @@
}
top.width = 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 ((ATSCStyle) style).getBorderTopWidthATSC();
@@ -144,15 +144,15 @@
return ((ATSCStyle) style).cssBorderATSC.getTop().width;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
return (property instanceof CssBorderTopWidthATSC &&
face.equals(((CssBorderTopWidthATSC) property).face));
}
-
+
}
Index: CssBorderStyleATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/CssBorderStyleATSC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderStyleATSC.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorderStyleATSC.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -85,15 +85,15 @@
* <EM>CSS1 core:</EM> UAs may interpret all of 'dotted', 'dashed', 'double',
* 'groove', 'ridge', 'inset' and 'outset' as 'solid'.
*
- * @version $Revision$
+ * @version $Revision$
*/
public class CssBorderStyleATSC extends CssProperty implements CssOperator {
-
+
CssBorderTopStyleATSC top;
CssBorderBottomStyleATSC bottom;
CssBorderRightStyleATSC right;
CssBorderLeftStyleATSC left;
-
+
/**
* Create a new CssBorderStyleATSC
*/
@@ -105,19 +105,19 @@
this.bottom = bottom;
this.left = left;
this.right = right;
- }
-
+ }
+
/**
* Create a new CssBorderStyleATSC
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssBorderStyleATSC(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
setByUser();
-
+
switch (expression.getCount()) {
case 1:
top = new CssBorderTopStyleATSC(ac, expression);
@@ -127,7 +127,7 @@
break;
case 2:
if (expression.getOperator() != SPACE)
- throw new InvalidParamException("operator",
+ throw new InvalidParamException("operator",
((new Character(expression.getOperator())).toString()),
ac);
if(expression.getValue().equals(inherit)) {
@@ -143,7 +143,7 @@
break;
case 3:
if (expression.getOperator() != SPACE)
- throw new InvalidParamException("operator",
+ throw new InvalidParamException("operator",
((new Character(expression.getOperator())).toString()),
ac);
if(expression.getValue().equals(inherit)) {
@@ -151,7 +151,7 @@
}
top = new CssBorderTopStyleATSC(ac, expression);
if (expression.getOperator() != SPACE)
- throw new InvalidParamException("operator",
+ throw new InvalidParamException("operator",
((new Character(expression.getOperator())).toString()),
ac);
if(expression.getValue().equals(inherit)) {
@@ -166,7 +166,7 @@
break;
case 4:
if (expression.getOperator() != SPACE)
- throw new InvalidParamException("operator",
+ throw new InvalidParamException("operator",
((new Character(expression.getOperator())).toString()),
ac);
if(expression.getValue().equals(inherit)) {
@@ -174,7 +174,7 @@
}
top = new CssBorderTopStyleATSC(ac, expression);
if (expression.getOperator() != SPACE)
- throw new InvalidParamException("operator",
+ throw new InvalidParamException("operator",
((new Character(expression.getOperator())).toString()),
ac);
if(expression.getValue().equals(inherit)) {
@@ -182,7 +182,7 @@
}
right = new CssBorderRightStyleATSC(ac, expression);
if (expression.getOperator() != SPACE)
- throw new InvalidParamException("operator",
+ throw new InvalidParamException("operator",
((new Character(expression.getOperator())).toString()),
ac);
if(expression.getValue().equals(inherit)) {
@@ -200,26 +200,26 @@
}
}
}
-
+
public CssBorderStyleATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return top;
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "border-style";
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -238,18 +238,18 @@
return top + " " + right + " " + bottom + " " + left;
}
}
-
+
/**
* Set this property to be important.
* Overrides this method for a macro
- */
+ */
public void setImportant() {
top.setImportant();
right.setImportant();
left.setImportant();
bottom.setImportant();
}
-
+
/**
* Returns true if this property is important.
* Overrides this method for a macro
@@ -260,14 +260,14 @@
(left == null || left.getImportant()) &&
(bottom == null || bottom.getImportant()));
}
-
+
/**
* Print this property.
*
* @param printer The printer.
* @see #toString()
* @see #getPropertyName()
- */
+ */
public void print(CssPrinterStyle printer) {
if ((top != null && right != null &&
left != null && bottom != null) &&
@@ -287,9 +287,9 @@
if (bottom != null)
bottom.print(printer);
}
-
+
}
-
+
/**
* Set the context.
* Overrides this method for a macro
@@ -312,7 +312,7 @@
left.setSelectors(selector);
}
}
-
+
/**
* Add this property to the CssStyle
*
@@ -324,25 +324,25 @@
left.addToStyle(ac, style);
bottom.addToStyle(ac, style);
}
-
+
/**
* 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) {
- throw new IllegalStateException("Can't invoke this method on the property " +
+ throw new IllegalStateException("Can't invoke this method on the property " +
getPropertyName());
}
-
+
/**
* Update the source file and the line.
* Overrides this method for a macro
*
* @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);
top.setInfo(line, source);
@@ -350,14 +350,14 @@
left.setInfo(line, source);
bottom.setInfo(line, source);
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
return false;
}
-
+
}
Index: CssBorderFaceWidthATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/CssBorderFaceWidthATSC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderFaceWidthATSC.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorderFaceWidthATSC.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -20,16 +20,16 @@
* @version $Revision$
*/
public class CssBorderFaceWidthATSC {
-
+
CssValue value;
-
+
/**
* Create a new CssBorderFaceWidthATSC
*/
public CssBorderFaceWidthATSC() {
value = medium;
}
-
+
/**
* Create a new CssBorderFaceWidthATSC from an another CssBorderFaceWidthATSC
*
@@ -38,7 +38,7 @@
public CssBorderFaceWidthATSC(CssBorderFaceWidthATSC another) {
value = another.value;
}
-
+
/**
* Create a new CssBorderFaceWidth
*
@@ -47,16 +47,16 @@
*/
public CssBorderFaceWidthATSC(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
-
+
if (val instanceof CssLength) {
float f = ((Float) val.get()).floatValue();
- if (f >= 0)
+ if (f >= 0)
this.value = val;
else
throw new InvalidParamException("negative-value", val.toString(), ac);
@@ -73,42 +73,42 @@
} else {
throw new InvalidParamException("value", val.toString(), "width", ac);
}
-
+
expression.next();
- }
-
+ }
+
public CssBorderFaceWidthATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the internal value
- */
+ */
public CssValue getValue() {
return value;
}
-
+
/**
* Returns a string representation of the object.
*/
- public String toString() {
+ public String toString() {
return value.toString();
}
-
+
/**
* Compares two sides for equality.
*
* @param value The another side.
- */
+ */
public boolean equals(CssBorderFaceWidthATSC another) {
return value.equals(another.value);
}
-
+
private static CssIdent thin = new CssIdent("thin");
private static CssIdent medium = new CssIdent("medium");
private static CssIdent thick = new CssIdent("thick");
-
+
}
Index: Panose1ATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/Panose1ATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Panose1ATSC.java 23 Aug 2005 16:23:11 -0000 1.1
+++ Panose1ATSC.java 14 Sep 2005 15:14:18 -0000 1.2
@@ -20,31 +20,31 @@
/**
*/
public class Panose1ATSC extends CssProperty {
-
+
CssValue[] value = new CssValue[10];
-
+
/**
* Create a new Panose1ATSC
*/
public Panose1ATSC() {
// nothing to do
}
-
+
/**
* Creates a new Panose1ATSC
*
* @param expression the unicode em
* @exception InvalidParamException values are incorrect
- */
+ */
public Panose1ATSC(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
CssValue val;
char op;
int i = 0;
- setByUser();
-
+ setByUser();
+
boolean manyValues = expression.getCount() > 1;
-
+
{
val = expression.getValue();
ac.getFrame().addWarning("atsc", val.toString());
@@ -53,11 +53,11 @@
do {
val = expression.getValue();
op = expression.getOperator();
-
+
if(manyValues && val.equals(inherit)) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
if (val instanceof CssNumber) {
value[i++] = val;
expression.next();
@@ -65,46 +65,46 @@
throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
- } while (!expression.end()
+ } while (!expression.end()
&& (op == CssOperator.SPACE)
&& (i < 10));
if (i != 10) {
- throw new InvalidParamException("few-value",
+ throw new InvalidParamException("few-value",
getPropertyName(), ac);
}
}
-
+
public Panose1ATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value
- */
+ */
public Object get() {
return value[0];
}
-
+
/**
* Returns a string representation of the object.
*/
- public String toString() {
+ public String toString() {
String ret = "";
for (int i = 0; i < 10; i++) {
ret += " " + value[i];
}
return ret.substring(1);
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "panose-1";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -117,13 +117,13 @@
}
style0.panose1ATSC = 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 ((ATSCStyle) style).getPanose1ATSC();
@@ -131,23 +131,23 @@
return ((ATSCStyle) style).panose1ATSC;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
// @@TODO
return false;
}
-
+
/**
* 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 false;
}
-
+
}
Index: CapHeightATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/CapHeightATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CapHeightATSC.java 23 Aug 2005 16:23:11 -0000 1.1
+++ CapHeightATSC.java 14 Sep 2005 15:14:18 -0000 1.2
@@ -19,29 +19,29 @@
/**
*/
public class CapHeightATSC extends CssProperty {
-
+
CssValue value;
-
+
/**
* Create a new CapHeightATSC
*/
public CapHeightATSC() {
// nothing to do
}
-
+
/**
* Creates a new CapHeightATSC
*
* @param expression the unicode em
* @exception InvalidParamException values are incorrect
- */
+ */
public CapHeightATSC(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() >1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
setByUser();
@@ -51,37 +51,37 @@
value = val;
expression.next();
} else {
- throw new InvalidParamException("value", expression.getValue(),
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
}
-
+
public CapHeightATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value
- */
+ */
public Object get() {
return value;
}
-
+
/**
* Returns a string representation of the object.
*/
- public String toString() {
+ public String toString() {
return value.toString();
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "cap-height";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -94,13 +94,13 @@
}
style0.capHeightATSC = 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 ((ATSCStyle) style).getCapHeightATSC();
@@ -108,23 +108,23 @@
return ((ATSCStyle) style).capHeightATSC;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
// @@TODO
return false;
}
-
+
/**
* 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 false;
}
-
+
}
Index: CssBorderTopATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/CssBorderTopATSC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderTopATSC.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorderTopATSC.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -51,65 +51,65 @@
* @version $Revision$
*/
public class CssBorderTopATSC extends CssProperty implements CssOperator {
-
+
CssBorderTopWidthATSC width;
CssBorderTopStyleATSC style;
CssBorderTopColorATSC color;
-
+
/**
* Create a new CssBorderFaceATSC
*/
public CssBorderTopATSC() {
- }
-
+ }
+
/**
* Create a new CssBorderFaceATSC
*
* @param expression The expression for this property
* @exception InvalidParamException The expression is incorrect
- */
+ */
public CssBorderTopATSC(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
CssValue val = null;
char op = SPACE;
boolean find = true;
-
+
if(check && expression.getCount() > 3) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
boolean manyValues = (expression.getCount() > 1);
-
+
setByUser();
-
+
while (find) {
find = false;
- val = expression.getValue();
- op = expression.getOperator();
+ val = expression.getValue();
+ op = expression.getOperator();
if (val == null)
break;
-
+
// if there are many values, we can't have inherit as one of them
if(manyValues && val.equals(inherit)) {
throw new InvalidParamException("unrecognize", null, null, ac);
}
-
+
if (op != SPACE)
- throw new InvalidParamException("operator",
+ throw new InvalidParamException("operator",
((new Character(op)).toString()),
- ac);
+ ac);
if (width == null) {
try {
- width = new CssBorderTopWidthATSC(ac, expression);
+ width = new CssBorderTopWidthATSC(ac, expression);
find = true;
} catch(InvalidParamException e){
- // nothing to do, style will test this value
+ // nothing to do, style will test this value
}
}
if (!find && style == null) {
try {
- style = new CssBorderTopStyleATSC(ac, expression);
+ style = new CssBorderTopStyleATSC(ac, expression);
find = true;
} catch(InvalidParamException e){
// nothing to do, color will test this value
@@ -118,23 +118,23 @@
if (!find && color == null) {
// throws an exception if the value is not valid
color = new CssBorderTopColorATSC(ac, expression);
- find = true;
+ find = true;
}
}
}
-
+
public CssBorderTopATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return width;
}
-
+
/**
* Returns the color property
*/
@@ -145,7 +145,7 @@
return null;
}
}
-
+
/**
* Returns the width property
*/
@@ -156,7 +156,7 @@
return null;
}
}
-
+
/**
* Returns the style property
*/
@@ -167,7 +167,7 @@
return null;
}
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -190,18 +190,18 @@
}
return ret;
}
-
+
/**
* Returns the name of this property
*/
public String getPropertyName() {
return "border-top";
}
-
+
/**
* Set this property to be important.
* Overrides this method for a macro
- */
+ */
public void setImportant() {
if(width != null) {
width.setImportant();
@@ -213,7 +213,7 @@
color.setImportant();
}
}
-
+
/**
* Returns true if this property is important.
* Overrides this method for a macro
@@ -223,14 +223,14 @@
(style == null || style.getImportant()) &&
(color == null || color.getImportant()));
}
-
+
/**
* Print this property.
*
* @param printer The printer.
* @see #toString()
* @see #getPropertyName()
- */
+ */
public void print(CssPrinterStyle printer) {
if ((width != null && style != null &&
color != null) &&
@@ -247,9 +247,9 @@
if (color != null)
color.print(printer);
}
-
+
}
-
+
/**
* Add this property to the CssStyle
*
@@ -266,13 +266,13 @@
color.addToStyle(ac, style);
}
}
-
+
/**
* 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 ((ATSCStyle) style).getBorderTopATSC();
@@ -280,16 +280,16 @@
return ((ATSCStyle) style).cssBorderATSC.getTop();
}
}
-
+
/**
* Update the source file and the line.
* Overrides this method for a macro
*
* @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);
+ super.setInfo(line, source);
if(width != null) {
width.setInfo(line, source);
}
@@ -300,7 +300,7 @@
color.setInfo(line, source);
}
}
-
+
/**
* Set the context.
* Overrides this method for a macro
@@ -320,24 +320,24 @@
color.setSelectors(selector);
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
if (property instanceof CssBorderTopATSC) {
CssBorderTopATSC top = (CssBorderTopATSC) property;
- return (width.equals(top.width)
+ return (width.equals(top.width)
&& style.equals(top.style) && color.equals(top.color));
} else {
return false;
}
}
-
+
void check() {
- if ((style != null)
+ if ((style != null)
&& (style.face.value == 0)) {
if (width != null) {
width.face.value = new CssLength();
Index: CssBorderTopStyleATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/CssBorderTopStyleATSC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderTopStyleATSC.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorderTopStyleATSC.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -18,16 +18,16 @@
* @version $Revision$
*/
public class CssBorderTopStyleATSC extends CssProperty {
-
+
CssBorderFaceStyleATSC face;
-
+
/**
* Create a new CssBorderTopStyleATSC
*/
public CssBorderTopStyleATSC() {
face = new CssBorderFaceStyleATSC();
}
-
+
/**
* Create a new CssBorderTopStyleATSC with an another CssBorderFaceStyleATSC
*
@@ -35,10 +35,10 @@
*/
public CssBorderTopStyleATSC(CssBorderFaceStyleATSC another) {
setByUser();
-
+
face = another;
}
-
+
/**
* Create a new CssBorderTopStyleATSC
*
@@ -47,48 +47,48 @@
*/
public CssBorderTopStyleATSC(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
face = new CssBorderFaceStyleATSC(ac, expression);
}
-
+
public CssBorderTopStyleATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return face;
}
-
+
/**
* Returns the value
*/
public String getStyle() {
return face.getStyle();
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return face.toString();
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "border-top-style";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -100,13 +100,13 @@
style.addRedefinitionWarning(ac, this);
top.style = 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 ((ATSCStyle) style).getBorderTopStyleATSC();
@@ -114,15 +114,15 @@
return ((ATSCStyle) style).cssBorderATSC.getTop().style;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssBorderTopStyleATSC &&
+ return (property instanceof CssBorderTopStyleATSC &&
face.equals(((CssBorderTopStyleATSC) property).face));
}
-
+
}
Index: CssBackgroundAttachmentATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/CssBackgroundAttachmentATSC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBackgroundAttachmentATSC.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBackgroundAttachmentATSC.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -31,7 +31,7 @@
* determines if it is fixed with regard to the canvas or if it scrolls along
* with the content.
* <PRE>
- * BODY {
+ * BODY {
* background: red url(pendant.gif);
* background-repeat: repeat-y;
* background-attachment: fixed;
@@ -39,37 +39,37 @@
* </PRE>
* @version $Revision$
*/
-public class CssBackgroundAttachmentATSC extends CssProperty
+public class CssBackgroundAttachmentATSC extends CssProperty
implements CssBackgroundConstants {
-
+
int attachment;
-
+
private static int[] hash_values;
-
+
/**
* Create a new CssBackgroundAttachmentATSC
*/
public CssBackgroundAttachmentATSC() {
// nothing to do
- }
-
+ }
+
/**
* Creates a new CssBackgroundAttachmentATSC
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssBackgroundAttachmentATSC(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
-
+
CssValue val = expression.getValue();
-
+
if (val instanceof CssIdent) {
int hash = val.hashCode();
for (int i =0; i < ATTACHMENT.length; i++)
@@ -79,23 +79,23 @@
return;
}
}
-
- throw new InvalidParamException("value", expression.getValue(),
+
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
-
+
public CssBackgroundAttachmentATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return ATTACHMENT[attachment];
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -103,21 +103,21 @@
public boolean isSoftlyInherited() {
return attachment == 2;
}
-
+
/**
* 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";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -129,13 +129,13 @@
style.addRedefinitionWarning(ac, this);
cssBackground.attachment = 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 ((ATSCStyle) style).getBackgroundAttachmentATSC();
@@ -143,25 +143,25 @@
return ((ATSCStyle) style).cssBackgroundATSC.attachment;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssBackgroundAttachmentATSC &&
+ return (property instanceof CssBackgroundAttachmentATSC &&
attachment == ((CssBackgroundAttachmentATSC) property).attachment);
}
-
+
/**
* 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 attachment == 0;
}
-
+
static {
hash_values = new int[ATTACHMENT.length];
for (int i = 0; i < ATTACHMENT.length; i++)
Index: MathlineATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/MathlineATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- MathlineATSC.java 23 Aug 2005 16:23:11 -0000 1.1
+++ MathlineATSC.java 14 Sep 2005 15:14:18 -0000 1.2
@@ -19,29 +19,29 @@
/**
*/
public class MathlineATSC extends CssProperty {
-
+
CssValue value;
-
+
/**
* Create a new MathlineATSC
*/
public MathlineATSC() {
// nothing to do
}
-
+
/**
* Creates a new MathlineATSC
*
* @param expression the unicode em
* @exception InvalidParamException values are incorrect
- */
+ */
public MathlineATSC(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
setByUser();
@@ -51,37 +51,37 @@
value = val;
expression.next();
} else {
- throw new InvalidParamException("value", expression.getValue(),
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
}
-
+
public MathlineATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value
- */
+ */
public Object get() {
return value;
}
-
+
/**
* Returns a string representation of the object.
*/
- public String toString() {
+ public String toString() {
return value.toString();
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "mathline";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -94,13 +94,13 @@
}
style0.mathlineATSC = 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 ((ATSCStyle) style).getMathlineATSC();
@@ -108,23 +108,23 @@
return ((ATSCStyle) style).mathlineATSC;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
// @@TODO
return false;
}
-
+
/**
* 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 false;
}
-
+
}
Index: CssBorderTopColorATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/CssBorderTopColorATSC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderTopColorATSC.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorderTopColorATSC.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -20,26 +20,26 @@
* @version $Revision$
*/
public class CssBorderTopColorATSC extends CssProperty {
-
+
CssBorderFaceColorATSC face;
-
+
/**
* Create a new CssBorderTopColorATSC
*/
public CssBorderTopColorATSC() {
face = new CssBorderFaceColorATSC();
}
-
+
/**
* Create a new CssBorderTopColorATSC with an another CssBorderFaceColorATSC
* @param another The another side.
*/
public CssBorderTopColorATSC(CssBorderFaceColorATSC another) {
setByUser();
-
+
face = another;
}
-
+
/**
* Create a new CssBorderTopColorATSC
*
@@ -48,27 +48,27 @@
*/
public CssBorderTopColorATSC(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
face = new CssBorderFaceColorATSC(ac, expression);
}
-
+
public CssBorderTopColorATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return face;
}
-
+
/**
* Returns the color
*/
@@ -79,21 +79,21 @@
return null;
}
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return face.toString();
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "border-top-color";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -105,7 +105,7 @@
style.addRedefinitionWarning(ac, this);
top.color = this;
}
-
+
/**
* Get this property in the style.
*
@@ -119,26 +119,26 @@
return ((ATSCStyle) style).cssBorderATSC.getTop().color;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssBorderTopColorATSC &&
+ return (property instanceof CssBorderTopColorATSC &&
face.equals(((CssBorderTopColorATSC) property).face));
}
-
+
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
*
* @see #print(CssPrinterStyle)
- */
+ */
public void print(CssPrinterStyle printer) {
if (!face.isDefault())
printer.print(this);
}
-
+
}
Index: ATSCNavLeft.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/ATSCNavLeft.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ATSCNavLeft.java 23 Aug 2005 16:23:11 -0000 1.1
+++ ATSCNavLeft.java 14 Sep 2005 15:14:18 -0000 1.2
@@ -50,11 +50,11 @@
if(check && expression.getCount() >1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
this.ac = ac;
setByUser(); // tell this property is set by the user
CssValue val = expression.getValue();
-
+
if (val instanceof CssNumber) {
navleft = val;
expression.next();
@@ -74,7 +74,7 @@
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Add this property to the CssStyle.
*
Index: CssBorderBottomStyleATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/CssBorderBottomStyleATSC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderBottomStyleATSC.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorderBottomStyleATSC.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -18,26 +18,26 @@
* @version $Revision$
*/
public class CssBorderBottomStyleATSC extends CssProperty {
-
+
CssBorderFaceStyleATSC face;
-
+
/**
* Create a new CssBorderBottomStyleATSC
*/
public CssBorderBottomStyleATSC() {
face = new CssBorderFaceStyleATSC();
}
-
+
/**
* Create a new CssBorderBottomStyleATSC with an another CssBorderFaceStyleATSC
* @param another The another side.
*/
public CssBorderBottomStyleATSC(CssBorderFaceStyleATSC another) {
setByUser();
-
+
face = another;
}
-
+
/**
* Create a new CssBorderBottomStyle eith an expression
*
@@ -46,48 +46,48 @@
*/
public CssBorderBottomStyleATSC(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
face = new CssBorderFaceStyleATSC(ac, expression);
}
-
+
public CssBorderBottomStyleATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return face;
}
-
+
/**
* Returns the value
*/
public String getStyle() {
return face.getStyle();
}
-
+
/**
* 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-style";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -99,13 +99,13 @@
style.addRedefinitionWarning(ac, this);
bottom.style = 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 ((ATSCStyle) style).getBorderBottomStyleATSC();
@@ -113,14 +113,14 @@
return ((ATSCStyle) style).cssBorderATSC.getBottom().style;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
return (property instanceof CssBorderBottomStyleATSC && face.equals(((CssBorderBottomStyleATSC) property).face));
}
-
+
}
Index: DefinitionSrcATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/DefinitionSrcATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- DefinitionSrcATSC.java 23 Aug 2005 16:23:11 -0000 1.1
+++ DefinitionSrcATSC.java 14 Sep 2005 15:14:18 -0000 1.2
@@ -19,29 +19,29 @@
/**
*/
public class DefinitionSrcATSC extends CssProperty {
-
+
CssValue value;
-
+
/**
* Create a new DefinitionSrcATSC
*/
public DefinitionSrcATSC() {
// nothing to do
}
-
+
/**
* Creates a new DefinitionSrcATSC
*
* @param expression the unicode em
* @exception InvalidParamException values are incorrect
- */
+ */
public DefinitionSrcATSC(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() >1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
setByUser();
@@ -51,37 +51,37 @@
value = val;
expression.next();
} else {
- throw new InvalidParamException("value", expression.getValue(),
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
}
-
+
public DefinitionSrcATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value
- */
+ */
public Object get() {
return value;
}
-
+
/**
* Returns a string representation of the object.
*/
- public String toString() {
+ public String toString() {
return value.toString();
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "definition-src";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -94,13 +94,13 @@
}
style0.definitionSrcATSC = 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 ((ATSCStyle) style).getDefinitionSrcATSC();
@@ -108,23 +108,23 @@
return ((ATSCStyle) style).definitionSrcATSC;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
// @@TODO
return false;
}
-
+
/**
* 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 false;
}
-
+
}
Index: DescentATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/DescentATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- DescentATSC.java 23 Aug 2005 16:23:11 -0000 1.1
+++ DescentATSC.java 14 Sep 2005 15:14:18 -0000 1.2
@@ -19,29 +19,29 @@
/**
*/
public class DescentATSC extends CssProperty {
-
+
CssValue value;
-
+
/**
* Create a new DescentATSC
*/
public DescentATSC() {
// nothing to do
}
-
+
/**
* Creates a new DescentATSC
*
* @param expression the unicode em
* @exception InvalidParamException values are incorrect
- */
+ */
public DescentATSC(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
-
+
if(check && expression.getCount() >1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
setByUser();
@@ -51,37 +51,37 @@
value = val;
expression.next();
} else {
- throw new InvalidParamException("value", expression.getValue(),
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
}
-
+
public DescentATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value
- */
+ */
public Object get() {
return value;
}
-
+
/**
* Returns a string representation of the object.
*/
- public String toString() {
+ public String toString() {
return value.toString();
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "descent";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -94,13 +94,13 @@
}
style0.descentATSC = 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 ((ATSCStyle) style).getDescentATSC();
@@ -108,23 +108,23 @@
return ((ATSCStyle) style).descentATSC;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
// @@TODO
return false;
}
-
+
/**
* 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 false;
}
-
+
}
Index: SlopeATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/SlopeATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- SlopeATSC.java 23 Aug 2005 16:23:11 -0000 1.1
+++ SlopeATSC.java 14 Sep 2005 15:14:18 -0000 1.2
@@ -19,29 +19,29 @@
/**
*/
public class SlopeATSC extends CssProperty {
-
+
CssValue value;
-
+
/**
* Create a new SlopeATSC
*/
public SlopeATSC() {
// nothing to do
}
-
+
/**
* Creates a new SlopeATSC
*
* @param expression the unicode em
* @exception InvalidParamException values are incorrect
- */
+ */
public SlopeATSC(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
setByUser();
@@ -51,37 +51,37 @@
value = val;
expression.next();
} else {
- throw new InvalidParamException("value", expression.getValue(),
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
}
-
+
public SlopeATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value
- */
+ */
public Object get() {
return value;
}
-
+
/**
* Returns a string representation of the object.
*/
- public String toString() {
+ public String toString() {
return value.toString();
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "slope";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -94,13 +94,13 @@
}
style0.slopeATSC = 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 ((ATSCStyle) style).getSlopeATSC();
@@ -108,23 +108,23 @@
return ((ATSCStyle) style).slopeATSC;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
// @@TODO
return false;
}
-
+
/**
* 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 false;
}
-
+
}
Index: ATSCDynamicRefresh.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/ATSCDynamicRefresh.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ATSCDynamicRefresh.java 23 Aug 2005 16:23:11 -0000 1.1
+++ ATSCDynamicRefresh.java 14 Sep 2005 15:14:18 -0000 1.2
@@ -21,7 +21,7 @@
CssValue dynamicRefresh;
ApplContext ac;
-
+
CssIdent auto = new CssIdent("auto");
CssIdent none = new CssIdent("none");
@@ -43,7 +43,7 @@
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
this.ac = ac;
setByUser(); // tell this property is set by the user
CssValue val = expression.getValue();
@@ -51,7 +51,7 @@
if (((CssNumber) val).getValue() > 0 &&
((CssNumber) val).getValue() < 32767 &&
((CssNumber) val).isInteger()) {
-
+
dynamicRefresh = val;
expression.next();
} else {
@@ -66,12 +66,12 @@
getPropertyName(), ac);
}
}
-
+
public ATSCDynamicRefresh(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Add this property to the CssStyle.
*
Index: CssBorderBottomWidthATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/CssBorderBottomWidthATSC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderBottomWidthATSC.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorderBottomWidthATSC.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -44,16 +44,16 @@
* Border widths cannot be negative.
* @version $Revision$ */
public class CssBorderBottomWidthATSC extends CssProperty {
-
+
CssBorderFaceWidthATSC face;
-
+
/**
* Create a new CssBorderBottomWidth
*/
public CssBorderBottomWidthATSC() {
face = new CssBorderFaceWidthATSC();
}
-
+
/**
* Create a new CssBorderBottomWidth with an another CssBorderFaceWidth
*
@@ -61,10 +61,10 @@
*/
public CssBorderBottomWidthATSC(CssBorderFaceWidthATSC another) {
setByUser();
-
+
face = another;
}
-
+
/**
* Create a new CssBorderBottomWidth
*
@@ -73,48 +73,48 @@
*/
public CssBorderBottomWidthATSC(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
face = new CssBorderFaceWidthATSC(ac, expression);
}
-
+
public CssBorderBottomWidthATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return face;
}
-
+
/**
* Return the value of this property
*/
public CssValue getValue() {
return face.getValue();
}
-
+
/**
* 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-width";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -126,7 +126,7 @@
style.addRedefinitionWarning(ac, this);
bottom.width = this;
}
-
+
/**
* Get this property in the style.
*
@@ -140,15 +140,15 @@
return ((ATSCStyle) style).cssBorderATSC.getBottom().width;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssBorderBottomWidthATSC &&
+ return (property instanceof CssBorderBottomWidthATSC &&
face.equals(((CssBorderBottomWidthATSC) property).face));
}
-
+
}
Index: BaselineATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/BaselineATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- BaselineATSC.java 23 Aug 2005 16:23:11 -0000 1.1
+++ BaselineATSC.java 14 Sep 2005 15:14:18 -0000 1.2
@@ -19,29 +19,29 @@
/**
*/
public class BaselineATSC extends CssProperty {
-
+
CssValue value;
-
+
/**
* Create a new BaselineATSC
*/
public BaselineATSC() {
// nothing to do
}
-
+
/**
* Creates a new BaselineATSC
*
* @param expression the unicode em
* @exception InvalidParamException values are incorrect
- */
+ */
public BaselineATSC(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
setByUser();
@@ -51,37 +51,37 @@
value = val;
expression.next();
} else {
- throw new InvalidParamException("value", expression.getValue(),
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
}
-
+
public BaselineATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value
- */
+ */
public Object get() {
return value;
}
-
+
/**
* Returns a string representation of the object.
*/
- public String toString() {
+ public String toString() {
return value.toString();
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "baseline";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -94,13 +94,13 @@
}
style0.baselineATSC = 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 ((ATSCStyle) style).getBaselineATSC();
@@ -108,23 +108,23 @@
return ((ATSCStyle) style).baselineATSC;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
// @@TODO
return false;
}
-
+
/**
* 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 false;
}
-
+
}
Index: AscentATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/AscentATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- AscentATSC.java 23 Aug 2005 16:23:11 -0000 1.1
+++ AscentATSC.java 14 Sep 2005 15:14:18 -0000 1.2
@@ -19,29 +19,29 @@
/**
*/
public class AscentATSC extends CssProperty {
-
+
CssValue value;
-
+
/**
* Create a new AscentATSC
*/
public AscentATSC() {
// nothing to do
}
-
+
/**
* Creates a new AscentATSC
*
* @param expression the unicode em
* @exception InvalidParamException values are incorrect
- */
+ */
public AscentATSC(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
setByUser();
@@ -51,37 +51,37 @@
value = val;
expression.next();
} else {
- throw new InvalidParamException("value", expression.getValue(),
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
}
-
+
public AscentATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value
- */
+ */
public Object get() {
return value;
}
-
+
/**
* Returns a string representation of the object.
*/
- public String toString() {
+ public String toString() {
return value.toString();
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "ascent";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -94,13 +94,13 @@
}
style0.ascentATSC = 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 ((ATSCStyle) style).getAscentATSC();
@@ -108,23 +108,23 @@
return ((ATSCStyle) style).ascentATSC;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
// @@TODO
return false;
}
-
+
/**
* 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 false;
}
-
+
}
Index: CssBorderATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/CssBorderATSC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderATSC.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorderATSC.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -20,12 +20,12 @@
* @version $Revision$
*/
public class CssBorderATSC extends CssProperty {
-
+
CssBorderTopATSC top;
CssBorderRightATSC right;
CssBorderBottomATSC bottom;
CssBorderLeftATSC left;
-
+
/**
* Create a new CssBorderFaceATSC
*/
@@ -34,106 +34,106 @@
right = new CssBorderRightATSC();
bottom = new CssBorderBottomATSC();
left = new CssBorderLeftATSC();
- }
-
+ }
+
/**
* Create a new CssBorderFaceATSC
*
* @param value The value for this property
* @exception InvalidParamException The value is incorrect
- */
+ */
public CssBorderATSC(ApplContext ac, CssExpression value, boolean check)
throws InvalidParamException {
-
+
if(check && value.getCount() > 3) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = value.getValue();
-
- setByUser();
-
+
+ setByUser();
+
top = new CssBorderTopATSC(ac, value);
-
+
if (val == value.getValue()) {
- throw new InvalidParamException("value",
- value.getValue(),
+ throw new InvalidParamException("value",
+ value.getValue(),
getPropertyName(), ac);
- }
+ }
right = new CssBorderRightATSC();
bottom = new CssBorderBottomATSC();
left = new CssBorderLeftATSC();
-
+
CssBorderTopWidthATSC w = top.width;
CssBorderTopStyleATSC s = top.style;
- CssBorderTopColorATSC c = top.color;
-
- if(w != null) {
- right.width =
- new CssBorderRightWidthATSC((CssBorderFaceWidthATSC) w.get());
- left.width =
- new CssBorderLeftWidthATSC((CssBorderFaceWidthATSC) w.get());
- bottom.width =
- new CssBorderBottomWidthATSC((CssBorderFaceWidthATSC) w.get());
- }
+ CssBorderTopColorATSC c = top.color;
+
+ if(w != null) {
+ right.width =
+ new CssBorderRightWidthATSC((CssBorderFaceWidthATSC) w.get());
+ left.width =
+ new CssBorderLeftWidthATSC((CssBorderFaceWidthATSC) w.get());
+ bottom.width =
+ new CssBorderBottomWidthATSC((CssBorderFaceWidthATSC) w.get());
+ }
if(s != null) {
- right.style =
+ right.style =
new CssBorderRightStyleATSC((CssBorderFaceStyleATSC) s.get());
- left.style =
+ left.style =
new CssBorderLeftStyleATSC((CssBorderFaceStyleATSC) s.get());
- bottom.style =
+ bottom.style =
new CssBorderBottomStyleATSC((CssBorderFaceStyleATSC) s.get());
- }
+ }
if(c != null) {
- right.color =
+ right.color =
new CssBorderRightColorATSC((CssBorderFaceColorATSC) c.get());
- left.color =
+ left.color =
new CssBorderLeftColorATSC((CssBorderFaceColorATSC) c.get());
- bottom.color =
+ bottom.color =
new CssBorderBottomColorATSC((CssBorderFaceColorATSC) c.get());
- }
+ }
}
-
+
public CssBorderATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return top.get();
}
-
+
/**
* Returns the top property
*/
public CssBorderTopATSC getTop() {
return top;
}
-
+
/**
* Returns the right property
*/
public CssBorderRightATSC getRight() {
return right;
}
-
+
/**
* Returns the bottom property
*/
public CssBorderBottomATSC getBottom() {
return bottom;
}
-
+
/**
* Returns the left property
*/
public CssBorderLeftATSC getLeft() {
return left;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -143,22 +143,22 @@
}
return "";
}
-
+
public boolean equals(CssProperty property) {
return false; // FIXME
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "border";
}
-
+
/**
* Set this property to be important.
* Overrides this method for a macro
- */
+ */
public void setImportant() {
if(top != null) {
top.setImportant();
@@ -173,7 +173,7 @@
bottom.setImportant();
}
}
-
+
/**
* Returns true if this property is important.
* Overrides this method for a macro
@@ -184,24 +184,24 @@
left.getImportant() &&
bottom.getImportant());
}
-
+
/**
* Print this property.
*
* @param printer The printer.
* @see #toString()
* @see #getPropertyName()
- */
+ */
public void print(CssPrinterStyle printer) {
int printMacro = 0;
if ((top.width != null && bottom.width != null &&
right.width != null && left.width != null) &&
- ((top.width.getImportant() && bottom.width.getImportant() &&
+ ((top.width.getImportant() && bottom.width.getImportant() &&
right.width.getImportant() && left.width.getImportant()) ||
- (!top.width.getImportant() && !bottom.width.getImportant() &&
+ (!top.width.getImportant() && !bottom.width.getImportant() &&
!right.width.getImportant() && !left.width.getImportant()))) {
- CssBorderWidthATSC width = new CssBorderWidthATSC(top.width, bottom.width,
+ CssBorderWidthATSC width = new CssBorderWidthATSC(top.width, bottom.width,
right.width, left.width);
if (top.getImportant()) {
width.setImportant();
@@ -211,11 +211,11 @@
}
if ((top.style != null && bottom.style != null &&
right.style != null && left.style != null) &&
- ((top.style.getImportant() && bottom.style.getImportant() &&
+ ((top.style.getImportant() && bottom.style.getImportant() &&
right.style.getImportant() && left.style.getImportant()) ||
- (!top.style.getImportant() && !bottom.style.getImportant() &&
+ (!top.style.getImportant() && !bottom.style.getImportant() &&
!right.style.getImportant() && !left.style.getImportant()))) {
- CssBorderStyleATSC style = new CssBorderStyleATSC(top.style, bottom.style,
+ CssBorderStyleATSC style = new CssBorderStyleATSC(top.style, bottom.style,
right.style, left.style);
if (top.getImportant()) {
style.setImportant();
@@ -225,11 +225,11 @@
}
if ((top.color != null && bottom.color != null &&
right.color != null && left.color != null) &&
- ((top.color.getImportant() && bottom.color.getImportant() &&
+ ((top.color.getImportant() && bottom.color.getImportant() &&
right.color.getImportant() && left.color.getImportant()) ||
- (!top.color.getImportant() && !bottom.color.getImportant() &&
+ (!top.color.getImportant() && !bottom.color.getImportant() &&
!right.color.getImportant() && !left.color.getImportant()))) {
- CssBorderColorATSC color = new CssBorderColorATSC(top.color, bottom.color,
+ CssBorderColorATSC color = new CssBorderColorATSC(top.color, bottom.color,
right.color, left.color);
if (top.getImportant()) {
color.setImportant();
@@ -237,7 +237,7 @@
printMacro |= 4;
color.print(printer);
}
-
+
if (printMacro == 0) {
top.print(printer);
right.print(printer);
@@ -249,7 +249,7 @@
if (right.width != null) right.width.print(printer);
if (bottom.width != null) bottom.width.print(printer);
if (left.width != null) left.width.print(printer);
- }
+ }
if ((printMacro & 2) == 0) {
if (top.style != null) top.style.print(printer);
if (right.style != null) right.style.print(printer);
@@ -263,9 +263,9 @@
if (left.color != null) left.color.print(printer);
}
}
-
+
}
-
+
/**
* Set the context.
* Overrides this method for a macro
@@ -288,7 +288,7 @@
left.setSelectors(selector);
}
}
-
+
/**
* Add this property to the CssStyle
*
@@ -308,13 +308,13 @@
bottom.addToStyle(ac, style);
}
}
-
+
/**
* 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 ((ATSCStyle) style).getBorderATSC();
@@ -322,14 +322,14 @@
return ((ATSCStyle) style).cssBorderATSC;
}
}
-
+
/**
* Update the source file and the line.
* Overrides this method for a macro
*
* @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(top != null) {
@@ -345,7 +345,7 @@
bottom.setInfo(line, source);
}
}
-
+
void check() {
if(top != null) {
top.check();
Index: CssBorderLeftColorATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/CssBorderLeftColorATSC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderLeftColorATSC.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorderLeftColorATSC.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -21,27 +21,27 @@
* @version $Revision$
*/
public class CssBorderLeftColorATSC extends CssProperty {
-
+
CssBorderFaceColorATSC face;
-
+
/**
* Create a new CssBorderLeftColorATSC
*/
public CssBorderLeftColorATSC() {
face = new CssBorderFaceColorATSC();
}
-
+
/**
* Create a new CssBorderLeftColorATSC with an another CssBorderFaceColorATSC
* @param another The another side.
*/
public CssBorderLeftColorATSC(CssBorderFaceColorATSC another) {
-
+
setByUser();
-
+
face = another;
}
-
+
/**
* Create a new CssBorderLeftColorATSC
*
@@ -50,48 +50,48 @@
*/
public CssBorderLeftColorATSC(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
face = new CssBorderFaceColorATSC(ac, expression);
}
-
+
public CssBorderLeftColorATSC(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-left-color";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -103,13 +103,13 @@
style.addRedefinitionWarning(ac, this);
left.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 ((ATSCStyle) style).getBorderLeftColorATSC();
@@ -117,21 +117,21 @@
return ((ATSCStyle) style).cssBorderATSC.getLeft().color;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
return (property instanceof CssBorderLeftColorATSC && face.equals(((CssBorderLeftColorATSC) property).face));
}
-
+
/**
* Print this property
*
* @param printer The printer.
- */
+ */
public void print(CssPrinterStyle printer) {
if (!face.isDefault())
printer.print(this);
Index: CssBorderFaceStyleATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/CssBorderFaceStyleATSC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderFaceStyleATSC.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorderFaceStyleATSC.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -17,22 +17,22 @@
* @version $Revision$
*/
public class CssBorderFaceStyleATSC {
-
+
int value;
-
+
private static String[] BORDERSTYLE = {
- "none", "hidden", "dotted", "dashed", "solid", "double", "groove",
+ "none", "hidden", "dotted", "dashed", "solid", "double", "groove",
"ridge", "inset", "outset", "inherit" };
-
+
private static int[] hash_values;
-
+
/**
* Create a new CssBorderFaceStyleATSC
*/
public CssBorderFaceStyleATSC() {
// nothing to do
- }
-
+ }
+
/**
* Create a new CssBorderFaceStyleATSC with an another CssBorderFaceStyle
*
@@ -41,22 +41,22 @@
public CssBorderFaceStyleATSC(CssBorderFaceStyleATSC another) {
value = another.value;
}
-
+
/**
* Create a new CssBorderFaceStyleATSC
*
* @param expression The expression for this face
* @exception InvalidParamException The expression is incorrect
- */
+ */
public CssBorderFaceStyleATSC(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
-
+
if (val instanceof CssIdent) {
int hash = val.hashCode();
for (int i = 0; i < BORDERSTYLE.length; i++)
@@ -66,15 +66,15 @@
return;
}
}
-
+
throw new InvalidParamException("value", val.toString(), "style", ac);
}
-
+
public CssBorderFaceStyleATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -82,34 +82,34 @@
public boolean isSoftlyInherited() {
return value == (BORDERSTYLE.length - 1);
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return BORDERSTYLE[value];
}
-
+
/**
* Returns the value
*/
public String getStyle() {
return BORDERSTYLE[value];
}
-
+
/**
* Compares two side for equality.
*
* @param value The another side.
- */
+ */
public boolean equals(CssBorderFaceStyleATSC style) {
return value == style.value;
}
-
+
static {
hash_values = new int[BORDERSTYLE.length];
for (int i=0; i<BORDERSTYLE.length; i++)
hash_values[i] = BORDERSTYLE[i].hashCode();
}
-
+
}
Index: CssBorderRightWidthATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/CssBorderRightWidthATSC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderRightWidthATSC.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorderRightWidthATSC.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -43,19 +43,19 @@
* <P>
* Border widths cannot be negative.
*
- * @version $Revision$
+ * @version $Revision$
*/
public class CssBorderRightWidthATSC extends CssProperty {
-
+
CssBorderFaceWidthATSC face;
-
+
/**
* Create a new CssBorderRightWidth
*/
public CssBorderRightWidthATSC() {
face = new CssBorderFaceWidthATSC();
}
-
+
/**
* Create a new CssBorderRightWidthATSC with an another CssBorderFaceWidthATSC
*
@@ -63,10 +63,10 @@
*/
public CssBorderRightWidthATSC(CssBorderFaceWidthATSC another) {
setByUser();
-
+
face = another;
}
-
+
/**
* Create a new CssBorderRightWidthATSC
*
@@ -75,49 +75,49 @@
*/
public CssBorderRightWidthATSC(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
-
+
face = new CssBorderFaceWidthATSC(ac, expression);
}
-
+
public CssBorderRightWidthATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return face;
}
-
+
/**
* Return the value of this property
*/
public CssValue getValue() {
return face.getValue();
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return face.toString();
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "border-right-width";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -129,13 +129,13 @@
style.addRedefinitionWarning(ac, this);
right.width = 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 ((ATSCStyle) style).getBorderRightWidthATSC();
@@ -143,15 +143,15 @@
return ((ATSCStyle) style).cssBorderATSC.getRight().width;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssBorderRightWidthATSC &&
+ return (property instanceof CssBorderRightWidthATSC &&
face.equals(((CssBorderRightWidthATSC) property).face));
}
-
+
}
Index: CssBorderRightStyleATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/CssBorderRightStyleATSC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderRightStyleATSC.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorderRightStyleATSC.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -18,18 +18,18 @@
* @version $Revision$
*/
public class CssBorderRightStyleATSC extends CssProperty {
-
+
CssBorderFaceStyleATSC face;
-
+
/**
* Create a new CssBorderRightStyleATSC
*/
public CssBorderRightStyleATSC() {
setByUser();
-
+
face = new CssBorderFaceStyleATSC();
}
-
+
/**
* Create a new CssBorderRightStyle with an another CssBorderFaceStyle
*
@@ -37,10 +37,10 @@
*/
public CssBorderRightStyleATSC(CssBorderFaceStyleATSC another) {
setByUser();
-
+
face = another;
}
-
+
/**
* Create a new CssBorderRightStyleATSC
*
@@ -49,48 +49,48 @@
*/
public CssBorderRightStyleATSC(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
face = new CssBorderFaceStyleATSC(ac, expression);
}
-
+
public CssBorderRightStyleATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return face;
}
-
+
/**
* Returns the value
*/
public String getStyle() {
return face.getStyle();
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return face.toString();
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "border-right-style";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -102,13 +102,13 @@
style.addRedefinitionWarning(ac, this);
right.style = 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 ((ATSCStyle) style).getBorderRightStyleATSC();
@@ -116,15 +116,15 @@
return ((ATSCStyle) style).cssBorderATSC.getRight().style;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssBorderRightStyleATSC &&
+ return (property instanceof CssBorderRightStyleATSC &&
face.equals(((CssBorderRightStyleATSC) property).face));
}
-
+
}
Index: CssBorderBottomColorATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/CssBorderBottomColorATSC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderBottomColorATSC.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorderBottomColorATSC.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -20,28 +20,28 @@
* @version $Revision$
*/
public class CssBorderBottomColorATSC extends CssProperty {
-
+
CssBorderFaceColorATSC face;
-
+
/**
* Create a new CssBorderBottomColorATSC
*/
public CssBorderBottomColorATSC() {
face = new CssBorderFaceColorATSC();
}
-
+
/**
* Create a new CssBorderBottomColor with an another CssBorderFaceColor
*
* @param another An another face.
*/
public CssBorderBottomColorATSC(CssBorderFaceColorATSC another) {
-
+
setByUser();
-
+
face = another;
}
-
+
/**
* Create a new CssBorderBottomColor
*
@@ -50,49 +50,49 @@
*/
public CssBorderBottomColorATSC(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
-
+
face = new CssBorderFaceColorATSC(ac, expression);
}
-
+
public CssBorderBottomColorATSC(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.
*
@@ -104,13 +104,13 @@
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 ((ATSCStyle) style).getBorderBottomColorATSC();
@@ -118,23 +118,23 @@
return ((ATSCStyle) style).cssBorderATSC.getBottom().color;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
return (property instanceof CssBorderBottomColorATSC && face.equals(((CssBorderBottomColorATSC) property).face));
}
-
+
/**
* Print this property.
*
* @param printer The printer.
* @see #toString()
* @see #getPropertyName()
- */
+ */
public void print(CssPrinterStyle printer) {
if (!face.isDefault())
printer.print(this);
Index: CssBorderRightATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/CssBorderRightATSC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderRightATSC.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorderRightATSC.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -54,65 +54,65 @@
* @version $Revision$
*/
public class CssBorderRightATSC extends CssProperty implements CssOperator {
-
+
CssBorderRightWidthATSC width;
CssBorderRightStyleATSC style;
CssBorderRightColorATSC color;
-
+
/**
* Create a new CssBorderFaceATSC
*/
public CssBorderRightATSC() {
- }
-
+ }
+
/**
* Create a new CssBorderFaceATSC
*
* @param expression The expression for this property
* @exception InvalidParamException The expression is incorrect
- */
+ */
public CssBorderRightATSC(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
CssValue val = null;
char op = SPACE;
boolean find = true;
-
+
if(check && expression.getCount() > 3) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
boolean manyValues = (expression.getCount() > 1);
-
+
setByUser();
-
+
while (find) {
find = false;
- val = expression.getValue();
- op = expression.getOperator();
+ val = expression.getValue();
+ op = expression.getOperator();
if (val == null)
break;
-
+
// if there are many values, we can't have inherit as one of them
if(manyValues && val.equals(inherit)) {
throw new InvalidParamException("unrecognize", null, null, ac);
}
-
+
if (op != SPACE)
- throw new InvalidParamException("operator",
+ throw new InvalidParamException("operator",
((new Character(op)).toString()),
- ac);
+ ac);
if (width == null) {
try {
- width = new CssBorderRightWidthATSC(ac, expression);
+ width = new CssBorderRightWidthATSC(ac, expression);
find = true;
} catch(InvalidParamException e){
- // nothing to do, style will test this value
+ // nothing to do, style will test this value
}
}
if (!find && style == null) {
try {
- style = new CssBorderRightStyleATSC(ac, expression);
+ style = new CssBorderRightStyleATSC(ac, expression);
find = true;
} catch(InvalidParamException e){
// nothing to do, color will test this value
@@ -121,28 +121,28 @@
if (!find && color == null) {
// throws an exception if the value is not valid
color = new CssBorderRightColorATSC(ac, expression);
- find = true;
+ find = true;
}
}
/*
CssValue val = null;
char op = SPACE;
boolean find = true;
-
+
setByUser();
while (find) {
find = false;
val = expression.getValue();
op = expression.getOperator();
-
+
if (val == null)
break;
-
+
if (op != SPACE)
- throw new InvalidParamException("operator",
+ throw new InvalidParamException("operator",
((new Character(op)).toString()),
ac);
-
+
if (width == null) {
try {
width = new CssBorderRightWidthATSC(ac, expression);
@@ -167,7 +167,7 @@
}
}
}
-
+
if (width == null)
width = new CssBorderRightWidthATSC();
if (style == null)
@@ -175,19 +175,19 @@
if (color == null)
color = new CssBorderRightColorATSC();*/
}
-
+
public CssBorderRightATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return width;
}
-
+
/**
* Returns the color property
*/
@@ -198,7 +198,7 @@
return null;
}
}
-
+
/**
* Returns the width property
*/
@@ -209,7 +209,7 @@
return null;
}
}
-
+
/**
* Returns the style property
*/
@@ -220,7 +220,7 @@
return null;
}
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -243,18 +243,18 @@
}
return ret;
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "border-right";
}
-
+
/**
* Set this property to be important.
* Overrides this method for a macro
- */
+ */
public void setImportant() {
if(width != null) {
width.setImportant();
@@ -266,7 +266,7 @@
color.setImportant();
}
}
-
+
/**
* Returns true if this property is important.
* Overrides this method for a macro
@@ -276,14 +276,14 @@
(style == null || style.getImportant()) &&
(color == null || color.getImportant()));
}
-
+
/**
* Print this property.
*
* @param printer The printer.
* @see #toString()
* @see #getPropertyName()
- */
+ */
public void print(CssPrinterStyle printer) {
if ((width != null && style != null &&
color != null) &&
@@ -300,9 +300,9 @@
if (color != null)
color.print(printer);
}
-
+
}
-
+
/**
* Set the context.
* Overrides this method for a macro
@@ -322,7 +322,7 @@
color.setSelectors(selector);
}
}
-
+
/**
* Add this property to the CssStyle
*
@@ -339,13 +339,13 @@
color.addToStyle(ac, style);
}
}
-
+
/**
* 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 ((ATSCStyle) style).getBorderRightATSC();
@@ -353,16 +353,16 @@
return ((ATSCStyle) style).cssBorderATSC.getRight();
}
}
-
+
/**
* Update the source file and the line.
* Overrides this method for a macro
*
* @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);
+ super.setInfo(line, source);
if(width != null) {
width.setInfo(line, source);
}
@@ -373,24 +373,24 @@
color.setInfo(line, source);
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
if (property instanceof CssBorderRightATSC) {
CssBorderRightATSC right = (CssBorderRightATSC) property;
- return (width.equals(right.width) &&
+ return (width.equals(right.width) &&
style.equals(right.style) && color.equals(right.color));
} else {
return false;
}
}
-
+
void check() {
- if ((style != null)
+ if ((style != null)
&& (style.face.value == 0)) {
if (width != null) {
width.face.value = new CssLength();
Index: ATSCNavIndex.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/ATSCNavIndex.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ATSCNavIndex.java 23 Aug 2005 16:23:11 -0000 1.1
+++ ATSCNavIndex.java 14 Sep 2005 15:14:18 -0000 1.2
@@ -49,11 +49,11 @@
*/
public ATSCNavIndex (ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
-
+
if(check && expression.getCount() >1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
this.ac = ac;
setByUser(); // tell this property is set by the user
CssValue val = expression.getValue();
@@ -61,7 +61,7 @@
if (((CssNumber) val).getValue() > 0 &&
((CssNumber) val).getValue() < 32767 &&
((CssNumber) val).isInteger()) {
-
+
navindex = val;
expression.next();
} else {
@@ -76,12 +76,12 @@
getPropertyName(), ac);
}
}
-
+
public ATSCNavIndex(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Add this property to the CssStyle.
*
Index: CssBackgroundColorATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/CssBackgroundColorATSC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBackgroundColorATSC.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBackgroundColorATSC.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -33,18 +33,18 @@
* @version $Revision$
*/
public class CssBackgroundColorATSC extends CssProperty {
-
+
CssValue color;
-
+
static CssIdent transparent = new CssIdent("transparent");
-
+
/**
* Create a new CssBackgroundColorATSC
*/
public CssBackgroundColorATSC() {
color = transparent;
- }
-
+ }
+
/**
* Create a new CssBackgroundColorATSC
*
@@ -53,15 +53,16 @@
*/
public CssBackgroundColorATSC(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
CssValue val = expression.getValue();
-
- if (val instanceof org.w3c.css.values.ATSCColor) {
+
+ if (val instanceof org.w3c.css.values.ATSCColor ||
+ val instanceof org.w3c.css.values.CssColor) {
color = val;
expression.next();
} else if (val instanceof CssIdent) {
@@ -76,30 +77,30 @@
expression.next();
}
} else {
- throw new InvalidParamException("value", val.toString(),
+ throw new InvalidParamException("value", val.toString(),
getPropertyName(), ac);
}
- }
-
+ }
+
public CssBackgroundColorATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return color;
}
-
+
/**
* Returns the color
*/
public final CssValue getColor() {
return color;
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -107,15 +108,15 @@
public boolean isSoftlyInherited() {
return color.equals(inherit);
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return color.toString();
}
-
-
+
+
/**
* Add this property to the CssStyle.
*
@@ -127,13 +128,13 @@
style.addRedefinitionWarning(ac, this);
cssBackground.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 ((ATSCStyle) style).getBackgroundColorATSC();
@@ -141,30 +142,30 @@
return ((ATSCStyle) style).cssBackgroundATSC.color;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssBackgroundColorATSC &&
+ return (property instanceof CssBackgroundColorATSC &&
color.equals( ((CssBackgroundColorATSC) property).color));
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "background-color";
}
-
+
/**
* 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 color == transparent;
}
-
+
}
Index: CssBackgroundATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/CssBackgroundATSC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBackgroundATSC.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBackgroundATSC.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -58,11 +58,11 @@
* @see CssBackgroundImage
* @see CssBackgroundRepeat
* @see CssBackgroundAttachment
- * @see CssBackgroundPosition
+ * @see CssBackgroundPosition
*/
-public class CssBackgroundATSC extends CssProperty
+public class CssBackgroundATSC extends CssProperty
implements CssOperator, CssBackgroundConstants {
-
+
CssBackgroundColorATSC color;
CssBackgroundImageATSC image;
CssBackgroundRepeatATSC repeat;
@@ -75,30 +75,30 @@
* Create a new CssBackgroundATSC
*/
public CssBackgroundATSC() {
- }
-
+ }
+
/**
* Set the value of the property
*
* @param expression The expression for this property
* @exception InvalidParamException The expression is incorrect
- */
+ */
public CssBackgroundATSC(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
CssValue val = expression.getValue();
char op = SPACE;
boolean find = true;
-
+
// too many values
if(check && expression.getCount() > 6) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
boolean manyValues = (expression.getCount() > 1);
-
+
while (find) {
find = false;
val = expression.getValue();
@@ -107,12 +107,12 @@
if (val == null) {
break;
}
-
+
// if there are many values, we can't have inherit as one of them
if(manyValues && val != null && val.equals(inherit)) {
throw new InvalidParamException("unrecognize", null, null, ac);
}
-
+
if (color == null) {
try {
color = new CssBackgroundColorATSC(ac, expression);
@@ -149,29 +149,29 @@
position = new CssBackgroundPositionATSC(ac, expression);
find = true;
}
- if(check && val != null && !find) {
+ if(check && val != null && !find) {
throw new InvalidParamException("unrecognize", ac);
}
if (op != SPACE) {
- throw new InvalidParamException("operator",
+ throw new InvalidParamException("operator",
((new Character(op)).toString()),
ac);
}
}
}
-
+
public CssBackgroundATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return color;
}
-
+
/**
* Returns the color
*/
@@ -182,14 +182,14 @@
return color.getColor();
}
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "background";
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -224,11 +224,11 @@
}
return ret;
}
-
+
/**
* Set this property to be important.
* Overrides this method for a macro
- */
+ */
public void setImportant() {
if(color != null) {
color.setImportant();
@@ -246,7 +246,7 @@
position.setImportant();
}
}
-
+
/**
* Returns true if this property is important.
* Overrides this method for a macro
@@ -258,14 +258,14 @@
(attachment == null || attachment.getImportant()) &&
(position == null || position.getImportant()));
}
-
+
/**
* Print this property.
*
* @param printer The printer.
* @see #toString()
* @see #getPropertyName()
- */
+ */
public void print(CssPrinterStyle printer) {
if ((color != null && image != null &&
repeat != null && attachment !=null &&
@@ -276,7 +276,7 @@
!repeat.getImportant() &&
!attachment.getImportant() &&
!position.getImportant()))) {
- if (color.isByUser() || image.isByUser() || repeat.isByUser()
+ if (color.isByUser() || image.isByUser() || repeat.isByUser()
|| attachment.isByUser() || position.isByUser()) {
printer.print(this);
}
@@ -291,9 +291,9 @@
attachment.print(printer);
if (position != null)
position.print(printer);
- }
+ }
}
-
+
/**
* Set the context.
* Overrides this method for a macro
@@ -319,7 +319,7 @@
position.setSelectors(selector);
}
}
-
+
/**
* Add this property to the CssStyle
*
@@ -327,9 +327,9 @@
*/
public void addToStyle(ApplContext ac, CssStyle style) {
((ATSCStyle) style).cssBackgroundATSC.same = same;
- if (isByUser())
+ if (isByUser())
((ATSCStyle) style).cssBackgroundATSC.setByUser();
-
+
if(color != null) {
color.addToStyle(ac, style);
}
@@ -346,13 +346,13 @@
position.addToStyle(ac, style);
}
}
-
+
/**
* 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 ((ATSCStyle) style).getBackgroundATSC();
@@ -360,23 +360,23 @@
return ((ATSCStyle) style).cssBackgroundATSC;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
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 source The source file where this property is defined
- */
+ */
public void setInfo(int line, String source) {
super.setInfo(line, source);
if(color != null) {
@@ -395,5 +395,5 @@
position.setInfo(line, source);
}
}
-
+
}
Index: CssBorderWidthATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/CssBorderWidthATSC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderWidthATSC.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorderWidthATSC.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -57,12 +57,12 @@
* @version $Revision$
*/
public class CssBorderWidthATSC extends CssProperty implements CssOperator {
-
+
CssBorderTopWidthATSC top;
CssBorderBottomWidthATSC bottom;
CssBorderRightWidthATSC right;
CssBorderLeftWidthATSC left;
-
+
/**
* Create a new CssBorderWidthATSC
*/
@@ -74,14 +74,14 @@
this.bottom = bottom;
this.left = left;
this.right = right;
- }
-
+ }
+
/**
* Create a new CssBorderATSC
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssBorderWidthATSC(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
@@ -95,7 +95,7 @@
break;
case 2:
if (expression.getOperator() != SPACE)
- throw new InvalidParamException("operator",
+ throw new InvalidParamException("operator",
((new Character(expression.getOperator())).toString()),
ac);
if(expression.getValue().equals(inherit)) {
@@ -111,7 +111,7 @@
break;
case 3:
if (expression.getOperator() != SPACE)
- throw new InvalidParamException("operator",
+ throw new InvalidParamException("operator",
((new Character(expression.getOperator())).toString()),
ac);
if(expression.getValue().equals(inherit)) {
@@ -119,7 +119,7 @@
}
top = new CssBorderTopWidthATSC(ac, expression);
if (expression.getOperator() != SPACE)
- throw new InvalidParamException("operator",
+ throw new InvalidParamException("operator",
((new Character(expression.getOperator())).toString()),
ac);
if(expression.getValue().equals(inherit)) {
@@ -134,7 +134,7 @@
break;
case 4:
if (expression.getOperator() != SPACE)
- throw new InvalidParamException("operator",
+ throw new InvalidParamException("operator",
((new Character(expression.getOperator())).toString()),
ac);
if(expression.getValue().equals(inherit)) {
@@ -142,7 +142,7 @@
}
top = new CssBorderTopWidthATSC(ac, expression);
if (expression.getOperator() != SPACE)
- throw new InvalidParamException("operator",
+ throw new InvalidParamException("operator",
((new Character(expression.getOperator())).toString()),
ac);
if(expression.getValue().equals(inherit)) {
@@ -150,10 +150,10 @@
}
right = new CssBorderRightWidthATSC(ac, expression);
if (expression.getOperator() != SPACE)
- throw new InvalidParamException("operator",
+ throw new InvalidParamException("operator",
((new Character(expression.getOperator())).toString()),
ac);
- if(expression.getValue().equals(inherit)) {
+ if(expression.getValue().equals(inherit)) {
throw new InvalidParamException("unrecognize", ac);
}
bottom = new CssBorderBottomWidthATSC(ac, expression);
@@ -168,26 +168,26 @@
}
}
}
-
+
public CssBorderWidthATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return top;
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "border-width";
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -206,11 +206,11 @@
return top + " " + right + " " + bottom + " " + left;
}
}
-
+
/**
* Set this property to be important.
* Overrides this method for a macro
- */
+ */
public void setImportant() {
if(top != null) {
top.setImportant();
@@ -219,13 +219,13 @@
right.setImportant();
}
if(left != null) {
- left.setImportant();
+ left.setImportant();
}
if(bottom != null) {
bottom.setImportant();
}
}
-
+
/**
* Returns true if this property is important.
* Overrides this method for a macro
@@ -236,14 +236,14 @@
(left == null || left.getImportant()) &&
(bottom == null || bottom.getImportant()));
}
-
+
/**
* Print this property.
*
* @param printer The printer.
* @see #toString()
* @see #getPropertyName()
- */
+ */
public void print(CssPrinterStyle printer) {
if ((top != null && right != null &&
left != null && bottom != null) &&
@@ -263,9 +263,9 @@
if (bottom != null)
bottom.print(printer);
}
-
+
}
-
+
/**
* Set the context.
* Overrides this method for a macro
@@ -288,7 +288,7 @@
left.setSelectors(selector);
}
}
-
+
/**
* Add this property to the CssStyle
*
@@ -308,25 +308,25 @@
bottom.addToStyle(ac, style);
}
}
-
+
/**
* 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) {
- throw new IllegalStateException("Can't invoke this method on the property " +
+ throw new IllegalStateException("Can't invoke this method on the property " +
getPropertyName());
}
-
+
/**
* Update the source file and the line.
* Overrides this method for a macro
*
* @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(top != null) {
@@ -342,14 +342,14 @@
bottom.setInfo(line, source);
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
return false;
}
-
+
}
Index: StemhATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/StemhATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- StemhATSC.java 23 Aug 2005 16:23:11 -0000 1.1
+++ StemhATSC.java 14 Sep 2005 15:14:18 -0000 1.2
@@ -19,29 +19,29 @@
/**
*/
public class StemhATSC extends CssProperty {
-
+
CssValue value;
-
+
/**
* Create a new Stemh
*/
public StemhATSC() {
// nothing to do
}
-
+
/**
* Creates a new StemhATSC
*
* @param expression the unicode em
* @exception InvalidParamException values are incorrect
- */
+ */
public StemhATSC(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
setByUser();
@@ -51,37 +51,37 @@
value = val;
expression.next();
} else {
- throw new InvalidParamException("value", expression.getValue(),
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
}
-
+
public StemhATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value
- */
+ */
public Object get() {
return value;
}
-
+
/**
* Returns a string representation of the object.
*/
- public String toString() {
+ public String toString() {
return value.toString();
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "stemh";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -94,13 +94,13 @@
}
style0.stemhATSC = 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 ((ATSCStyle) style).getStemhATSC();
@@ -108,23 +108,23 @@
return ((ATSCStyle) style).stemhATSC;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
// @@TODO
return false;
}
-
+
/**
* 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 false;
}
-
+
}
Index: ATSCNavDown.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/ATSCNavDown.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ATSCNavDown.java 23 Aug 2005 16:23:11 -0000 1.1
+++ ATSCNavDown.java 14 Sep 2005 15:14:18 -0000 1.2
@@ -43,11 +43,11 @@
if(check && expression.getCount() >1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
this.ac = ac;
setByUser(); // tell this property is set by the user
CssValue val = expression.getValue();
-
+
if (val instanceof CssNumber) {
navdown = val;
expression.next();
@@ -61,14 +61,14 @@
throw new InvalidParamException("value", val.toString(),
getPropertyName(), ac);
}
-
+
}
public ATSCNavDown(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Add this property to the CssStyle.
*
Index: CssBorderBottomATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/CssBorderBottomATSC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderBottomATSC.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorderBottomATSC.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -51,64 +51,64 @@
* @version $Revision$
*/
public class CssBorderBottomATSC extends CssProperty implements CssOperator {
-
+
CssBorderBottomWidthATSC width;
CssBorderBottomStyleATSC style;
CssBorderBottomColorATSC color;
-
+
/**
* Create a new CssBorderFaceATSC
*/
public CssBorderBottomATSC() {
- }
-
+ }
+
/**
* Create a new CssBorderFace
* @param expression The expression for this property
* @exception InvalidParamException The expression is incorrect
- */
+ */
public CssBorderBottomATSC(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
CssValue val = null;
char op = SPACE;
boolean find = true;
-
+
if(check && expression.getCount() > 3) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
boolean manyValues = (expression.getCount() > 1);
-
+
setByUser();
-
+
while (find) {
find = false;
- val = expression.getValue();
- op = expression.getOperator();
+ val = expression.getValue();
+ op = expression.getOperator();
if (val == null)
break;
-
+
// if there are many values, we can't have inherit as one of them
if(manyValues && val.equals(inherit)) {
throw new InvalidParamException("unrecognize", null, null, ac);
}
-
+
if (op != SPACE)
- throw new InvalidParamException("operator",
+ throw new InvalidParamException("operator",
((new Character(op)).toString()),
- ac);
+ ac);
if (width == null) {
try {
- width = new CssBorderBottomWidthATSC(ac, expression);
+ width = new CssBorderBottomWidthATSC(ac, expression);
find = true;
} catch(InvalidParamException e){
- // nothing to do, style will test this value
+ // nothing to do, style will test this value
}
}
if (!find && style == null) {
try {
- style = new CssBorderBottomStyleATSC(ac, expression);
+ style = new CssBorderBottomStyleATSC(ac, expression);
find = true;
} catch(InvalidParamException e){
// nothing to do, color will test this value
@@ -117,23 +117,23 @@
if (!find && color == null) {
// throws an exception if the value is not valid
color = new CssBorderBottomColorATSC(ac, expression);
- find = true;
+ find = true;
}
}
}
-
+
public CssBorderBottomATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return width;
}
-
+
/**
* Returns the color property
*/
@@ -144,7 +144,7 @@
return null;
}
}
-
+
/**
* Returns the width property
*/
@@ -155,7 +155,7 @@
return null;
}
}
-
+
/**
* Returns the style property
*/
@@ -166,7 +166,7 @@
return null;
}
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -189,18 +189,18 @@
}
return ret;
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "border-bottom";
}
-
+
/**
* Set this property to be important.
* Overrides this method for a macro
- */
+ */
public void setImportant() {
if(width != null) {
width.setImportant();
@@ -212,7 +212,7 @@
color.setImportant();
}
}
-
+
/**
* Returns true if this property is important.
* Overrides this method for a macro
@@ -222,14 +222,14 @@
(style == null || style.getImportant()) &&
(color == null || color.getImportant()));
}
-
+
/**
* Print this property.
*
* @param printer The printer.
* @see #toString()
* @see #getPropertyName()
- */
+ */
public void print(CssPrinterStyle printer) {
if ((width != null && style != null &&
color != null) &&
@@ -246,9 +246,9 @@
if (color != null)
color.print(printer);
}
-
+
}
-
+
/**
* Set the context.
* Overrides this method for a macro
@@ -268,7 +268,7 @@
color.setSelectors(selector);
}
}
-
+
/**
* Add this property to the CssStyle
*
@@ -285,13 +285,13 @@
color.addToStyle(ac, style);
}
}
-
+
/**
* 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 ((ATSCStyle) style).getBorderRightATSC();
@@ -299,16 +299,16 @@
return ((ATSCStyle) style).cssBorderATSC.getRight();
}
}
-
+
/**
* Update the source file and the line.
* Overrides this method for a macro
*
* @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);
+ super.setInfo(line, source);
if(width != null) {
width.setInfo(line, source);
}
@@ -319,24 +319,24 @@
color.setInfo(line, source);
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
if (property instanceof CssBorderBottomATSC) {
CssBorderBottomATSC bottom = (CssBorderBottomATSC) property;
- return (width.equals(bottom.width) && style.equals(bottom.style)
+ return (width.equals(bottom.width) && style.equals(bottom.style)
&& color.equals(bottom.color));
} else {
return false;
}
}
-
+
void check() {
- if ((style != null)
+ if ((style != null)
&& (style.face.value == 0)) {
if (width != null) {
width.face.value = new CssLength();
Index: BboxATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/BboxATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- BboxATSC.java 23 Aug 2005 16:23:11 -0000 1.1
+++ BboxATSC.java 14 Sep 2005 15:14:18 -0000 1.2
@@ -20,35 +20,35 @@
/**
*/
public class BboxATSC extends CssProperty {
-
+
CssValue[] value = new CssValue[4];
-
+
/**
* Create a new BboxATSC
*/
public BboxATSC() {
// nothing to do
}
-
+
/**
* Creates a new BboxATSC
*
* @param expression the unicode em
* @exception InvalidParamException values are incorrect
- */
+ */
public BboxATSC(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 4) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
boolean manyValues = expression.getCount() > 1;
-
+
CssValue val;
char op;
int i = 0;
- setByUser();
+ setByUser();
{
val = expression.getValue();
@@ -68,7 +68,7 @@
getPropertyName(), ac);
}
if (op != CssOperator.COMMA || expression.end()) {
- throw new InvalidParamException("few-value",
+ throw new InvalidParamException("few-value",
getPropertyName(), ac);
}
@@ -85,7 +85,7 @@
getPropertyName(), ac);
}
if (op != CssOperator.COMMA || expression.end()) {
- throw new InvalidParamException("few-value",
+ throw new InvalidParamException("few-value",
getPropertyName(), ac);
}
@@ -102,7 +102,7 @@
getPropertyName(), ac);
}
if (op != CssOperator.COMMA || expression.end()) {
- throw new InvalidParamException("few-value",
+ throw new InvalidParamException("few-value",
getPropertyName(), ac);
}
@@ -119,37 +119,37 @@
getPropertyName(), ac);
}
}
-
+
public BboxATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value
- */
+ */
public Object get() {
return value[0];
}
-
+
/**
* Returns a string representation of the object.
*/
- public String toString() {
+ public String toString() {
String ret = "";
for (int i = 0; i < 4; i++) {
ret += ", " + value[i];
}
return ret.substring(2);
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "bbox";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -162,13 +162,13 @@
}
style0.bboxATSC = 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 ((ATSCStyle) style).getBboxATSC();
@@ -176,23 +176,23 @@
return ((ATSCStyle) style).bboxATSC;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
// @@TODO
return false;
}
-
+
/**
* 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 false;
}
-
+
}
Index: CssBorderFaceColorATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/atsc/CssBorderFaceColorATSC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderFaceColorATSC.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorderFaceColorATSC.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -10,6 +10,7 @@
import org.w3c.css.properties.css1.CssProperty;
import org.w3c.css.util.ApplContext;
import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssColor;
import org.w3c.css.values.CssExpression;
import org.w3c.css.values.CssIdent;
import org.w3c.css.values.CssValue;
@@ -18,16 +19,16 @@
* @version $Revision$
*/
public class CssBorderFaceColorATSC {
-
+
CssValue face;
-
+
/**
* Create a new CssBorderFaceColor
*/
public CssBorderFaceColorATSC() {
face = new org.w3c.css.values.ATSCColor();
- }
-
+ }
+
/**
* Create a new CssBorderFaceColor with a color property.
*
@@ -35,8 +36,8 @@
*/
public CssBorderFaceColorATSC(ATSCColor color) {
face = color.color;
- }
-
+ }
+
/**
* Create a new CssBorderFaceColor with an another CssBorderFaceColor
*
@@ -44,8 +45,8 @@
*/
public CssBorderFaceColorATSC(CssBorderFaceColorATSC another) {
face = another.face;
- }
-
+ }
+
/**
* Create a new CssBorderFaceColor with an expression
*
@@ -54,58 +55,59 @@
*/
public CssBorderFaceColorATSC(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
-
- if (val instanceof org.w3c.css.values.ATSCColor) {
+
+ if (val instanceof org.w3c.css.values.ATSCColor ||
+ val instanceof CssColor) {
face = val;
} else if (val.equals(CssProperty.inherit)) {
face = CssProperty.inherit;
} else if (val instanceof CssIdent) {
face = new org.w3c.css.values.ATSCColor(ac, (String) val.get());
} else {
- throw new InvalidParamException("value", val.toString(),
+ throw new InvalidParamException("value", val.toString(),
"border-color", ac);
}
expression.next();
}
-
+
public CssBorderFaceColorATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the internal color
- */
+ */
public CssValue getColor() {
return face;
}
-
+
/**
* Is the value of this face is a default value.
* It is used by all macro for the function <code>print</code>
- */
+ */
public boolean isDefault() {
return false; // @@ FIXME face.isDefault();
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return face.toString();
}
-
+
/**
* Compares two faces for equality.
*
* @param value The another faces.
- */
+ */
public boolean equals(CssBorderFaceColorATSC color) {
return this.face.equals(color.face);
}
Received on Wednesday, 14 September 2005 15:18:35 UTC