- From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
- Date: Wed, 14 Sep 2005 15:14:34 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/properties/css1
In directory hutz:/tmp/cvs-serv9389/org/w3c/css/properties/css1
Modified Files:
Css1Style.java CssBackground.java CssBackgroundAttachment.java
CssBackgroundAttachmentCSS1.java
CssBackgroundAttachmentCSS2.java
CssBackgroundAttachmentMob.java CssBackgroundCSS1.java
CssBackgroundCSS2.java CssBackgroundColor.java
CssBackgroundColorCSS1.java CssBackgroundColorCSS2.java
CssBackgroundColorMob.java CssBackgroundConstants.java
CssBackgroundImage.java CssBackgroundImageCSS1.java
CssBackgroundImageCSS2.java CssBackgroundImageMob.java
CssBackgroundMob.java CssBackgroundPosition.java
CssBackgroundPositionCSS1.java CssBackgroundPositionCSS2.java
CssBackgroundPositionMob.java CssBackgroundRepeat.java
CssBackgroundRepeatCSS1.java CssBackgroundRepeatCSS2.java
CssBackgroundRepeatMob.java CssBackgroundTV.java
CssBorder.java CssBorderBottom.java CssBorderBottomCSS1.java
CssBorderBottomCSS2.java CssBorderBottomColor.java
CssBorderBottomColorCSS1.java CssBorderBottomColorCSS2.java
CssBorderBottomStyle.java CssBorderBottomStyleCSS1.java
CssBorderBottomStyleCSS2.java CssBorderBottomWidth.java
CssBorderBottomWidthCSS1.java CssBorderBottomWidthCSS2.java
CssBorderCSS1.java CssBorderCSS2.java CssBorderColor.java
CssBorderColorCSS1.java CssBorderColorCSS2.java
CssBorderFaceColor.java CssBorderFaceColorCSS1.java
CssBorderFaceColorCSS2.java CssBorderFaceStyle.java
CssBorderFaceStyleCSS1.java CssBorderFaceStyleCSS2.java
CssBorderFaceWidth.java CssBorderFaceWidthCSS1.java
CssBorderFaceWidthCSS2.java CssBorderLeft.java
CssBorderLeftCSS1.java CssBorderLeftCSS2.java
CssBorderLeftColor.java CssBorderLeftColorCSS1.java
CssBorderLeftColorCSS2.java CssBorderLeftStyle.java
CssBorderLeftStyleCSS1.java CssBorderLeftStyleCSS2.java
CssBorderLeftWidth.java CssBorderLeftWidthCSS1.java
CssBorderLeftWidthCSS2.java CssBorderRight.java
CssBorderRightCSS1.java CssBorderRightCSS2.java
CssBorderRightColor.java CssBorderRightColorCSS1.java
CssBorderRightColorCSS2.java CssBorderRightStyle.java
CssBorderRightStyleCSS1.java CssBorderRightStyleCSS2.java
CssBorderRightWidth.java CssBorderRightWidthCSS1.java
CssBorderRightWidthCSS2.java CssBorderStyle.java
CssBorderStyleCSS1.java CssBorderStyleCSS2.java
CssBorderTop.java CssBorderTopCSS1.java CssBorderTopCSS2.java
CssBorderTopColor.java CssBorderTopColorCSS1.java
CssBorderTopColorCSS2.java CssBorderTopStyle.java
CssBorderTopStyleCSS1.java CssBorderTopStyleCSS2.java
CssBorderTopWidth.java CssBorderTopWidthCSS1.java
CssBorderTopWidthCSS2.java CssBorderWidth.java
CssBorderWidthCSS1.java CssBorderWidthCSS2.java CssBottom.java
CssBoxOffsetFace.java CssClear.java CssClip.java CssColor.java
CssColorCSS1.java CssColorCSS2.java CssContent.java
CssContentCSS2.java CssCounterIncrement.java
CssCounterReset.java CssDirection.java CssDirectionATSC.java
CssDisplay.java CssDisplayCSS1.java CssDisplayCSS2.java
CssFloat.java CssFont.java CssFontCSS1.java CssFontCSS2.java
CssFontConstant.java CssFontConstantCSS1.java
CssFontConstantCSS2.java CssFontFamily.java
CssFontFamilyCSS1.java CssFontFamilyCSS2.java CssFontSize.java
CssFontSizeAdjust.java CssFontSizeAdjustCSS2.java
CssFontSizeCSS1.java CssFontSizeCSS2.java CssFontStretch.java
CssFontStretchCSS1.java CssFontStretchCSS2.java
CssFontStyle.java CssFontStyleCSS1.java CssFontStyleCSS2.java
CssFontVariant.java CssFontVariantCSS1.java
CssFontVariantCSS2.java CssFontWeight.java
CssFontWeightCSS1.java CssFontWeightCSS2.java CssHeight.java
CssHeightMob.java CssLeft.java CssLetterSpacing.java
CssLineHeight.java CssLineHeightCSS1.java
CssLineHeightCSS2.java CssListStyle.java CssListStyleCSS1.java
CssListStyleCSS2.java CssListStyleConstants.java
CssListStyleImage.java CssListStyleImageCSS1.java
CssListStyleImageCSS2.java CssListStylePosition.java
CssListStylePositionCSS1.java CssListStylePositionCSS2.java
CssListStyleTV.java CssListStyleType.java
CssListStyleTypeCSS1.java CssListStyleTypeCSS2.java
CssListStyleTypeTV.java CssMargin.java CssMarginBottom.java
CssMarginLeft.java CssMarginRight.java CssMarginSide.java
CssMarginTop.java CssMarkerOffset.java
CssMarkerOffsetATSC.java CssMaxHeight.java
CssMaxHeightATSC.java CssMaxWidth.java CssMaxWidthATSC.java
CssMinHeight.java CssMinHeightATSC.java CssMinWidth.java
CssMinWidthATSC.java CssOverflow.java CssPadding.java
CssPaddingBottom.java CssPaddingLeft.java CssPaddingRight.java
CssPaddingSide.java CssPaddingTop.java CssPosition.java
CssPositionTV.java CssProperties.java CssProperty.java
CssQuotes.java CssQuotesATSC.java CssRight.java
CssTextAlign.java CssTextAlignMob.java CssTextAlignTV.java
CssTextDecoration.java CssTextDecorationMob.java
CssTextDecorationTV.java CssTextIndent.java
CssTextIndentMob.java CssTextShadow.java
CssTextShadowATSC.java CssTextTransform.java CssTop.java
CssUnicodeBidi.java CssUnicodeBidiATSC.java
CssVerticalAlign.java CssVerticalAlignCSS1.java
CssVerticalAlignMob.java CssVerticalAlignTV.java
CssVisibility.java CssWhiteSpace.java CssWidth.java
CssWidthMob.java CssWordSpacing.java CssZIndex.java
TextShadowFace.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: CssBorderTopStyleCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderTopStyleCSS2.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderTopStyleCSS2.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssBorderTopStyleCSS2.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -16,16 +16,16 @@
* @version $Revision$
*/
public class CssBorderTopStyleCSS2 extends CssProperty {
-
+
CssBorderFaceStyleCSS2 face;
-
+
/**
* Create a new CssBorderTopStyleCSS2
*/
public CssBorderTopStyleCSS2() {
face = new CssBorderFaceStyleCSS2();
}
-
+
/**
* Create a new CssBorderTopStyleCSS2 with an another CssBorderFaceStyleCSS2
*
@@ -33,10 +33,10 @@
*/
public CssBorderTopStyleCSS2(CssBorderFaceStyleCSS2 another) {
setByUser();
-
+
face = another;
}
-
+
/**
* Create a new CssBorderTopStyleCSS2
*
@@ -45,27 +45,27 @@
*/
public CssBorderTopStyleCSS2(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
face = new CssBorderFaceStyleCSS2(ac, expression);
}
-
+
public CssBorderTopStyleCSS2(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression,false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return face;
}
-
+
/**
* Returns the value
*/
@@ -75,7 +75,7 @@
}
return null;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -85,14 +85,14 @@
}
return "";
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "border-top-style";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -104,13 +104,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 ((Css1Style) style).getBorderTopStyleCSS2();
@@ -118,15 +118,15 @@
return ((Css1Style) style).cssBorderCSS2.getTop().style;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssBorderTopStyleCSS2 &&
+ return (property instanceof CssBorderTopStyleCSS2 &&
face.equals(((CssBorderTopStyleCSS2) property).face));
}
-
+
}
Index: CssPaddingTop.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssPaddingTop.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssPaddingTop.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssPaddingTop.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -38,7 +38,7 @@
public CssPaddingTop() {
super();
}
-
+
/**
* Create a new CssPaddingTop with an another CssPaddingSide.
*
@@ -47,7 +47,7 @@
public CssPaddingTop(CssPaddingSide another) {
super(another);
}
-
+
/**
* Create a new CssPaddingTop
*
@@ -58,15 +58,15 @@
throws InvalidParamException {
super(ac, expression, check);
}
-
+
public CssPaddingTop(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "padding-top";
}
@@ -88,7 +88,7 @@
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getPaddingTop();
@@ -101,7 +101,7 @@
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
return (property instanceof CssPaddingTop && value.equals(((CssPaddingTop) property).value));
}
Index: CssBorderBottomWidthCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderBottomWidthCSS2.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderBottomWidthCSS2.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorderBottomWidthCSS2.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -44,14 +44,14 @@
public class CssBorderBottomWidthCSS2 extends CssProperty {
CssBorderFaceWidthCSS2 face;
-
+
/**
* Create a new CssBorderBottomWidth
*/
public CssBorderBottomWidthCSS2() {
face = new CssBorderFaceWidthCSS2();
}
-
+
/**
* Create a new CssBorderBottomWidth with an another CssBorderFaceWidth
*
@@ -62,7 +62,7 @@
face = another;
}
-
+
/**
* Create a new CssBorderBottomWidth
*
@@ -71,7 +71,7 @@
*/
public CssBorderBottomWidthCSS2(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
@@ -79,12 +79,12 @@
setByUser();
face = new CssBorderFaceWidthCSS2(ac, expression);
}
-
- public CssBorderBottomWidthCSS2(ApplContext ac, CssExpression expression)
+
+ public CssBorderBottomWidthCSS2(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
@@ -114,7 +114,7 @@
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "border-bottom-width";
}
@@ -149,9 +149,9 @@
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssBorderBottomWidthCSS2 &&
+ return (property instanceof CssBorderBottomWidthCSS2 &&
face.equals(((CssBorderBottomWidthCSS2) property).face));
}
Index: CssBackgroundPosition.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBackgroundPosition.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssBackgroundPosition.java 8 Sep 2005 12:23:33 -0000 1.4
+++ CssBackgroundPosition.java 14 Sep 2005 15:14:31 -0000 1.5
@@ -48,7 +48,7 @@
* background image. Keywords cannot be combined with percentage values, or
* length values. The possible combinations of keywords and their
* interpretations are as follows:
-
+
* <UL>
* <LI>
* 'top left' and 'left top' both mean the same as '0% 0%'.
@@ -82,54 +82,54 @@
* 'background-attachment' property above), the image is placed relative to
* the canvas instead of the element. E.g.:
* <PRE>
- * BODY {
+ * BODY {
* background-image: url(logo.png);
* background-attachment: fixed;
* background-position: 100% 100%;
- * }
+ * }
* </PRE>
* <P>
* In the example above, the image is placed in the lower right corner of the
* canvas.
* @version $Revision$
- * @see CssBackgroundAttachment
+ * @see CssBackgroundAttachment
*/
-public class CssBackgroundPosition extends CssProperty
+public class CssBackgroundPosition extends CssProperty
implements CssBackgroundConstants, CssOperator {
-
+
CssValue first;
CssValue second;
-
+
/**
* Create a new CssBackgroundPosition
*/
public CssBackgroundPosition() {
first = DefaultValue0;
second = DefaultValue0;
- }
-
+ }
+
/**
* Creates a new CssBackgroundPosition
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssBackgroundPosition(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
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);
@@ -139,9 +139,9 @@
expression.next();
return;
}
-
- CssValue next = expression.getNextValue();
-
+
+ CssValue next = expression.getNextValue();
+
if(val instanceof CssIdent) {
int index1 = IndexOfIdent((String) val.get());
if(index1 == -1) {
@@ -158,10 +158,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);
}
@@ -171,7 +171,7 @@
}
// a keyword and a percentage/length
else if(next instanceof CssLength || next instanceof CssPercentage
- || next instanceof CssNumber) {
+ || next instanceof CssNumber) {
if(next instanceof CssNumber) {
next = ((CssNumber) next).getLength();
}
@@ -179,8 +179,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);
@@ -191,8 +191,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 {
@@ -239,62 +239,62 @@
}
}
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();
}
}
-
- public CssBackgroundPosition(ApplContext ac, CssExpression expression)
+
+ public CssBackgroundPosition(ApplContext ac, CssExpression expression)
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
*/
public Object get() {
return first;
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "background-position";
}
-
+
/**
* Returns the horizontal value of the position
*/
public CssValue getHorizontalPosition() {
return first;
}
-
+
/**
* Returns the vertical value of the position
*/
public CssValue getVerticalPosition() {
return second;
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -302,7 +302,7 @@
public boolean isSoftlyInherited() {
return first == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -348,13 +348,13 @@
style.addRedefinitionWarning(ac, this);
cssBackground.position = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getBackgroundPosition();
@@ -362,46 +362,46 @@
return ((Css1Style) style).cssBackground.position;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
return ((property == null && first == null && second == null) ||
- (property instanceof CssBackgroundPosition &&
+ (property instanceof CssBackgroundPosition &&
first != null &&
first.equals(((CssBackgroundPosition) property).first) &&
second != null &&
second.equals(((CssBackgroundPosition) property).second)));
}
-
+
/**
* 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 first != null && second != null &&
first.equals(DefaultValue0) && second.equals(DefaultValue0);
}
-
+
private int IndexOfIdent(String ident) throws InvalidParamException {
int hash = ident.hashCode();
for (int i = 0; i < POSITION.length; i++)
if (hash_values[i] == hash)
return i;
-
+
return -1;
}
-
+
private static int[] hash_values;
-
+
// private static int INVALID = -1;
private static CssPercentage DefaultValue0 = new CssPercentage(0);
// private static CssPercentage DefaultValue50 = new CssPercentage(50);
// private static CssPercentage DefaultValue100 = new CssPercentage(100);
-
+
static {
hash_values = new int[POSITION.length];
for (int i = 0; i < POSITION.length; i++)
Index: CssBorderLeftWidth.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderLeftWidth.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderLeftWidth.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorderLeftWidth.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -44,16 +44,16 @@
* @version $Revision$
*/
public class CssBorderLeftWidth extends CssProperty {
-
+
CssBorderFaceWidth face;
-
+
/**
* Create a new CssBorderLeftWidth
*/
public CssBorderLeftWidth() {
face = new CssBorderFaceWidth();
}
-
+
/**
* Create a new CssBorderLeftWidth with an another CssBorderFaceWidth
*
@@ -61,10 +61,10 @@
*/
public CssBorderLeftWidth(CssBorderFaceWidth another) {
setByUser();
-
+
face = another;
}
-
+
/**
* Create a new CssBorderLeftWidth
*
@@ -73,27 +73,27 @@
*/
public CssBorderLeftWidth(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
face = new CssBorderFaceWidth(ac, expression);
}
-
+
public CssBorderLeftWidth(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
*/
@@ -103,7 +103,7 @@
}
return null;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -113,14 +113,14 @@
}
return "";
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "border-left-width";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -132,13 +132,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 ((Css1Style) style).getBorderLeftWidth();
@@ -146,15 +146,15 @@
return ((Css1Style) style).cssBorder.getLeft().width;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssBorderLeftWidth &&
+ return (property instanceof CssBorderLeftWidth &&
face.equals(((CssBorderLeftWidth) property).face));
}
-
+
}
Index: CssBorderColor.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderColor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderColor.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorderColor.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -90,7 +90,7 @@
top.face.face = inherit;
expression.next();
} else*/
- top = new CssBorderTopColor(ac, expression);
+ top = new CssBorderTopColor(ac, expression);
bottom = new CssBorderBottomColor((CssBorderFaceColor) top.get());
right = new CssBorderRightColor((CssBorderFaceColor) top.get());
left = new CssBorderLeftColor((CssBorderFaceColor) top.get());
@@ -171,11 +171,11 @@
}
}
- public CssBorderColor(ApplContext ac, CssExpression expression)
+ public CssBorderColor(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
@@ -207,7 +207,7 @@
} else {
return top + " " + right + " " + bottom + " " + left;
}
-
+
}
/**
Index: CssPosition.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssPosition.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssPosition.java 23 Aug 2005 16:23:12 -0000 1.1
+++ CssPosition.java 14 Sep 2005 15:14:31 -0000 1.2
@@ -18,36 +18,36 @@
/**
*/
public class CssPosition extends CssProperty {
-
+
int value;
-
+
private static String[] POSITION = {
"static", "relative", "absolute", "fixed", "inherit" };
private static int[] hash_values;
-
+
/**
* Create a new CssPosition
*/
public CssPosition() {
// nothing to do
- }
-
+ }
+
/**
* Create a new CssPosition
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorect
- */
+ */
public CssPosition(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) {
@@ -59,30 +59,30 @@
return;
}
}
-
- throw new InvalidParamException("value", expression.getValue(),
+
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
-
+
public CssPosition(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return POSITION[value];
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "position";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -90,14 +90,14 @@
public boolean isSoftlyInherited() {
return value == POSITION.length - 1;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return POSITION[value];
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -109,13 +109,13 @@
style0.addRedefinitionWarning(ac, this);
style0.cssPosition = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getPosition();
@@ -123,25 +123,25 @@
return ((Css1Style) style).cssPosition;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssPosition &&
+ return (property instanceof CssPosition &&
value == ((CssPosition) property).value);
}
-
+
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
- */
+ */
public boolean isDefault() {
return value == 0;
}
-
+
static {
hash_values = new int[POSITION.length];
for (int i = 0; i < POSITION.length; i++)
Index: CssBorderBottom.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderBottom.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderBottom.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorderBottom.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -68,19 +68,19 @@
* @exception InvalidParamException The expression is incorrect
*/
public CssBorderBottom(ApplContext ac, CssExpression expression,
- boolean check) throws InvalidParamException {
+ boolean check) throws InvalidParamException {
CssValue val = null;
char op = SPACE;
boolean find = true;
-
+
if(check && expression.getCount() > 4) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
boolean manyValues = (expression.getCount() > 1);
-
+
while (find) {
find = false;
val = expression.getValue();
@@ -93,7 +93,7 @@
if(manyValues && val.equals(inherit)) {
throw new InvalidParamException("unrecognize", null, null, ac);
}
-
+
if (op != SPACE)
throw new InvalidParamException("operator",
((new Character(op)).toString()),
@@ -118,7 +118,7 @@
}
}
- if (!find && color == null) {
+ if (!find && color == null) {
try {
color = new CssBorderBottomColor(ac, expression);
find = true;
@@ -146,14 +146,14 @@
style = new CssBorderBottomStyle();
if (color == null)
color = new CssBorderBottomColor();
- */
+ */
}
- public CssBorderBottom(ApplContext ac, CssExpression expression)
+ public CssBorderBottom(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
@@ -287,7 +287,7 @@
*
* @param style The CssStyle
*/
- public void addToStyle(ApplContext ac, CssStyle style) {
+ public void addToStyle(ApplContext ac, CssStyle style) {
if(width != null) {
width.addToStyle(ac, style);
}
@@ -321,7 +321,7 @@
* @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);
}
@@ -332,7 +332,7 @@
color.setInfo(line, source);
}
}
-
+
/**
* Set the context.
* Overrides this method for a macro
Index: CssFontStretch.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssFontStretch.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssFontStretch.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssFontStretch.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -15,35 +15,35 @@
/**
*
* @see CssFont
- * @version $Revision$
+ * @version $Revision$
*/
public class CssFontStretch extends CssProperty implements CssFontConstant {
-
+
int value;
-
+
private static int[] hash_values;
-
+
/**
* Create a new CssFontStretch
*/
public CssFontStretch() {
// nothing to do
}
-
+
/**
* Creates a new CssFontStretch
*
* @param expression the font stretch
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssFontStretch(ApplContext ac, CssExpression expression,
- boolean check)
+ boolean check)
throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
if (expression.getValue() instanceof CssIdent) {
int hash = expression.getValue().hashCode();
@@ -54,23 +54,23 @@
return;
}
}
-
- throw new InvalidParamException("value", expression.getValue(),
+
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
-
+
public CssFontStretch(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value
- */
+ */
public Object get() {
return FONTSTRETCH[value];
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -78,21 +78,21 @@
public boolean isSoftlyInherited() {
return value == FONTSTRETCH.length - 1;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return FONTSTRETCH[value];
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "font-stretch";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -104,13 +104,13 @@
style0.addRedefinitionWarning(ac, this);
style0.cssFontStretch = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getFontStretch();
@@ -118,25 +118,25 @@
return ((Css1Style) style).cssFontStretch;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssFontStretch &&
+ return (property instanceof CssFontStretch &&
((CssFontStretch) property).value == value);
}
-
+
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
- */
+ */
public boolean isDefault() {
return value == 0;
}
-
+
static {
hash_values = new int[FONTSTRETCH.length];
for (int i=0;i<FONTSTRETCH.length;i++)
Index: CssHeight.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssHeight.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssHeight.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssHeight.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -47,40 +47,40 @@
* @version $Revision$
*/
public class CssHeight extends CssProperty {
-
+
CssValue value;
-
+
private static CssIdent auto = new CssIdent("auto");
-
+
/**
* Create a new CssHeight
*/
public CssHeight() {
value = auto;
- }
-
+ }
+
/**
* Create a new CssHeight
*
* @param expression The expression for this property
* @exception InvalidParamException The expression is incorrect
- */
+ */
public CssHeight(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)) {
value = inherit;
} else if (val instanceof CssLength || val instanceof CssPercentage) {
float f = ((Float) val.get()).floatValue();
if (f < 0) {
- throw new InvalidParamException("negative-value",
+ throw new InvalidParamException("negative-value",
val.toString(), ac);
}
value = val;
@@ -89,32 +89,32 @@
} else if (val instanceof CssNumber) {
value = ((CssNumber) val).getLength();
} else {
- throw new InvalidParamException("value", expression.getValue(),
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
-
+
expression.next();
}
-
+
public CssHeight(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return value;
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "height";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -122,14 +122,14 @@
public boolean isSoftlyInherited() {
return value == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -141,13 +141,13 @@
style0.addRedefinitionWarning(ac, this);
style0.cssHeight = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getHeight();
@@ -155,23 +155,23 @@
return ((Css1Style) style).cssHeight;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssHeight &&
+ return (property instanceof CssHeight &&
value.equals(((CssHeight) property).value));
}
-
+
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
- */
+ */
public boolean isDefault() {
return value == auto;
}
-
+
}
Index: CssBackgroundMob.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBackgroundMob.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBackgroundMob.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBackgroundMob.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -50,11 +50,11 @@
* @see CssBackgroundImage
* @see CssBackgroundRepeat
* @see CssBackgroundAttachment
- * @see CssBackgroundPosition
+ * @see CssBackgroundPosition
*/
-public class CssBackgroundMob extends CssProperty
+public class CssBackgroundMob extends CssProperty
implements CssOperator, CssBackgroundConstants {
-
+
CssBackgroundColorMob color;
CssBackgroundImageMob image;
CssBackgroundRepeatMob repeat;
@@ -67,27 +67,27 @@
* Create a new CssBackgroundMob
*/
public CssBackgroundMob() {
- }
-
+ }
+
/**
* Set the value of the property
*
* @param expression The expression for this property
* @exception InvalidParamException The expression is incorrect
- */
+ */
public CssBackgroundMob(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();
-
+
if (val.equals(inherit)) {
if(expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
@@ -107,7 +107,7 @@
expression.next();
return;
}
-
+
while (find) {
find = false;
val = expression.getValue();
@@ -116,11 +116,11 @@
if(val.equals(inherit)) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
if (val == null) {
break;
}
-
+
if (color == null) {
try {
color = new CssBackgroundColorMob(ac, expression);
@@ -154,7 +154,7 @@
find = true;
}
if (op != SPACE) {
- throw new InvalidParamException("operator",
+ throw new InvalidParamException("operator",
((new Character(op)).toString()),
ac);
}
@@ -172,19 +172,19 @@
position = new CssBackgroundPositionMob();
*/
}
-
- public CssBackgroundMob(ApplContext ac, CssExpression expression)
+
+ public CssBackgroundMob(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return color;
}
-
+
/**
* Returns the color
*/
@@ -195,14 +195,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.trim();
}
}
-
+
/**
* Set this property to be important.
* Overrides this method for a macro
- */
+ */
public void setImportant() {
if(color != null) {
color.important = true;
@@ -246,7 +246,7 @@
position.important = true;
}
}
-
+
/**
* Returns true if this property is important.
* Overrides this method for a macro
@@ -258,14 +258,14 @@
(attachment == null || attachment.important) &&
(position == null || position.important));
}
-
+
/**
* 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.important &&
!attachment.important &&
!position.important))) {
- if (color.byUser || image.byUser || repeat.byUser
+ if (color.byUser || image.byUser || repeat.byUser
|| attachment.byUser || position.byUser) {
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
*
@@ -345,13 +345,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 ((Css1Style) style).getBackgroundMob();
@@ -359,23 +359,23 @@
return ((Css1Style) style).cssBackgroundMob;
}
}
-
+
/**
* 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) {
@@ -394,5 +394,5 @@
position.setInfo(line, source);
}
}
-
+
}
Index: CssMaxWidth.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssMaxWidth.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssMaxWidth.java 23 Aug 2005 16:23:12 -0000 1.1
+++ CssMaxWidth.java 14 Sep 2005 15:14:31 -0000 1.2
@@ -21,41 +21,41 @@
/**
*/
public class CssMaxWidth extends CssProperty {
-
+
CssValue value;
-
+
private static CssIdent none = new CssIdent("none");
-
+
/**
* Create a new CssMaxWidth
*/
public CssMaxWidth() {
value = none;
- }
-
+ }
+
/**
* Create a new CssMaxWidth.
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssMaxWidth(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)) {
value = inherit;
} else if (val instanceof CssLength || val instanceof CssPercentage) {
float f = ((Float) val.get()).floatValue();
if (f < 0) {
- throw new InvalidParamException("negative-value",
+ throw new InvalidParamException("negative-value",
val.toString(), ac);
}
value = val;
@@ -64,32 +64,32 @@
} else if (val instanceof CssNumber) {
value = ((CssNumber) val).getLength();
} else {
- throw new InvalidParamException("value", expression.getValue(),
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
-
+
expression.next();
}
-
+
public CssMaxWidth(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property.
*/
public Object get() {
return value;
}
-
+
/**
* Returns the name of this property.
- */
+ */
public String getPropertyName() {
return "max-width";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -97,15 +97,15 @@
public boolean isSoftlyInherited() {
return value == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
-
+
+
/**
* Add this property to the CssStyle.
*
@@ -117,13 +117,13 @@
style0.addRedefinitionWarning(ac, this);
style0.cssMaxWidth = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getMaxWidth();
@@ -131,23 +131,23 @@
return ((Css1Style) style).cssMaxWidth;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssMaxWidth
+ return (property instanceof CssMaxWidth
&& value.equals(((CssMaxWidth) property).value));
}
-
+
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
- */
+ */
public boolean isDefault() {
return value == none;
}
-
+
}
Index: CssListStyleCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssListStyleCSS1.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssListStyleCSS1.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssListStyleCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -70,40 +70,40 @@
* <P> In the example above, the 'disc' will be used when the image is
* unavailable.
*
- * @version $Revision$
+ * @version $Revision$
*/
public class CssListStyleCSS1 extends CssProperty implements CssOperator {
-
+
CssListStyleTypeCSS1 listStyleType;
CssListStyleImageCSS1 listStyleImage;
CssListStylePositionCSS1 listStylePosition;
boolean inheritedValue;
-
+
/**
* Create a new CssListStyleCSS1
*/
public CssListStyleCSS1() {
// nothing to do
- }
-
+ }
+
/**
* Create a new CssListStyleCSS1
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssListStyleCSS1(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 3) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
char op = SPACE;
boolean find = true;
-
+
setByUser();
/*
if (val.equals(inherit)) {
@@ -114,12 +114,12 @@
expression.next();
return;
}
-*/
+*/
while (find) {
find = false;
val = expression.getValue();
op = expression.getOperator();
-
+
if ((listStyleType == null)
&& (val != null)) {
try {
@@ -128,16 +128,16 @@
} catch (InvalidParamException e) {
}
}
- if (!find
+ if (!find
&& (listStyleImage == null)
&& (val != null)) {
try {
listStyleImage = new CssListStyleImageCSS1(ac, expression);
find = true;
} catch (InvalidParamException e) {
- }
+ }
}
- if (!find
+ if (!find
&& (val != null)
&& (listStylePosition == null)) {
listStylePosition = new CssListStylePositionCSS1(ac, expression);
@@ -147,7 +147,7 @@
throw new InvalidParamException("unrecognize", ac);
}
if (op != SPACE) {
- throw new InvalidParamException("operator",
+ throw new InvalidParamException("operator",
((new Character(op)).toString()),
ac);
}
@@ -156,35 +156,35 @@
if (listStyleType == null) {
listStyleType = new CssListStyleTypeCSS1();
}
-
+
if (listStyleImage == null) {
listStyleImage = new CssListStyleImageCSS1();
}
-
+
if (listStylePosition == null) {
listStylePosition = new CssListStylePositionCSS1();
}*/
}
-
+
public CssListStyleCSS1(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return listStyleType;
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "list-style";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -192,7 +192,7 @@
public boolean isSoftlyInherited() {
return inheritedValue;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -213,13 +213,13 @@
return ret.trim();
}
}
-
-
-
+
+
+
/**
* Set this property to be important.
* Overrides this method for a macro
- */
+ */
public void setImportant() {
if (!inheritedValue) {
if(listStyleType != null)
@@ -230,7 +230,7 @@
listStylePosition.important = true;
}
}
-
+
/**
* Returns true if this property is important.
* Overrides this method for a macro
@@ -240,13 +240,13 @@
(listStyleImage == null || listStyleImage.important) &&
(listStylePosition == null || listStylePosition.important));
}
-
+
/**
* Print this property.
*
* @see #toString()
* @see #getPropertyName()
- */
+ */
public void print(CssPrinterStyle printer) {
if (inheritedValue) {
printer.print(this);
@@ -268,9 +268,9 @@
listStylePosition.print(printer);
}
}
-
+
}
-
+
/**
* Set the context.
* Overrides this method for a macro
@@ -290,7 +290,7 @@
listStylePosition.setSelectors(selector);
}
}
-
+
/**
* Add this property to the CssStyle
*
@@ -308,13 +308,13 @@
((Css1Style) style).cssListStyleCSS1.inheritedValue = true;
}
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getListStyleCSS1();
@@ -322,14 +322,14 @@
return ((Css1Style) style).cssListStyleCSS1;
}
}
-
+
/**
* 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 (!inheritedValue) {
@@ -341,15 +341,15 @@
listStylePosition.setInfo(line, source);
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
// @FIXME
return false;
}
-
+
}
Index: CssBackgroundColor.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBackgroundColor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBackgroundColor.java 8 Sep 2005 12:23:33 -0000 1.3
+++ CssBackgroundColor.java 14 Sep 2005 15:14:31 -0000 1.4
@@ -52,7 +52,7 @@
*/
public CssBackgroundColor(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
@@ -82,11 +82,11 @@
}
}
- public CssBackgroundColor(ApplContext ac, CssExpression expression)
+ public CssBackgroundColor(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
Index: CssTextDecoration.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssTextDecoration.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssTextDecoration.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssTextDecoration.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -48,41 +48,41 @@
*
* @version $Revision$
*/
-public class CssTextDecoration extends CssProperty
+public class CssTextDecoration extends CssProperty
implements CssTextPropertiesConstants {
-
+
CssValue value;
private boolean[] values = new boolean[TEXTDECORATION.length];
-
+
private static int[] hash_values;
-
+
private static CssIdent none = new CssIdent("none");
-
+
private static final int INVALID = -1;
-
+
/**
* Create a new CssTextDecoration
*/
public CssTextDecoration() {
- }
-
+ }
+
/**
* Create a new CssTextDecoration
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
- public CssTextDecoration(ApplContext ac, CssExpression expression, boolean check)
+ */
+ public CssTextDecoration(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
-
+
CssValue val = expression.getValue();
boolean find = true;
//int computed = 0;
int index = INVALID;
-
+
setByUser();
-
+
if (val.equals(none)) {
if(expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
@@ -99,23 +99,23 @@
return;
}
val = null;
-
+
if(check && expression.getCount() > 4) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
while (find) {
find = false;
val = expression.getValue();
-
+
if(val != null && val.equals(inherit)) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
if (val instanceof CssIdent) {
index = getIndex((CssIdent) val, ac);
if (values[index] == true) {
- throw new InvalidParamException("same-value",
+ throw new InvalidParamException("same-value",
TEXTDECORATION[index], ac);
} else {
values[index] = true;
@@ -123,17 +123,17 @@
expression.next();
}
} else if (val != null) {
- throw new InvalidParamException("value", val.toString(),
+ throw new InvalidParamException("value", val.toString(),
getPropertyName(), ac);
}
}
}
-
- public CssTextDecoration(ApplContext ac, CssExpression expression)
+
+ public CssTextDecoration(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
@@ -148,14 +148,14 @@
}
return null;
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "text-decoration";
}
-
+
private int getIndex(CssIdent val, ApplContext ac) throws InvalidParamException {
int hash = val.hashCode();
for (int i = 0; i < TEXTDECORATION.length; i++) {
@@ -163,10 +163,10 @@
return i;
}
}
- throw new InvalidParamException("value", val.toString(),
+ throw new InvalidParamException("value", val.toString(),
getPropertyName(), ac);
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -174,7 +174,7 @@
public boolean isSoftlyInherited() {
return value == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -191,7 +191,7 @@
return ret.substring(1);
}
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -204,13 +204,13 @@
}
style0.cssTextDecoration = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getTextDecoration();
@@ -218,21 +218,21 @@
return ((Css1Style) style).cssTextDecoration;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
// @@ FIXME
return false;
}
-
+
static {
hash_values = new int[TEXTDECORATION.length];
for (int i=0; i<TEXTDECORATION.length; i++) {
hash_values[i] = TEXTDECORATION[i].hashCode();
}
- }
+ }
}
Index: CssLineHeightCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssLineHeightCSS2.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssLineHeightCSS2.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssLineHeightCSS2.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -16,7 +16,7 @@
import org.w3c.css.values.CssPercentage;
import org.w3c.css.values.CssValue;
-/**
+/**
* <H4>
* 'line-height'
* </H4>
@@ -45,35 +45,35 @@
* DIV { line-height: 120%; font-size: 10pt } /* percentage * /
* </PRE>
*
- * @version $Revision$
+ * @version $Revision$
*/
public class CssLineHeightCSS2 extends CssProperty {
-
+
/**
* Create a new CssLineHeightCSS2
*/
public CssLineHeightCSS2() {
value = normal;
}
-
+
/**
* Creates a new CssLineHeightCSS2
*
* @param expression The expression for this property
* @exception InvalidParamException The expression is incorrect
- */
+ */
public CssLineHeightCSS2(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 CssNumber || val instanceof CssLength ||
+ if (val instanceof CssNumber || val instanceof CssLength ||
val instanceof CssPercentage) {
float v = ((Float) val.get()).floatValue();
if (v >= 0) {
@@ -81,7 +81,7 @@
expression.next();
return;
} else {
- throw new InvalidParamException("negative-value",
+ throw new InvalidParamException("negative-value",
Float.toString(v), ac);
}
} else if (inherit.equals(val)) {
@@ -93,16 +93,16 @@
expression.next();
return;
}
-
- throw new InvalidParamException("value", expression.getValue(),
+
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
-
+
public CssLineHeightCSS2(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
@@ -111,14 +111,14 @@
return normal;
return value;
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "line-height";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -126,14 +126,14 @@
public boolean isSoftlyInherited() {
return value == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
- public String toString() {
+ public String toString() {
return value.toString();
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -145,13 +145,13 @@
style.addRedefinitionWarning(ac, this);
cssFont.lineHeight = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getLineHeightCSS2();
@@ -159,25 +159,25 @@
return ((Css1Style) style).cssFontCSS2.lineHeight;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssLineHeightCSS2 &&
+ return (property instanceof CssLineHeightCSS2 &&
((CssLineHeightCSS2) property).value == value);
}
-
+
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
- */
+ */
public boolean isDefault() {
return value == normal;
}
-
+
private CssValue value;
private static CssIdent normal = new CssIdent("normal");
}
Index: CssTextAlign.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssTextAlign.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssTextAlign.java 8 Sep 2005 12:23:34 -0000 1.3
+++ CssTextAlign.java 14 Sep 2005 15:14:31 -0000 1.4
@@ -40,14 +40,14 @@
* languages.
* @version $Revision$
*/
-public class CssTextAlign extends CssProperty
+public class CssTextAlign extends CssProperty
implements CssTextPropertiesConstants {
-
+
int value;
CssValue valueString;
-
+
private static int[] hash_values;
-
+
static CssIdent start = new CssIdent("start");
static CssIdent end = new CssIdent("end");
@@ -56,25 +56,25 @@
*/
public CssTextAlign() {
// depends on user agent and writing direction
- }
-
+ }
+
/**
* Create a new CssTextAlign
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssTextAlign(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
int hash = val.hashCode();
-
+
setByUser();
-
+
if (val.equals(inherit)) {
valueString = inherit;
expression.next();
@@ -98,12 +98,12 @@
throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
}
-
- public CssTextAlign(ApplContext ac, CssExpression expression)
+
+ public CssTextAlign(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
- }
-
+ }
+
/**
* @return Returns the value.
*/
@@ -142,14 +142,14 @@
return TEXTALIGN[value];
}
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "text-align";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -157,7 +157,7 @@
public boolean isSoftlyInherited() {
return valueString == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -168,7 +168,7 @@
return TEXTALIGN[value];
}
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -180,13 +180,13 @@
style0.addRedefinitionWarning(ac, this);
style0.cssTextAlign = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getTextAlign();
@@ -194,22 +194,22 @@
return ((Css1Style) style).cssTextAlign;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
if (valueString != null) {
- return (property instanceof CssTextAlign
+ return (property instanceof CssTextAlign
&& valueString.equals(((CssTextAlign) property).valueString));
} else {
- return (property instanceof CssTextAlign
+ return (property instanceof CssTextAlign
&& value == ((CssTextAlign) property).value);
}
}
-
+
static {
hash_values = new int[TEXTALIGN.length];
for (int i=0; i<TEXTALIGN.length; i++)
Index: CssTextDecorationTV.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssTextDecorationTV.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssTextDecorationTV.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssTextDecorationTV.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -75,7 +75,7 @@
*/
public CssTextDecorationTV(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
CssValue val = expression.getValue();
boolean find = true;
//int computed = 0;
@@ -103,15 +103,15 @@
if(check && expression.getCount() > 4) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
while (find) {
find = false;
val = expression.getValue();
-
+
if(val != null && val.equals(inherit)) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
if (val instanceof CssIdent) {
index = getIndex((CssIdent) val, ac);
if (values[index] == true) {
@@ -129,11 +129,11 @@
}
}
- public CssTextDecorationTV(ApplContext ac, CssExpression expression)
+ public CssTextDecorationTV(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
Index: CssContent.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssContent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssContent.java 23 Aug 2005 16:23:12 -0000 1.1
+++ CssContent.java 14 Sep 2005 15:14:31 -0000 1.2
@@ -210,7 +210,7 @@
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
Index: CssListStyleType.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssListStyleType.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssListStyleType.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssListStyleType.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -66,11 +66,11 @@
*/
public CssListStyleType(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
setByUser();
@@ -92,7 +92,7 @@
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
Index: CssDisplay.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssDisplay.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssDisplay.java 8 Sep 2005 12:23:34 -0000 1.3
+++ CssDisplay.java 14 Sep 2005 15:14:31 -0000 1.4
@@ -46,11 +46,11 @@
*/
public CssDisplay(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
setByUser();
@@ -74,7 +74,7 @@
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
Index: CssPaddingSide.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssPaddingSide.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssPaddingSide.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssPaddingSide.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -18,16 +18,16 @@
* @version $Revision$
*/
public abstract class CssPaddingSide extends CssProperty {
-
+
CssValue value;
-
+
/**
* Create a new CssPaddingSide.
*/
public CssPaddingSide() {
value = new CssLength();
}
-
+
/**
* Create a new CssPaddingSide with an another CssPaddingSide
*
@@ -36,24 +36,24 @@
public CssPaddingSide(CssPaddingSide another) {
value = another.value;
}
-
+
/**
* Create a new CssPaddingSide
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssPaddingSide(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)) {
value = inherit;
expression.next();
@@ -61,37 +61,37 @@
value = val;
float v = ((Float) val.get()).floatValue();
if (v < 0)
- throw new InvalidParamException("negative-value",
+ throw new InvalidParamException("negative-value",
Float.toString(v), ac);
expression.next();
} else if (val instanceof CssNumber) {
value = ((CssNumber) val).getLength();
expression.next();
} else {
- throw new InvalidParamException("value", val.toString(),
+ throw new InvalidParamException("value", val.toString(),
getPropertyName(), ac);
}
}
-
+
public CssPaddingSide(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return value;
}
-
+
/**
* Returns the internal value
*/
public CssValue getValue() {
return value;
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -99,19 +99,19 @@
public boolean isSoftlyInherited() {
return value == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
- public String toString() {
+ public String toString() {
return value.toString();
}
-
-
+
+
/**
* 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 ((Float) value.get()).floatValue() == 0;
}
Index: CssFontConstantCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssFontConstantCSS2.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssFontConstantCSS2.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssFontConstantCSS2.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -13,42 +13,42 @@
/**
* Array of font-style values
- */
+ */
static String[] FONTSTYLE = { "normal", "italic", "oblique", "inherit" };
/**
* Array of font-variant values
- */
+ */
static String[] FONTVARIANT = { "normal", "small-caps", "inherit" };
/**
* Array of font-size values
- */
- static String[] FONTSIZE = {
+ */
+ static String[] FONTSIZE = {
"xx-small", "x-small", "small", "medium", "large", "x-large", "xx-large",
"larger", "smaller", "inherit"
}; // relative-size
/**
* Array of font-weight values
- */
- static String[] FONTWEIGHT = { "normal", "bold", "bolder",
+ */
+ static String[] FONTWEIGHT = { "normal", "bold", "bolder",
"lighter", "inherit" };
-
+
/**
* Array of font-stretch values
- */
- static String[] FONTSTRETCH = { "normal", "wider", "narrower",
- "ultra-condensed", "extra-condensed",
- "condensed", "semi-condensed",
+ */
+ static String[] FONTSTRETCH = { "normal", "wider", "narrower",
+ "ultra-condensed", "extra-condensed",
+ "condensed", "semi-condensed",
"semi-expanded", "expanded", "extra-expanded",
"ultra-expanded", "inherit" };
-
+
/**
* Array of font values
- */
- static String[] FONT = { "caption", "icon", "menu",
- "message-box", "small-caption",
+ */
+ static String[] FONT = { "caption", "icon", "menu",
+ "message-box", "small-caption",
"status-bar", "inherit" };
}
Index: CssListStyleImage.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssListStyleImage.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssListStyleImage.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssListStyleImage.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -34,35 +34,35 @@
* @version $Revision$
*/
public class CssListStyleImage extends CssProperty {
-
+
CssValue value;
-
+
private static CssIdent none = new CssIdent("none");
-
+
/**
* Create a new CssListStyleImage
*/
public CssListStyleImage() {
value = none;
- }
-
+ }
+
/**
* Create a new CssListStyleImage
*
* @param value The value for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssListStyleImage(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 CssURL) {
value = val;
expression.next();
@@ -76,26 +76,26 @@
throw new InvalidParamException("value", val, getPropertyName(), ac);
}
}
-
+
public CssListStyleImage(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return value;
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "list-style-image";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -103,14 +103,14 @@
public boolean isSoftlyInherited() {
return value == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -122,13 +122,13 @@
style.addRedefinitionWarning(ac, this);
cssListStyle.listStyleImage = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getListStyleImage();
@@ -136,23 +136,23 @@
return ((Css1Style) style).cssListStyle.listStyleImage;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssListStyleImage &&
+ return (property instanceof CssListStyleImage &&
value.equals(((CssListStyleImage) property).value));
}
-
+
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
- */
+ */
public boolean isDefault() {
return value == none;
}
-
+
}
Index: CssBackgroundColorMob.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBackgroundColorMob.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBackgroundColorMob.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBackgroundColorMob.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -32,18 +32,18 @@
* @version $Revision$
*/
public class CssBackgroundColorMob extends CssProperty {
-
+
CssValue color;
-
+
static CssIdent transparent = new CssIdent("transparent");
-
+
/**
* Create a new CssBackgroundColorMob
*/
public CssBackgroundColorMob() {
color = transparent;
- }
-
+ }
+
/**
* Create a new CssBackgroundColorMob
*
@@ -52,14 +52,14 @@
*/
public CssBackgroundColorMob(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.CssColorCSS2) {
color = val;
expression.next();
@@ -75,30 +75,30 @@
expression.next();
}
} else {
- throw new InvalidParamException("value", val.toString(),
+ throw new InvalidParamException("value", val.toString(),
getPropertyName(), ac);
}
- }
-
- public CssBackgroundColorMob(ApplContext ac, CssExpression expression)
+ }
+
+ public CssBackgroundColorMob(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
@@ -109,7 +109,7 @@
}
return false;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -119,8 +119,8 @@
}
return "";
}
-
-
+
+
/**
* Add this property to the CssStyle.
*
@@ -132,13 +132,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 ((Css1Style) style).getBackgroundColorMob();
@@ -146,30 +146,30 @@
return ((Css1Style) style).cssBackgroundMob.color;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
return (property instanceof CssBackgroundColorCSS2 && color != null &&
color.equals( ((CssBackgroundColorCSS2) 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: CssFontConstantCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssFontConstantCSS1.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssFontConstantCSS1.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssFontConstantCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -13,37 +13,37 @@
/**
* Array of font-style values
- */
+ */
static String[] FONTSTYLE = { "normal", "italic", "oblique", "inherit" };
/**
* Array of font-variant values
- */
+ */
static String[] FONTVARIANT = { "normal", "small-caps", "inherit" };
/**
* Array of font-size values
- */
- static String[] FONTSIZE = {
+ */
+ static String[] FONTSIZE = {
"xx-small", "x-small", "small", "medium", "large", "x-large", "xx-large",
"larger", "smaller", "inherit"
}; // relative-size
/**
* Array of font-weight values
- */
- static String[] FONTWEIGHT = { "normal", "bold", "bolder",
+ */
+ static String[] FONTWEIGHT = { "normal", "bold", "bolder",
"lighter", "inherit" };
-
+
/**
* Array of font-stretch values
- */
- static String[] FONTSTRETCH = { "normal", "wider", "narrower",
- "ultra-condensed", "extra-condensed",
- "condensed", "semi-condensed",
+ */
+ static String[] FONTSTRETCH = { "normal", "wider", "narrower",
+ "ultra-condensed", "extra-condensed",
+ "condensed", "semi-condensed",
"semi-expanded", "expanded", "extra-expanded",
"ultra-expanded", "inherit" };
-
+
}
Index: CssBorderTopStyle.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderTopStyle.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderTopStyle.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssBorderTopStyle.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -16,16 +16,16 @@
* @version $Revision$
*/
public class CssBorderTopStyle extends CssProperty {
-
+
CssBorderFaceStyle face;
-
+
/**
* Create a new CssBorderTopStyle
*/
public CssBorderTopStyle() {
face = new CssBorderFaceStyle();
}
-
+
/**
* Create a new CssBorderTopStyle with an another CssBorderFaceStyle
*
@@ -33,10 +33,10 @@
*/
public CssBorderTopStyle(CssBorderFaceStyle another) {
setByUser();
-
+
face = another;
}
-
+
/**
* Create a new CssBorderTopStyle
*
@@ -45,27 +45,27 @@
*/
public CssBorderTopStyle(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
face = new CssBorderFaceStyle(ac, expression);
}
-
+
public CssBorderTopStyle(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression,false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return face;
}
-
+
/**
* Returns the value
*/
@@ -75,7 +75,7 @@
}
return null;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -85,14 +85,14 @@
}
return "";
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "border-top-style";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -104,13 +104,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 ((Css1Style) style).getBorderTopStyle();
@@ -118,15 +118,15 @@
return ((Css1Style) style).cssBorder.getTop().style;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssBorderTopStyle &&
+ return (property instanceof CssBorderTopStyle &&
face.equals(((CssBorderTopStyle) property).face));
}
-
+
}
Index: CssLineHeight.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssLineHeight.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssLineHeight.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssLineHeight.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -71,7 +71,7 @@
*/
public CssLineHeight(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
@@ -121,7 +121,7 @@
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
Index: CssProperty.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssProperty.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssProperty.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssProperty.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -84,7 +84,7 @@
* Used in all CSS versions
*/
public static final CssIdent transparent = new CssIdent("transparent");
-
+
/**
* Value introduced in CSS3
*/
Index: CssFontSize.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssFontSize.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssFontSize.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssFontSize.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -72,33 +72,33 @@
* <P>
* If the suggested scaling factor of 1.5 is used, the last three declarations
* are identical.
- * @version $Revision$
+ * @version $Revision$
*/
public class CssFontSize extends CssProperty implements CssFontConstant {
-
+
int value;
CssValue cssValue;
-
+
/**
* Create a new FontSize
- */
+ */
public CssFontSize() {
value = 3; // default value is medium
}
-
+
/**
* Creates a new CssFontSize
*
* @param expression the expression of the size
* @exception InvalidParamException The expression is incorrect
- */
+ */
public CssFontSize(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) {
@@ -114,7 +114,7 @@
} else if (val instanceof CssPercentage) {
float num = ((Float) val.get()).floatValue();
if (num < 0) {
- throw new InvalidParamException("negative-value",
+ throw new InvalidParamException("negative-value",
val.toString(), ac);
}
this.cssValue = val;
@@ -134,30 +134,30 @@
expression.next();
return;
} else {
- throw new InvalidParamException("negative-value",
+ throw new InvalidParamException("negative-value",
val.toString(), ac);
}
}
- throw new InvalidParamException("value",
+ throw new InvalidParamException("value",
val, getPropertyName(), ac);
}
-
+
public CssFontSize(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value
- */
+ */
public Object get() {
if (cssValue != null)
return cssValue;
else
return FONTSIZE[value];
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -165,7 +165,7 @@
public boolean isSoftlyInherited() {
return value == FONTSIZE.length - 1;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -175,15 +175,15 @@
else
return FONTSIZE[value];
}
-
-
+
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "font-size";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -195,13 +195,13 @@
style.addRedefinitionWarning(ac, this);
cssFont.fontSize = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getFontSize();
@@ -209,23 +209,23 @@
return ((Css1Style) style).cssFont.fontSize;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
if (cssValue == null)
- return (property instanceof CssFontSize &&
+ return (property instanceof CssFontSize &&
((CssFontSize) property).value == value);
else
- return (property instanceof CssFontSize &&
+ return (property instanceof CssFontSize &&
((CssFontSize) property).cssValue.equals(cssValue));
}
-
+
private static int[] hash_values;
-
+
static {
hash_values = new int[FONTSIZE.length];
for (int i=0; i<FONTSIZE.length; i++)
Index: CssListStyleTypeTV.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssListStyleTypeTV.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssListStyleTypeTV.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssListStyleTypeTV.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -54,11 +54,11 @@
*/
public CssListStyleTypeTV(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
setByUser();
@@ -79,7 +79,7 @@
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
Index: CssBorderStyleCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderStyleCSS1.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderStyleCSS1.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssBorderStyleCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -84,15 +84,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 CssBorderStyleCSS1 extends CssProperty implements CssOperator {
-
+
CssBorderTopStyleCSS1 top;
CssBorderBottomStyleCSS1 bottom;
CssBorderRightStyleCSS1 right;
CssBorderLeftStyleCSS1 left;
-
+
/**
* Create a new CssBorderStyleCSS1
*/
@@ -100,24 +100,24 @@
CssBorderBottomStyleCSS1 bottom,
CssBorderRightStyleCSS1 right,
CssBorderLeftStyleCSS1 left) {
-
+
this.top = top;
this.bottom = bottom;
this.left = left;
this.right = right;
- }
-
+ }
+
/**
* Create a new CssBorderStyleCSS1
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssBorderStyleCSS1(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
setByUser();
-
+
switch (expression.getCount()) {
case 1:
top = new CssBorderTopStyleCSS1(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);
top = new CssBorderTopStyleCSS1(ac, expression);
@@ -137,12 +137,12 @@
break;
case 3:
if (expression.getOperator() != SPACE)
- throw new InvalidParamException("operator",
+ throw new InvalidParamException("operator",
((new Character(expression.getOperator())).toString()),
ac);
top = new CssBorderTopStyleCSS1(ac, expression);
if (expression.getOperator() != SPACE)
- throw new InvalidParamException("operator",
+ throw new InvalidParamException("operator",
((new Character(expression.getOperator())).toString()),
ac);
right = new CssBorderRightStyleCSS1(ac, expression);
@@ -151,17 +151,17 @@
break;
case 4:
if (expression.getOperator() != SPACE)
- throw new InvalidParamException("operator",
+ throw new InvalidParamException("operator",
((new Character(expression.getOperator())).toString()),
ac);
top = new CssBorderTopStyleCSS1(ac, expression);
if (expression.getOperator() != SPACE)
- throw new InvalidParamException("operator",
+ throw new InvalidParamException("operator",
((new Character(expression.getOperator())).toString()),
ac);
right = new CssBorderRightStyleCSS1(ac, expression);
if (expression.getOperator() != SPACE)
- throw new InvalidParamException("operator",
+ throw new InvalidParamException("operator",
((new Character(expression.getOperator())).toString()),
ac);
bottom = new CssBorderBottomStyleCSS1(ac, expression);
@@ -173,30 +173,30 @@
}
}
}
-
+
public CssBorderStyleCSS1(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.
*/
- public String toString() {
+ public String toString() {
if (right.face.equals(left.face)) {
if (top.face.equals(bottom.face)) {
if (top.face.equals(right.face)) {
@@ -211,11 +211,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.important = true;
@@ -230,7 +230,7 @@
bottom.important = true;
}
}
-
+
/**
* Returns true if this property is important.
* Overrides this method for a macro
@@ -241,14 +241,14 @@
(left == null || left.important) &&
(bottom == null || bottom.important));
}
-
+
/**
* 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) &&
@@ -268,9 +268,9 @@
if (bottom != null)
bottom.print(printer);
}
-
+
}
-
+
/**
* Set the context.
* Overrides this method for a macro
@@ -293,7 +293,7 @@
left.setSelectors(selector);
}
}
-
+
/**
* Add this property to the CssStyle
*
@@ -313,25 +313,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) {
@@ -344,15 +344,15 @@
left.setInfo(line, source);
}
if(bottom != null) {
- bottom.setInfo(line, source);
+ bottom.setInfo(line, source);
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
return false; // FIXME
}
Index: CssColorCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssColorCSS1.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssColorCSS1.java 8 Sep 2005 12:23:34 -0000 1.3
+++ CssColorCSS1.java 14 Sep 2005 15:14:31 -0000 1.4
@@ -28,10 +28,10 @@
* the <EM>foreground</EM> color). There are different ways to specify red:
* <PRE>
* EM { color: red } /* natural language * /
- * EM { color: rgb(255,0,0) } /* RGB range 0-255 * /
- * </PRE>
- * @version $Revision$
- */
+ * EM { color: rgb(255,0,0) } /* RGB range 0-255 * /
+ * </PRE>
+ * @version $Revision$
+ */
public class CssColorCSS1 extends CssProperty {
CssValue color;
@@ -55,7 +55,7 @@
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
if (val instanceof org.w3c.css.values.CssColor) {
color = val;
expression.next();
@@ -72,7 +72,7 @@
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
@@ -83,16 +83,8 @@
/**
* Returns the color
*/
- public org.w3c.css.values.CssColorCSS1 getColor() {
- if (color.equals(inherit)) {
- /*
- System.err.println("[ERROR] org.w3c.css.properties.CssColor");
- System.err.println("[ERROR] value is inherited");
- */
- return null;
- } else {
- return (org.w3c.css.values.CssColorCSS1) color;
- }
+ public org.w3c.css.values.CssColor getColor() {
+ return (org.w3c.css.values.CssColor) color;
}
/**
Index: CssBackgroundAttachment.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBackgroundAttachment.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBackgroundAttachment.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBackgroundAttachment.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -28,7 +28,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;
@@ -36,35 +36,35 @@
* </PRE>
* @version $Revision$
*/
-public class CssBackgroundAttachment extends CssProperty
+public class CssBackgroundAttachment extends CssProperty
implements CssBackgroundConstants {
-
+
int attachment;
-
+
private static int[] hash_values;
-
+
/**
* Create a new CssBackgroundAttachment
*/
public CssBackgroundAttachment() {
// nothing to do
- }
-
+ }
+
/**
* Creates a new CssBackgroundAttachment
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssBackgroundAttachment(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) {
@@ -76,23 +76,23 @@
return;
}
}
-
- throw new InvalidParamException("value", expression.getValue(),
+
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
-
- public CssBackgroundAttachment(ApplContext ac, CssExpression expression)
+
+ public CssBackgroundAttachment(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
@@ -100,21 +100,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.
*
@@ -126,13 +126,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 ((Css1Style) style).getBackgroundAttachment();
@@ -140,25 +140,25 @@
return ((Css1Style) style).cssBackground.attachment;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssBackgroundAttachment &&
+ return (property instanceof CssBackgroundAttachment &&
attachment == ((CssBackgroundAttachment) 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: CssBorderFaceColorCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderFaceColorCSS2.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorderFaceColorCSS2.java 8 Sep 2005 12:23:33 -0000 1.3
+++ CssBorderFaceColorCSS2.java 14 Sep 2005 15:14:31 -0000 1.4
@@ -17,7 +17,7 @@
*/
public class CssBorderFaceColorCSS2 {
- CssValue face;
+ CssValue face;
/**
* Create a new CssBorderFaceColor
@@ -52,7 +52,7 @@
*/
public CssBorderFaceColorCSS2(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
@@ -72,11 +72,11 @@
expression.next();
}
- public CssBorderFaceColorCSS2(ApplContext ac, CssExpression expression)
+ public CssBorderFaceColorCSS2(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* @return Returns the face.
*/
Index: CssBorderLeftWidthCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderLeftWidthCSS1.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderLeftWidthCSS1.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorderLeftWidthCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -44,16 +44,16 @@
* @version $Revision$
*/
public class CssBorderLeftWidthCSS1 extends CssProperty {
-
+
CssBorderFaceWidthCSS1 face;
-
+
/**
* Create a new CssBorderLeftWidthCSS1
*/
public CssBorderLeftWidthCSS1() {
face = new CssBorderFaceWidthCSS1();
}
-
+
/**
* Create a new CssBorderLeftWidthCSS1 with an another CssBorderFaceWidthCSS1
*
@@ -61,10 +61,10 @@
*/
public CssBorderLeftWidthCSS1(CssBorderFaceWidthCSS1 another) {
setByUser();
-
+
face = another;
}
-
+
/**
* Create a new CssBorderLeftWidthCSS1
*
@@ -73,27 +73,27 @@
*/
public CssBorderLeftWidthCSS1(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
face = new CssBorderFaceWidthCSS1(ac, expression);
}
-
+
public CssBorderLeftWidthCSS1(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
*/
@@ -103,7 +103,7 @@
}
return null;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -113,14 +113,14 @@
}
return "";
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "border-left-width";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -132,13 +132,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 ((Css1Style) style).getBorderLeftWidthCSS1();
@@ -146,15 +146,15 @@
return ((Css1Style) style).cssBorderCSS1.getLeft().width;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssBorderLeftWidthCSS1 &&
+ return (property instanceof CssBorderLeftWidthCSS1 &&
face.equals(((CssBorderLeftWidthCSS1) property).face));
}
-
+
}
Index: CssListStyleImageCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssListStyleImageCSS2.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssListStyleImageCSS2.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssListStyleImageCSS2.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -34,35 +34,35 @@
* @version $Revision$
*/
public class CssListStyleImageCSS2 extends CssProperty {
-
+
CssValue value;
-
+
private static CssIdent none = new CssIdent("none");
-
+
/**
* Create a new CssListStyleImageCSS2
*/
public CssListStyleImageCSS2() {
value = none;
- }
-
+ }
+
/**
* Create a new CssListStyleImageCSS2
*
* @param value The value for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssListStyleImageCSS2(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 CssURL) {
value = val;
expression.next();
@@ -76,26 +76,26 @@
throw new InvalidParamException("value", val, getPropertyName(), ac);
}
}
-
+
public CssListStyleImageCSS2(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return value;
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "list-style-image";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -103,14 +103,14 @@
public boolean isSoftlyInherited() {
return value == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -122,13 +122,13 @@
style.addRedefinitionWarning(ac, this);
cssListStyle.listStyleImage = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getListStyleImageCSS2();
@@ -136,23 +136,23 @@
return ((Css1Style) style).cssListStyleCSS2.listStyleImage;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssListStyleImageCSS2 &&
+ return (property instanceof CssListStyleImageCSS2 &&
value.equals(((CssListStyleImageCSS2) property).value));
}
-
+
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
- */
+ */
public boolean isDefault() {
return value == none;
}
-
+
}
Index: CssFontWeightCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssFontWeightCSS1.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssFontWeightCSS1.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssFontWeightCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -98,7 +98,7 @@
* ----------------------+---------------+-------------------
* "Example2 Book" | 400 | 100, 200, 300
* "Example2 Medium" | 500 |
- * "Example2 Bold" | 700 | 600
+ * "Example2 Bold" | 700 | 600
* "Example2 Heavy" | 800 |
* "Example2 Black" | 900 |
* "Example2 ExtraBlack" | (none) |
@@ -128,48 +128,48 @@
* values. The only guarantee is that a face of a given value will be no less
* dark than the faces of lighter values.
*
- * @version $Revision$
+ * @version $Revision$
*/
public class CssFontWeightCSS1 extends CssProperty implements CssFontConstantCSS1 {
-
-
+
+
/**
* an index in a array
*
* @see CssFontConstant#FONTWEIGHT
- */
+ */
protected int value;
-
+
// internal hack to compare strings
private static int[] hash_values;
-
+
/**
* Create a new FontWeightCSS1 with the default value.
- */
+ */
public CssFontWeightCSS1() {
// nothing to do
}
-
+
/**
* Creates a new CssFontWeightCSS1 with an expression.
*
* @param expr the expression
* @exception InvalidParamException values are incorrect
- */
+ */
public CssFontWeightCSS1(ApplContext ac, CssExpression expr, boolean check)
throws InvalidParamException {
-
+
if(check && expr.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expr.getValue();
-
+
setByUser();
-
+
if (val instanceof CssIdent) {
int hash = expr.getValue().hashCode();
-
+
// try to find the hashCode in my internal hack array
for (int i=0; i<hash_values.length; i++)
if (hash_values[i] == hash) {
@@ -178,36 +178,37 @@
return;
}
} else if (val instanceof CssNumber) {
- float valf = ((Float) val.get()).floatValue();
- int vali = (int) valf;
- if (((valf - (float) vali) == 0) // real part number must be equal to zero
- && isCorrectWeight(vali)) { // verify the entire part number
- this.value = vali;
- expr.next();
- return;
+ Object valf = val.get();
+ if(valf instanceof Integer) {
+ int vali = ((Integer) valf).intValue();
+ if(isCorrectWeight(vali)) { // verify the entire part number
+ this.value = vali;
+ expr.next();
+ return;
+ }
}
}
-
- throw new InvalidParamException("value", expr.getValue().toString(),
+
+ throw new InvalidParamException("value", expr.getValue().toString(),
getPropertyName(), ac);
}
-
+
public CssFontWeightCSS1(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value.
- */
+ */
public Object get() {
if (value >= 100)
return new Integer(value);
else
return FONTWEIGHT[value];
}
-
-
+
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -215,7 +216,7 @@
public boolean isSoftlyInherited() {
return value == FONTWEIGHT.length - 1;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -225,32 +226,32 @@
else
return FONTWEIGHT[value];
}
-
+
/**
* Returns the name of this property.
- */
+ */
public String getPropertyName() {
return "font-weight";
}
-
+
/**
* Add this property to the CssStyle
*
* @param style The CssStyle
- */
+ */
public void addToStyle(ApplContext ac, CssStyle style) {
CssFontCSS1 cssFont = ((Css1Style) style).cssFontCSS1;
if (cssFont.fontWeight != null)
style.addRedefinitionWarning(ac, this);
cssFont.fontWeight = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getFontWeightCSS1();
@@ -258,30 +259,30 @@
return ((Css1Style) style).cssFontCSS1.fontWeight;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssFontWeightCSS1 &&
+ return (property instanceof CssFontWeightCSS1 &&
((CssFontWeightCSS1) property).value == value);
}
-
+
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
- */
+ */
public boolean isDefault() {
return value == 0;
}
-
+
private boolean isCorrectWeight(int val) {
val = val / 100;
return val > 0 && val < 10;
}
-
+
static {
hash_values = new int[FONTWEIGHT.length];
for (int i=0; i<FONTWEIGHT.length; i++)
Index: Css1Style.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/Css1Style.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Css1Style.java 8 Sep 2005 12:23:33 -0000 1.3
+++ Css1Style.java 14 Sep 2005 15:14:31 -0000 1.4
@@ -24,7 +24,7 @@
* The Css1Style main class.
*/
public class Css1Style extends CssStyle {
-
+
/** Font properties */
protected CssFont cssFont = new CssFont();
protected CssFontCSS2 cssFontCSS2 = new CssFontCSS2();
@@ -34,7 +34,7 @@
protected CssFontStretchCSS1 cssFontStretchCSS1;
protected CssFontSizeAdjust cssFontSizeAdjust;
[...2294 lines suppressed...]
-
+
if (cssMarkerOffset != null) {
//@@ beurk you know what ? 5 is horrible.
if ((cssDisplay == null)
@@ -2727,7 +2935,6 @@
}
}
}
-
}
class RelativeAndAbsolute {
@@ -2753,5 +2960,5 @@
}
}
}
-
+
}
Index: CssVerticalAlign.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssVerticalAlign.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssVerticalAlign.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssVerticalAlign.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -90,38 +90,38 @@
*
* @version $Revision$
*/
-public class CssVerticalAlign extends CssProperty
+public class CssVerticalAlign extends CssProperty
implements CssTextPropertiesConstants {
-
+
Object value;
-
+
private static int[] hash_values;
-
+
/**
* Create a new CssVerticalAlign
*/
public CssVerticalAlign() {
value = VERTICALALIGN[0];
}
-
+
/**
* Create a new CssVerticalAlign
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssVerticalAlign(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
int hash = val.hashCode();
-
+
setByUser();
-
+
if (val instanceof CssIdent) {
for (int i = 0; i < VERTICALALIGN.length; i++)
if (hash_values[i] == hash) {
@@ -129,7 +129,7 @@
expression.next();
return;
}
- throw new InvalidParamException("value",
+ throw new InvalidParamException("value",
val.toString(), getPropertyName(), ac);
} else if (val instanceof CssPercentage) {
value = val;
@@ -141,37 +141,37 @@
value = ((CssNumber) val).getLength();
expression.next();
} else {
- throw new InvalidParamException("value",
+ throw new InvalidParamException("value",
val.toString(), getPropertyName(), ac);
}
}
-
+
public CssVerticalAlign(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return value;
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "vertical-align";
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -183,13 +183,13 @@
style0.addRedefinitionWarning(ac, this);
style0.cssVerticalAlign = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getVerticalAlign();
@@ -197,24 +197,24 @@
return ((Css1Style) style).cssVerticalAlign;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
return (property instanceof CssVerticalAlign && value.equals(((CssVerticalAlign) property).value));
}
-
+
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
- */
+ */
public boolean isDefault() {
return value.equals(VERTICALALIGN[0]);
}
-
+
static {
hash_values = new int[VERTICALALIGN.length];
for (int i=0; i<VERTICALALIGN.length; i++)
Index: CssBorderRightColor.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderRightColor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderRightColor.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssBorderRightColor.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -18,28 +18,28 @@
* @version $Revision$
*/
public class CssBorderRightColor extends CssProperty {
-
+
CssBorderFaceColor face;
-
+
/**
* Create a new CssBorderRightColor
*/
public CssBorderRightColor() {
face = new CssBorderFaceColor();
}
-
+
/**
* Create a new CssBorderRightColor with an another CssBorderFaceColor
*
* @param anothewr The another side.
*/
public CssBorderRightColor(CssBorderFaceColor another) {
-
+
setByUser();
-
+
face = another;
}
-
+
/**
* Create a new CssBorderRightColor.
*
@@ -48,27 +48,27 @@
*/
public CssBorderRightColor(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
face = new CssBorderFaceColor(ac, expression);
}
-
+
public CssBorderRightColor(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
*/
@@ -78,7 +78,7 @@
}
return null;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -88,14 +88,14 @@
}
return "";
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "border-right-color";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -107,13 +107,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 ((Css1Style) style).getBorderRightColor();
@@ -121,22 +121,22 @@
return ((Css1Style) style).cssBorder.getRight().color;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssBorderRightColor &&
+ return (property instanceof CssBorderRightColor &&
face.equals(((CssBorderRightColor) property).face));
}
-
+
/**
* Print this property.
*
* @param printer The printer.
- */
+ */
public void print(CssPrinterStyle printer) {
if (face != null && !face.isDefault())
printer.print(this);
Index: CssBorderBottomWidthCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderBottomWidthCSS1.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderBottomWidthCSS1.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorderBottomWidthCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -44,14 +44,14 @@
public class CssBorderBottomWidthCSS1 extends CssProperty {
CssBorderFaceWidthCSS1 face;
-
+
/**
* Create a new CssBorderBottomWidth
*/
public CssBorderBottomWidthCSS1() {
face = new CssBorderFaceWidthCSS1();
}
-
+
/**
* Create a new CssBorderBottomWidth with an another CssBorderFaceWidth
*
@@ -62,7 +62,7 @@
face = another;
}
-
+
/**
* Create a new CssBorderBottomWidth
*
@@ -71,7 +71,7 @@
*/
public CssBorderBottomWidthCSS1(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
@@ -79,12 +79,12 @@
setByUser();
face = new CssBorderFaceWidthCSS1(ac, expression);
}
-
- public CssBorderBottomWidthCSS1(ApplContext ac, CssExpression expression)
+
+ public CssBorderBottomWidthCSS1(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
@@ -114,7 +114,7 @@
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "border-bottom-width";
}
@@ -149,9 +149,9 @@
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssBorderBottomWidthCSS1 &&
+ return (property instanceof CssBorderBottomWidthCSS1 &&
face.equals(((CssBorderBottomWidthCSS1) property).face));
}
Index: CssDirection.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssDirection.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssDirection.java 23 Aug 2005 16:23:12 -0000 1.1
+++ CssDirection.java 14 Sep 2005 15:14:31 -0000 1.2
@@ -18,34 +18,34 @@
/**
*/
public class CssDirection extends CssProperty {
-
+
CssValue value;
-
+
private static CssIdent ltr = new CssIdent("ltr");
private static CssIdent rtl = new CssIdent("rtl");
-
+
/**
* Create a new CssDirection
*/
public CssDirection() {
value = ltr;
- }
-
+ }
+
/**
* Create a new CssDirection
*
* @param expression The expression for this property
* @exception InvalidParamException The expression is incorrect
- */
+ */
public CssDirection(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)) {
value = inherit;
@@ -57,31 +57,31 @@
value = rtl;
expression.next();
} else {
- throw new InvalidParamException("value", expression.getValue(),
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
-
+
}
-
+
public CssDirection(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return value;
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "direction";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -89,14 +89,14 @@
public boolean isSoftlyInherited() {
return value == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -108,13 +108,13 @@
style0.addRedefinitionWarning(ac, this);
style0.cssDirection = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getDirection();
@@ -122,23 +122,23 @@
return ((Css1Style) style).cssDirection;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssDirection &&
+ return (property instanceof CssDirection &&
value.equals(((CssDirection) property).value));
}
-
+
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
- */
+ */
public boolean isDefault() {
return value == ltr;
}
-
+
}
Index: CssListStyleTypeCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssListStyleTypeCSS1.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssListStyleTypeCSS1.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssListStyleTypeCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -33,36 +33,36 @@
* OL { list-style-type: lower-roman } /* i ii iii iv v etc. * /
* </PRE>
* @version $Revision$ */
-public class CssListStyleTypeCSS1 extends CssProperty
+public class CssListStyleTypeCSS1 extends CssProperty
implements CssListStyleConstants {
-
+
int value;
-
+
private static int[] hash_values;
-
+
/**
* Create a new CssListStyleTypeCSS1
*/
public CssListStyleTypeCSS1() {
// nothing to do
- }
-
+ }
+
/**
* Create a new CssListStyleTypeCSS1
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssListStyleTypeCSS1(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 < LISTSTYLETYPECSS1.length; i++)
@@ -72,29 +72,29 @@
return;
}
}
-
+
throw new InvalidParamException("value", val, getPropertyName(), ac);
}
-
+
public CssListStyleTypeCSS1(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return LISTSTYLETYPECSS1[value];
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "list-style-type";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -102,14 +102,14 @@
public boolean isSoftlyInherited() {
return value == (LISTSTYLETYPECSS1.length - 1);
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return LISTSTYLETYPECSS1[value];
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -121,13 +121,13 @@
style.addRedefinitionWarning(ac, this);
cssListStyle.listStyleType = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getListStyleTypeCSS1();
@@ -135,25 +135,25 @@
return ((Css1Style) style).cssListStyleCSS1.listStyleType;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssListStyleTypeCSS1 &&
+ return (property instanceof CssListStyleTypeCSS1 &&
((CssListStyleTypeCSS1) property).value == value);
}
-
+
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
- */
+ */
public boolean isDefault() {
return value == 0;
}
-
+
static {
hash_values = new int[LISTSTYLETYPECSS1.length];
for (int i = 0; i < LISTSTYLETYPECSS1.length; i++)
Index: CssMinHeight.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssMinHeight.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssMinHeight.java 23 Aug 2005 16:23:12 -0000 1.1
+++ CssMinHeight.java 14 Sep 2005 15:14:31 -0000 1.2
@@ -20,70 +20,70 @@
/**
*/
public class CssMinHeight extends CssProperty {
-
+
CssValue value;
-
+
/**
* Create a new CssMinHeight
*/
public CssMinHeight() {
- }
-
+ }
+
/**
* Create a new CssMinHeight.
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssMinHeight(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)) {
value = inherit;
} else if (val instanceof CssLength || val instanceof CssPercentage) {
float f = ((Float) val.get()).floatValue();
if (f < 0) {
- throw new InvalidParamException("negative-value",
+ throw new InvalidParamException("negative-value",
val.toString(), ac);
}
value = val;
} else if (val instanceof CssNumber) {
value = ((CssNumber) val).getLength();
} else {
- throw new InvalidParamException("value", expression.getValue(),
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
-
+
expression.next();
}
-
+
public CssMinHeight(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property.
*/
public Object get() {
return value;
}
-
+
/**
* Returns the name of this property.
- */
+ */
public String getPropertyName() {
return "min-height";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -91,15 +91,15 @@
public boolean isSoftlyInherited() {
return value == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
-
+
+
/**
* Add this property to the CssStyle.
*
@@ -111,13 +111,13 @@
style0.addRedefinitionWarning(ac, this);
style0.cssMinHeight = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getMinHeight();
@@ -125,15 +125,15 @@
return ((Css1Style) style).cssMinHeight;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssMinHeight
+ return (property instanceof CssMinHeight
&& value.equals(((CssMinHeight) property).value));
}
-
+
}
Index: CssBorderColorCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderColorCSS2.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorderColorCSS2.java 8 Sep 2005 12:23:33 -0000 1.3
+++ CssBorderColorCSS2.java 14 Sep 2005 15:14:31 -0000 1.4
@@ -34,9 +34,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>
@@ -46,16 +46,16 @@
* @version $Revision$
*/
public class CssBorderColorCSS2 extends CssProperty implements CssOperator {
-
+
CssBorderTopColorCSS2 top;
CssBorderBottomColorCSS2 bottom;
CssBorderRightColorCSS2 right;
- CssBorderLeftColorCSS2 left;
-
+ CssBorderLeftColorCSS2 left;
+
public CssBorderColorCSS2() {
-
+
}
-
+
/**
* Create a new CssBorderColorCSS2 with all four sides
*/
@@ -67,24 +67,24 @@
this.bottom = bottom;
this.left = left;
this.right = right;
- }
-
+ }
+
/**
* Create a new CssBorderCSS2
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssBorderColorCSS2(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
setByUser();
-
+
CssValue val;
-
+
switch (expression.getCount()) {
case 1:
-
+
val = expression.getValue();
if (val.equals(transparent)) {
top = new CssBorderTopColorCSS2();
@@ -101,9 +101,9 @@
// left = new CssBorderLeftColorCSS2((CssBorderFaceColorCSS2) 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);
val = expression.getValue();
@@ -121,8 +121,8 @@
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);
val = expression.getValue();
if(val.equals(inherit) || val.equals(transparent)) {
@@ -130,7 +130,7 @@
}
top = new CssBorderTopColorCSS2(ac, expression);
if (expression.getOperator() != SPACE)
- throw new InvalidParamException("operator",
+ throw new InvalidParamException("operator",
((new Character(expression.getOperator())).toString()), ac);
val = expression.getValue();
if(val.equals(inherit) || val.equals(transparent)) {
@@ -146,7 +146,7 @@
break;
case 4:
if (expression.getOperator() != SPACE)
- throw new InvalidParamException("operator",
+ throw new InvalidParamException("operator",
((new Character(expression.getOperator())).toString()),
ac);
val = expression.getValue();
@@ -155,7 +155,7 @@
}
top = new CssBorderTopColorCSS2(ac, expression);
if (expression.getOperator() != SPACE)
- throw new InvalidParamException("operator",
+ throw new InvalidParamException("operator",
((new Character(expression.getOperator())).toString()),
ac);
val = expression.getValue();
@@ -164,7 +164,7 @@
}
right = new CssBorderRightColorCSS2(ac, expression);
if (expression.getOperator() != SPACE)
- throw new InvalidParamException("operator",
+ throw new InvalidParamException("operator",
((new Character(expression.getOperator())).toString()),
ac);
val = expression.getValue();
@@ -184,12 +184,12 @@
}
}
}
-
- public CssBorderColorCSS2(ApplContext ac, CssExpression expression)
+
+ public CssBorderColorCSS2(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* @return Returns the bottom.
*/
@@ -252,14 +252,14 @@
public Object get() {
return top;
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "border-color";
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -294,11 +294,11 @@
}
*/
}
-
+
/**
* Set this property to be important.
* Overrides this method for a macro
- */
+ */
public void setImportant() {
if(top != null) {
top.important = true;
@@ -313,7 +313,7 @@
bottom.important = true;
}
}
-
+
/**
* Returns true if this property is important.
* Overrides this method for a macro
@@ -324,14 +324,14 @@
(left == null || left.important) &&
(bottom == null || bottom.important));
}
-
+
/**
* 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) &&
@@ -353,9 +353,9 @@
if (bottom != null)
bottom.print(printer);
}
-
+
}
-
+
/**
* Set the context.
* Overrides this method for a macro
@@ -378,7 +378,7 @@
left.setSelectors(selector);
}
}
-
+
/**
* Add this property to the CssStyle
*
@@ -398,25 +398,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) {
@@ -432,14 +432,14 @@
bottom.setInfo(line, source);
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
return false; // FIXME
}
-
+
}
Index: CssBackgroundRepeatMob.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBackgroundRepeatMob.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBackgroundRepeatMob.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBackgroundRepeatMob.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -32,7 +32,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;
* }
@@ -41,35 +41,35 @@
* In the example above, the image will only be repeated vertically.
* @version $Revision$
*/
-public class CssBackgroundRepeatMob extends CssProperty
+public class CssBackgroundRepeatMob extends CssProperty
implements CssBackgroundConstants {
-
+
int repeat;
-
+
private static int[] hash_values;
-
+
/**
* Create a new CssBackgroundRepeatMob
*/
public CssBackgroundRepeatMob() {
repeat = 0;
- }
-
+ }
+
/**
* Set the value of the property
* @param expression The expression for this property
* @exception InvalidParamException The expression is incorrect
- */
+ */
public CssBackgroundRepeatMob(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++) {
@@ -80,23 +80,23 @@
}
}
}
-
- throw new InvalidParamException("value", expression.getValue(),
+
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
-
- public CssBackgroundRepeatMob(ApplContext ac, CssExpression expression)
+
+ public CssBackgroundRepeatMob(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
@@ -104,21 +104,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.
*
@@ -130,13 +130,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 ((Css1Style) style).getBackgroundRepeatMob();
@@ -144,25 +144,25 @@
return ((Css1Style) style).cssBackgroundMob.repeat;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssBackgroundRepeatMob &&
+ return (property instanceof CssBackgroundRepeatMob &&
repeat == ((CssBackgroundRepeatMob) 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: CssBorderFaceColorCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderFaceColorCSS1.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderFaceColorCSS1.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorderFaceColorCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -52,7 +52,7 @@
*/
public CssBorderFaceColorCSS1(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
@@ -70,11 +70,11 @@
expression.next();
}
- public CssBorderFaceColorCSS1(ApplContext ac, CssExpression expression)
+ public CssBorderFaceColorCSS1(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the internal color
*/
Index: CssFontVariant.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssFontVariant.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssFontVariant.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssFontVariant.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -47,33 +47,33 @@
*
* @see CssFont
* @see TextTransform
- * @version $Revision$
+ * @version $Revision$
*/
public class CssFontVariant extends CssProperty implements CssFontConstant {
-
+
int value;
-
+
/**
* Create a new CssFontVariant
*/
public CssFontVariant() {
// nothing to do
}
-
+
/**
* Creates a new CssFontVariant
*
* @param expression the font variant
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssFontVariant(ApplContext ac, CssExpression expression,
- boolean check)
+ boolean check)
throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
if (expression.getValue() instanceof CssIdent) {
int hash = expression.getValue().hashCode();
@@ -84,23 +84,23 @@
return;
}
}
-
- throw new InvalidParamException("value", expression.getValue(),
+
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
-
+
public CssFontVariant(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value
- */
+ */
public Object get() {
return FONTVARIANT[value];
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -108,21 +108,21 @@
public boolean isSoftlyInherited() {
return value == FONTVARIANT.length - 1;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return FONTVARIANT[value];
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "font-variant";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -134,13 +134,13 @@
style.addRedefinitionWarning(ac, this);
cssFont.fontVariant = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getFontVariant();
@@ -148,27 +148,27 @@
return ((Css1Style) style).cssFont.fontVariant;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssFontVariant &&
+ return (property instanceof CssFontVariant &&
((CssFontVariant) property).value == value);
}
-
+
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
- */
+ */
public boolean isDefault() {
return value == 0;
}
-
+
private static int[] hash_values;
-
+
static {
hash_values = new int[FONTVARIANT.length];
for (int i=0;i<FONTVARIANT.length;i++)
Index: CssPaddingRight.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssPaddingRight.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssPaddingRight.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssPaddingRight.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -39,7 +39,7 @@
public CssPaddingRight() {
super();
}
-
+
/**
* Create a new CssPaddingRight with an another CssPaddingSide
*
@@ -48,7 +48,7 @@
public CssPaddingRight(CssPaddingSide another) {
super(another);
}
-
+
/**
* Create a new CssPaddingRight
*
@@ -59,15 +59,15 @@
throws InvalidParamException {
super(ac, expression, check);
}
-
+
public CssPaddingRight(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "padding-right";
}
@@ -89,7 +89,7 @@
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getPaddingRight();
@@ -102,9 +102,9 @@
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssPaddingRight &&
+ return (property instanceof CssPaddingRight &&
value.equals(((CssPaddingRight) property).value));
}
Index: CssBorderStyle.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderStyle.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderStyle.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssBorderStyle.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -84,15 +84,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 CssBorderStyle extends CssProperty implements CssOperator {
-
+
CssBorderTopStyle top;
CssBorderBottomStyle bottom;
CssBorderRightStyle right;
CssBorderLeftStyle left;
-
+
/**
* Create a new CssBorderStyle
*/
@@ -104,19 +104,19 @@
this.bottom = bottom;
this.left = left;
this.right = right;
- }
-
+ }
+
/**
* Create a new CssBorder
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssBorderStyle(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
setByUser();
-
+
switch (expression.getCount()) {
case 1:
top = new CssBorderTopStyle(ac, expression);
@@ -126,7 +126,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)) {
@@ -142,7 +142,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)) {
@@ -150,7 +150,7 @@
}
top = new CssBorderTopStyle(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)) {
@@ -165,7 +165,7 @@
break;
case 4:
if (expression.getOperator() != SPACE) {
- throw new InvalidParamException("operator",
+ throw new InvalidParamException("operator",
((new Character(expression.getOperator())).toString()),
ac);
}
@@ -174,7 +174,7 @@
}
top = new CssBorderTopStyle(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 CssBorderRightStyle(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)) {
@@ -201,26 +201,26 @@
break;
}
}
-
+
public CssBorderStyle(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.
*/
@@ -239,11 +239,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.important = true;
@@ -258,7 +258,7 @@
bottom.important = true;
}
}
-
+
/**
* Returns true if this property is important.
* Overrides this method for a macro
@@ -269,14 +269,14 @@
(left == null || left.important) &&
(bottom == null || bottom.important));
}
-
+
/**
* 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) &&
@@ -296,9 +296,9 @@
if (bottom != null)
bottom.print(printer);
}
-
+
}
-
+
/**
* Set the context.
* Overrides this method for a macro
@@ -321,7 +321,7 @@
left.setSelectors(selector);
}
}
-
+
/**
* Add this property to the CssStyle
*
@@ -341,25 +341,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) {
@@ -375,14 +375,14 @@
bottom.setInfo(line, source);
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
return false; // FIXME
}
-
+
}
Index: CssBorderTopColorCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderTopColorCSS2.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorderTopColorCSS2.java 8 Sep 2005 12:23:34 -0000 1.3
+++ CssBorderTopColorCSS2.java 14 Sep 2005 15:14:31 -0000 1.4
@@ -18,26 +18,26 @@
* @version $Revision$
*/
public class CssBorderTopColorCSS2 extends CssProperty {
-
+
CssBorderFaceColorCSS2 face;
-
+
/**
* Create a new CssBorderTopColorCSS2
*/
public CssBorderTopColorCSS2() {
face = new CssBorderFaceColorCSS2();
}
-
+
/**
* Create a new CssBorderTopColorCSS2 with an another CssBorderFaceColorCSS2
* @param another The another side.
*/
public CssBorderTopColorCSS2(CssBorderFaceColorCSS2 another) {
setByUser();
-
+
face = another;
}
-
+
/**
* Create a new CssBorderTopColorCSS2
*
@@ -46,20 +46,20 @@
*/
public CssBorderTopColorCSS2(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
face = new CssBorderFaceColorCSS2(ac, expression);
}
-
+
public CssBorderTopColorCSS2(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression,false);
}
-
+
/**
* @return Returns the face.
*/
@@ -80,7 +80,7 @@
public Object get() {
return face;
}
-
+
/**
* Returns the color
*/
@@ -91,7 +91,7 @@
return null;
}
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -101,14 +101,14 @@
}
return "";
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "border-top-color";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -120,7 +120,7 @@
style.addRedefinitionWarning(ac, this);
top.color = this;
}
-
+
/**
* Get this property in the style.
*
@@ -134,26 +134,26 @@
return ((Css1Style) style).cssBorderCSS2.getTop().color;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
return (property instanceof CssBorderTopColorCSS2 &&
face.equals(((CssBorderTopColorCSS2) property).face));
}
-
+
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
*
* @see #print(CssPrinterStyle)
- */
+ */
public void print(CssPrinterStyle printer) {
if (face != null && !face.isDefault())
printer.print(this);
}
-
+
}
Index: CssHeightMob.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssHeightMob.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssHeightMob.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssHeightMob.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -46,40 +46,40 @@
* @version $Revision$
*/
public class CssHeightMob extends CssProperty {
-
+
CssValue value;
-
+
private static CssIdent auto = new CssIdent("auto");
-
+
/**
* Create a new CssHeightMob
*/
public CssHeightMob() {
value = auto;
- }
-
+ }
+
/**
* Create a new CssHeightMob
*
* @param expression The expression for this property
* @exception InvalidParamException The expression is incorrect
- */
+ */
public CssHeightMob(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)) {
value = inherit;
} else if (val instanceof CssLength) {
float f = ((Float) val.get()).floatValue();
if (f < 0) {
- throw new InvalidParamException("negative-value",
+ throw new InvalidParamException("negative-value",
val.toString(), ac);
}
value = val;
@@ -88,32 +88,32 @@
} else if (val instanceof CssNumber) {
value = ((CssNumber) val).getLength();
} else {
- throw new InvalidParamException("value", expression.getValue(),
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
-
+
expression.next();
}
-
+
public CssHeightMob(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return value;
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "height";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -121,14 +121,14 @@
public boolean isSoftlyInherited() {
return value == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -140,13 +140,13 @@
style0.addRedefinitionWarning(ac, this);
style0.cssHeightMob = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getHeightMob();
@@ -154,23 +154,23 @@
return ((Css1Style) style).cssHeightMob;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssHeightMob &&
+ return (property instanceof CssHeightMob &&
value.equals(((CssHeightMob) property).value));
}
-
+
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
- */
+ */
public boolean isDefault() {
return value == auto;
}
-
+
}
Index: CssLeft.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssLeft.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssLeft.java 23 Aug 2005 16:23:12 -0000 1.1
+++ CssLeft.java 14 Sep 2005 15:14:31 -0000 1.2
@@ -23,7 +23,7 @@
public CssLeft() {
super();
}
-
+
/**
* Create a new CssLeft
*
@@ -33,15 +33,15 @@
public CssLeft(ApplContext ac, CssExpression expression) throws InvalidParamException {
super(ac, expression);
}
-
+
public CssLeft(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
super(ac, expression, check);
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "left";
}
@@ -63,7 +63,7 @@
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getLeft();
@@ -76,9 +76,9 @@
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssLeft &&
+ return (property instanceof CssLeft &&
value.equals(((CssLeft) property).value));
}
Index: CssBackgroundColorCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBackgroundColorCSS2.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBackgroundColorCSS2.java 8 Sep 2005 12:23:33 -0000 1.3
+++ CssBackgroundColorCSS2.java 14 Sep 2005 15:14:31 -0000 1.4
@@ -52,7 +52,7 @@
*/
public CssBackgroundColorCSS2(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
@@ -80,11 +80,11 @@
}
}
- public CssBackgroundColorCSS2(ApplContext ac, CssExpression expression)
+ public CssBackgroundColorCSS2(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
- }
-
+ }
+
/**
* @param color The color to set.
*/
Index: CssMinHeightATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssMinHeightATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssMinHeightATSC.java 23 Aug 2005 16:23:12 -0000 1.1
+++ CssMinHeightATSC.java 14 Sep 2005 15:14:31 -0000 1.2
@@ -20,32 +20,32 @@
/**
*/
public class CssMinHeightATSC extends CssProperty {
-
+
CssValue value;
-
+
/**
* Create a new CssMinHeightATSC
*/
public CssMinHeightATSC() {
- }
-
+ }
+
/**
* Create a new CssMinHeightATSC
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssMinHeightATSC(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
-
+
setByUser();
-
+
ac.getFrame().addWarning("atsc", val.toString());
if (val.equals(inherit)) {
@@ -53,39 +53,39 @@
} else if (val instanceof CssLength || val instanceof CssPercentage) {
float f = ((Float) val.get()).floatValue();
if (f < 0) {
- throw new InvalidParamException("negative-value",
+ throw new InvalidParamException("negative-value",
val.toString(), ac);
}
value = val;
} else if (val instanceof CssNumber) {
value = ((CssNumber) val).getLength();
} else {
- throw new InvalidParamException("value", expression.getValue(),
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
-
+
expression.next();
}
-
+
public CssMinHeightATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property.
*/
public Object get() {
return value;
}
-
+
/**
* Returns the name of this property.
- */
+ */
public String getPropertyName() {
return "min-height";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -93,15 +93,15 @@
public boolean isSoftlyInherited() {
return value == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
-
+
+
/**
* Add this property to the CssStyle.
*
@@ -113,13 +113,13 @@
style0.addRedefinitionWarning(ac, this);
style0.cssMinHeightATSC = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getMinHeightATSC();
@@ -127,15 +127,15 @@
return ((Css1Style) style).cssMinHeightATSC;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssMinHeightATSC
+ return (property instanceof CssMinHeightATSC
&& value.equals(((CssMinHeightATSC) property).value));
}
-
+
}
Index: CssBackgroundAttachmentCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBackgroundAttachmentCSS2.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBackgroundAttachmentCSS2.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBackgroundAttachmentCSS2.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -28,7 +28,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;
@@ -36,37 +36,37 @@
* </PRE>
* @version $Revision$
*/
-public class CssBackgroundAttachmentCSS2 extends CssProperty
+public class CssBackgroundAttachmentCSS2 extends CssProperty
implements CssBackgroundConstants {
-
+
int attachment;
-
+
private static int[] hash_values;
-
+
/**
* Create a new CssBackgroundAttachmentCSS2
*/
public CssBackgroundAttachmentCSS2() {
// nothing to do
- }
-
+ }
+
/**
* Creates a new CssBackgroundAttachmentCSS2
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssBackgroundAttachmentCSS2(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++)
@@ -76,23 +76,23 @@
return;
}
}
-
- throw new InvalidParamException("value", expression.getValue(),
+
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
-
- public CssBackgroundAttachmentCSS2(ApplContext ac, CssExpression expression)
+
+ public CssBackgroundAttachmentCSS2(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
@@ -100,21 +100,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.
*
@@ -126,13 +126,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 ((Css1Style) style).getBackgroundAttachmentCSS2();
@@ -140,25 +140,25 @@
return ((Css1Style) style).cssBackgroundCSS2.attachment;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssBackgroundAttachmentCSS2 &&
+ return (property instanceof CssBackgroundAttachmentCSS2 &&
attachment == ((CssBackgroundAttachmentCSS2) 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: CssFontWeightCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssFontWeightCSS2.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssFontWeightCSS2.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssFontWeightCSS2.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -98,7 +98,7 @@
* ----------------------+---------------+-------------------
* "Example2 Book" | 400 | 100, 200, 300
* "Example2 Medium" | 500 |
- * "Example2 Bold" | 700 | 600
+ * "Example2 Bold" | 700 | 600
* "Example2 Heavy" | 800 |
* "Example2 Black" | 900 |
* "Example2 ExtraBlack" | (none) |
@@ -128,48 +128,49 @@
* values. The only guarantee is that a face of a given value will be no less
* dark than the faces of lighter values.
*
- * @version $Revision$
+ * @version $Revision$
*/
-public class CssFontWeightCSS2 extends CssProperty implements CssFontConstantCSS2 {
-
-
+public class CssFontWeightCSS2 extends CssProperty
+implements CssFontConstantCSS2 {
+
+
/**
* an index in a array
*
* @see CssFontConstant#FONTWEIGHT
- */
+ */
protected int value;
-
+
// internal hack to compare strings
private static int[] hash_values;
-
+
/**
* Create a new FontWeightCSS2 with the default value.
- */
+ */
public CssFontWeightCSS2() {
// nothing to do
}
-
+
/**
* Creates a new CssFontWeightCSS2 with an expression.
*
* @param expr the expression
* @exception InvalidParamException values are incorrect
- */
+ */
public CssFontWeightCSS2(ApplContext ac, CssExpression expr, boolean check)
throws InvalidParamException {
-
+
if(check && expr.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expr.getValue();
-
+
setByUser();
-
+
if (val instanceof CssIdent) {
int hash = expr.getValue().hashCode();
-
+
// try to find the hashCode in my internal hack array
for (int i=0; i<hash_values.length; i++)
if (hash_values[i] == hash) {
@@ -178,36 +179,37 @@
return;
}
} else if (val instanceof CssNumber) {
- float valf = ((Float) val.get()).floatValue();
- int vali = (int) valf;
- if (((valf - (float) vali) == 0) // real part number must be equal to zero
- && isCorrectWeight(vali)) { // verify the entire part number
- this.value = vali;
- expr.next();
- return;
+ Object valf = val.get();
+ if(valf instanceof Integer) {
+ int vali = ((Integer) valf).intValue();
+ if(isCorrectWeight(vali)) { // verify the entire part number
+ this.value = vali;
+ expr.next();
+ return;
+ }
}
}
-
- throw new InvalidParamException("value", expr.getValue().toString(),
+
+ throw new InvalidParamException("value", expr.getValue().toString(),
getPropertyName(), ac);
}
-
+
public CssFontWeightCSS2(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value.
- */
+ */
public Object get() {
if (value >= 100)
return new Integer(value);
else
return FONTWEIGHT[value];
}
-
-
+
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -215,7 +217,7 @@
public boolean isSoftlyInherited() {
return value == FONTWEIGHT.length - 1;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -225,32 +227,32 @@
else
return FONTWEIGHT[value];
}
-
+
/**
* Returns the name of this property.
- */
+ */
public String getPropertyName() {
return "font-weight";
}
-
+
/**
* Add this property to the CssStyle
*
* @param style The CssStyle
- */
+ */
public void addToStyle(ApplContext ac, CssStyle style) {
CssFontCSS2 cssFont = ((Css1Style) style).cssFontCSS2;
if (cssFont.fontWeight != null)
style.addRedefinitionWarning(ac, this);
cssFont.fontWeight = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getFontWeightCSS2();
@@ -258,30 +260,30 @@
return ((Css1Style) style).cssFontCSS2.fontWeight;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssFontWeightCSS2 &&
+ return (property instanceof CssFontWeightCSS2 &&
((CssFontWeightCSS2) property).value == value);
}
-
+
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
- */
+ */
public boolean isDefault() {
return value == 0;
}
-
+
private boolean isCorrectWeight(int val) {
val = val / 100;
return val > 0 && val < 10;
}
-
+
static {
hash_values = new int[FONTWEIGHT.length];
for (int i=0; i<FONTWEIGHT.length; i++)
Index: CssBorderBottomStyleCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderBottomStyleCSS1.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderBottomStyleCSS1.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorderBottomStyleCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -18,14 +18,14 @@
public class CssBorderBottomStyleCSS1 extends CssProperty {
CssBorderFaceStyleCSS1 face;
-
+
/**
* Create a new CssBorderBottomStyleCSS1
*/
public CssBorderBottomStyleCSS1() {
face = new CssBorderFaceStyleCSS1();
}
-
+
/**
* Create a new CssBorderBottomStyleCSS1 with an another CssBorderFaceStyleCSS1
* @param another The another side.
@@ -35,7 +35,7 @@
face = another;
}
-
+
/**
* Create a new CssBorderBottomStyle eith an expression
*
@@ -44,7 +44,7 @@
*/
public CssBorderBottomStyleCSS1(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
@@ -52,12 +52,12 @@
setByUser();
face = new CssBorderFaceStyleCSS1(ac, expression);
}
-
- public CssBorderBottomStyleCSS1(ApplContext ac, CssExpression expression)
+
+ public CssBorderBottomStyleCSS1(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
@@ -87,7 +87,7 @@
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "border-bottom-style";
}
@@ -109,7 +109,7 @@
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getBorderBottomStyleCSS1();
@@ -122,7 +122,7 @@
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
return (property instanceof CssBorderBottomStyleCSS1 &&
face.equals(((CssBorderBottomStyleCSS1) property).face));
Index: CssBorderTopStyleCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderTopStyleCSS1.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderTopStyleCSS1.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssBorderTopStyleCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -16,16 +16,16 @@
* @version $Revision$
*/
public class CssBorderTopStyleCSS1 extends CssProperty {
-
+
CssBorderFaceStyleCSS1 face;
-
+
/**
* Create a new CssBorderTopStyleCSS1
*/
public CssBorderTopStyleCSS1() {
face = new CssBorderFaceStyleCSS1();
}
-
+
/**
* Create a new CssBorderTopStyleCSS1 with an another CssBorderFaceStyleCSS1
*
@@ -33,10 +33,10 @@
*/
public CssBorderTopStyleCSS1(CssBorderFaceStyleCSS1 another) {
setByUser();
-
+
face = another;
}
-
+
/**
* Create a new CssBorderTopStyleCSS1
*
@@ -45,27 +45,27 @@
*/
public CssBorderTopStyleCSS1(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
face = new CssBorderFaceStyleCSS1(ac, expression);
}
-
+
public CssBorderTopStyleCSS1(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression,false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return face;
}
-
+
/**
* Returns the value
*/
@@ -75,7 +75,7 @@
}
return null;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -85,14 +85,14 @@
}
return "";
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "border-top-style";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -104,13 +104,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 ((Css1Style) style).getBorderTopStyleCSS1();
@@ -118,15 +118,15 @@
return ((Css1Style) style).cssBorderCSS1.getTop().style;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssBorderTopStyleCSS1 &&
+ return (property instanceof CssBorderTopStyleCSS1 &&
face.equals(((CssBorderTopStyleCSS1) property).face));
}
-
+
}
Index: CssFontFamilyCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssFontFamilyCSS1.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssFontFamilyCSS1.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssFontFamilyCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -20,7 +20,7 @@
import org.w3c.css.values.CssString;
import org.w3c.css.values.CssValue;
-/**
+/**
* <H4>
* 'font-family'
* </H4>
@@ -75,29 +75,29 @@
* If quoting is omitted, any whitespace characters before and after the font
* name are ignored and any sequence of whitespace characters inside the font
* name is converted to a single space.
- *
+ *
* @see CssFont
- * @version $Revision$
+ * @version $Revision$
*/
public class CssFontFamilyCSS1 extends CssProperty implements CssOperator {
-
+
Vector family_name = new Vector();
boolean inheritedValue;
static String[] genericFamily = { "serif", "sans-serif", "cursive",
"fantasy", "monospace" };
-
+
static int[] genericFamilyHash;
-
+
boolean withSpace = false;
/**
* Create a new CssFontFamilyCSS1
*/
public CssFontFamilyCSS1() {
- }
-
+ }
+
/**
* Create a new CssFontFamilyCSS1
*
@@ -105,9 +105,9 @@
* @exception InvalidParamException The expression is incorrect
*/
public CssFontFamilyCSS1(ApplContext ac, CssExpression expression,
- boolean check)
- throws InvalidParamException {
-
+ boolean check)
+ throws InvalidParamException {
+
boolean family = true;
CssValue val = expression.getValue();
char op;
@@ -119,17 +119,17 @@
while (family) {
val = expression.getValue();
op = expression.getOperator();
-
+
if(val.equals(inherit)) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
if ((op != COMMA) && (op != SPACE)) {
- throw new InvalidParamException("operator",
+ throw new InvalidParamException("operator",
((new Character(op)).toString()),
ac);
}
-
+
if (val instanceof CssString) {
String familyName = null;
if (op == COMMA) { // "helvetica", "roman"
@@ -158,9 +158,9 @@
expression.next();
} else {
CssValue next = expression.getNextValue();
-
+
if (next != null) {
- CssIdent New = new CssIdent(val.get() + " "
+ CssIdent New = new CssIdent(val.get() + " "
+ next.get());
withSpace = true;
expression.remove();
@@ -186,36 +186,36 @@
}
}
-
+
public CssFontFamilyCSS1(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns all fonts name
- */
+ */
public Enumeration elements() {
return family_name.elements();
}
-
+
/**
* Returns the size
*/
public int size() {
return family_name.size();
}
-
+
/**
* Returns the font (null if no font)
- */
+ */
public Object get() {
if (family_name.size() == 0) {
return null;
}
return family_name.firstElement();
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -223,11 +223,11 @@
public boolean isSoftlyInherited() {
return inheritedValue;
}
-
+
/**
* Returns a string representation of the object.
*/
- public String toString() {
+ public String toString() {
if (inheritedValue) {
return inherit.toString();
} else {
@@ -241,12 +241,12 @@
return r.substring(2);
}
}
-
+
String convertString (String value) {
if (value.indexOf('"') != -1) {
return '\'' + value + '\'';
} else if (value.indexOf('\'') != -1) {
- return '"' + value + '"';
+ return '"' + value + '"';
} else {
return value;
}
@@ -254,11 +254,11 @@
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "font-family";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -271,13 +271,13 @@
style.addRedefinitionWarning(ac, this);
cssFont.fontFamily = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getFontFamilyCSS1();
@@ -285,40 +285,40 @@
return ((Css1Style) style).cssFontCSS1.fontFamily;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
return false; //@@ FIXME
}
-
+
private static String trimToOneSpace(String name) {
int count = name.length();
char[] dst = new char[count];
char[] src = new char[count];
int index = -1;
-
+
name.getChars(0, count, src, 0);
for(int i=0; i < count; i++)
- if ( i == 0 || ! Util.isWhiteSpace(src[i]) ||
- ( Util.isWhiteSpace(src[i]) &&
+ if ( i == 0 || ! Util.isWhiteSpace(src[i]) ||
+ ( Util.isWhiteSpace(src[i]) &&
!Util.isWhiteSpace(dst[index]) ) )
dst[++index] = src[i];
-
+
return new String(dst, 0, index+1);
}
-
+
/**
* Returns true if this property contains a generic family name
- */
+ */
public boolean containsGenericFamily() {
if (family_name.size() == 0) {
return true;
} else {
- for (Enumeration e = family_name.elements();
+ for (Enumeration e = family_name.elements();
e.hasMoreElements();) {
int hash = ((String) e.nextElement()).toLowerCase().hashCode();
for (int i = 0; i < genericFamilyHash.length; i++) {
@@ -329,8 +329,8 @@
return false;
}
}
-
-
+
+
static {
genericFamilyHash = new int[genericFamily.length];
for (int i = 0; i < genericFamily.length; i++) {
Index: CssBackgroundRepeatCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBackgroundRepeatCSS1.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBackgroundRepeatCSS1.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBackgroundRepeatCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -32,7 +32,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;
* }
@@ -43,33 +43,33 @@
*/
public class CssBackgroundRepeatCSS1 extends CssProperty
implements CssBackgroundConstants {
-
+
int repeat;
-
+
private static int[] hash_values;
-
+
/**
* Create a new CssBackgroundRepeatCSS1
*/
public CssBackgroundRepeatCSS1() {
repeat = 0;
- }
-
+ }
+
/**
* Set the value of the property
* @param expression The expression for this property
* @exception InvalidParamException The expression is incorrect
- */
+ */
public CssBackgroundRepeatCSS1(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
setByUser();
-
+
if (val instanceof CssIdent) {
int hash = val.hashCode();
for (int i =0; i < REPEAT.length; i++) {
@@ -80,23 +80,23 @@
}
}
}
-
- throw new InvalidParamException("value", expression.getValue(),
+
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
-
- public CssBackgroundRepeatCSS1(ApplContext ac, CssExpression expression)
+
+ public CssBackgroundRepeatCSS1(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
@@ -104,21 +104,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.
*
@@ -130,13 +130,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 ((Css1Style) style).getBackgroundRepeatCSS1();
@@ -144,25 +144,25 @@
return ((Css1Style) style).cssBackgroundCSS1.repeat;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssBackgroundRepeatCSS1 &&
+ return (property instanceof CssBackgroundRepeatCSS1 &&
repeat == ((CssBackgroundRepeatCSS1) 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: CssPadding.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssPadding.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssPadding.java 23 Aug 2005 16:23:12 -0000 1.1
+++ CssPadding.java 14 Sep 2005 15:14:31 -0000 1.2
@@ -36,10 +36,10 @@
* <P>
* The surface of the padding area is set with the 'background' property:
* <PRE>
- * H1 {
- * background: white;
+ * H1 {
+ * background: white;
* padding: 1em 2em;
- * }
+ * }
* </PRE>
* <P>
* The example above sets a '1em' padding vertically ('padding-top' and
@@ -51,30 +51,30 @@
* @version $Revision$
*/
public class CssPadding extends CssProperty implements CssOperator {
-
+
CssPaddingTop top = null;
CssPaddingBottom bottom = null;
CssPaddingRight right = null;
CssPaddingLeft left = null;
-
+
boolean inheritedValue;
-
+
/**
* Create a new CssPadding
*/
public CssPadding() {
- }
-
+ }
+
/**
* Create a new CssPadding
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
- public CssPadding(ApplContext ac, CssExpression expression, boolean check)
+ */
+ public CssPadding(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
//CssValue val = expression.getValue();
setByUser();
-
+
/*if (val.equals(inherit)) {
inheritedValue = true;
top = new CssPaddingTop();
@@ -86,9 +86,9 @@
left = new CssPaddingLeft();
left.value = inherit;
}*/
-
+
int count = expression.getCount();
-
+
switch (count) {
case 1:
top = new CssPaddingTop(ac, expression);
@@ -171,54 +171,54 @@
}
}
}
-
+
public CssPadding(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return top;
}
-
+
/**
* Returns the top property
*/
public CssPaddingTop getTop() {
return top;
}
-
+
/**
* Returns the right property
*/
public CssPaddingRight getRight() {
return right;
}
-
+
/**
* Returns the bottom property
*/
public CssPaddingBottom getBottom() {
return bottom;
}
-
+
/**
* Returns the left property
*/
public CssPaddingLeft getLeft() {
return left;
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "padding";
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -240,18 +240,18 @@
return top + " " + right + " " + bottom + " " + left;
}
}
-
+
/**
* Set this property to be important.
* Overrides this method for a macro
- */
+ */
public void setImportant() {
top.important = true;
right.important = true;
bottom.important = true;
left.important = true;
}
-
+
/**
* Returns true if this property is important.
* Overrides this method for a macro
@@ -262,13 +262,13 @@
(bottom == null || bottom.important) &&
(left == null || left.important));
}
-
+
/**
* Print this property.
*
* @see #toString()
* @see #getPropertyName()
- */
+ */
public void print(CssPrinterStyle printer) {
if (inheritedValue) {
printer.print(this);
@@ -290,9 +290,9 @@
if (left != null)
left.print(printer);
}
-
+
}
-
+
/**
* Set the context.
* Overrides this method for a macro
@@ -315,7 +315,7 @@
left.setSelectors(selector);
}
}
-
+
/**
* Add this property to the CssStyle
*
@@ -328,13 +328,13 @@
bottom.addToStyle(ac, style);
left.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 ((Css1Style) style).getPadding();
@@ -342,14 +342,14 @@
return ((Css1Style) style).cssPadding;
}
}
-
+
/**
* 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);
@@ -357,15 +357,15 @@
bottom.setInfo(line, source);
left.setInfo(line, source);
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
// @FIXME
return false;
}
-
+
}
Index: CssColorCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssColorCSS2.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssColorCSS2.java 8 Sep 2005 12:23:34 -0000 1.4
+++ CssColorCSS2.java 14 Sep 2005 15:14:31 -0000 1.5
@@ -57,11 +57,11 @@
*/
public CssColorCSS2(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)) {
@@ -84,7 +84,7 @@
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
@@ -95,7 +95,7 @@
/**
* Returns the color
*/
- public org.w3c.css.values.CssColorCSS2 getColor() {
+ public org.w3c.css.values.CssColor getColor() {
if (color.equals(inherit)) {
/*
System.err.println("[ERROR] org.w3c.css.properties.CssColorCSS2");
@@ -103,7 +103,7 @@
*/
return null;
} else {
- return (org.w3c.css.values.CssColorCSS2) color;
+ return (org.w3c.css.values.CssColor) color;
}
}
@@ -133,7 +133,7 @@
Css1Style style0 = (Css1Style) style;
if (style0.cssColorCSS2 != null) {
style0.addRedefinitionWarning(ac, this);
- }
+ }
style0.cssColorCSS2 = this;
}
Index: CssBorderRightStyle.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderRightStyle.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderRightStyle.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssBorderRightStyle.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -16,18 +16,18 @@
* @version $Revision$
*/
public class CssBorderRightStyle extends CssProperty {
-
+
CssBorderFaceStyle face;
-
+
/**
* Create a new CssBorderRightStyle
*/
public CssBorderRightStyle() {
setByUser();
-
+
face = new CssBorderFaceStyle();
}
-
+
/**
* Create a new CssBorderRightStyle with an another CssBorderFaceStyle
*
@@ -35,10 +35,10 @@
*/
public CssBorderRightStyle(CssBorderFaceStyle another) {
setByUser();
-
+
face = another;
}
-
+
/**
* Create a new CssBorderRightStyle.
*
@@ -47,28 +47,28 @@
*/
public CssBorderRightStyle(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
-
+
face = new CssBorderFaceStyle(ac, expression);
}
-
+
public CssBorderRightStyle(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression,false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return face;
}
-
+
/**
* Returns the value
*/
@@ -78,7 +78,7 @@
}
return null;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -88,14 +88,14 @@
}
return "";
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "border-right-style";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -107,13 +107,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 ((Css1Style) style).getBorderRightStyle();
@@ -121,15 +121,15 @@
return ((Css1Style) style).cssBorder.getRight().style;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssBorderRightStyle &&
+ return (property instanceof CssBorderRightStyle &&
face.equals(((CssBorderRightStyle) property).face));
}
-
+
}
Index: CssBorderTopCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderTopCSS1.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderTopCSS1.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssBorderTopCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -49,49 +49,49 @@
* @version $Revision$
*/
public class CssBorderTopCSS1 extends CssProperty implements CssOperator {
-
+
CssBorderTopWidthCSS1 width;
CssBorderTopStyleCSS1 style;
CssBorderTopColorCSS1 color;
-
+
/**
* Create a new CssBorderFaceCSS1
*/
public CssBorderTopCSS1() {
- }
-
+ }
+
/**
* Create a new CssBorderFaceCSS1
*
* @param expression The expression for this property
* @exception InvalidParamException The expression is incorrect
- */
+ */
public CssBorderTopCSS1(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);
}
-
+
setByUser();
-
+
while (find) {
find = false;
- val = expression.getValue();
- op = expression.getOperator();
+ 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);
+ ac);
if (width == null) {
try {
- width = new CssBorderTopWidthCSS1(ac, expression);
+ width = new CssBorderTopWidthCSS1(ac, expression);
find = true;
} catch(InvalidParamException e){
//nothing to do, style will test this value
@@ -99,7 +99,7 @@
}
if (!find && style == null) {
try {
- style = new CssBorderTopStyleCSS1(ac, expression);
+ style = new CssBorderTopStyleCSS1(ac, expression);
find = true;
} catch(InvalidParamException e){
//nothing to do, color will test this value
@@ -108,36 +108,36 @@
if (!find && color == null) {
// throws an exception if the value is not valid
color = new CssBorderTopColorCSS1(ac, expression);
- find = true;
+ find = true;
}
}
-
+
//if some values have not been set, we set them with their default ones
/*
if (width == null) {
width = new CssBorderTopWidthCSS1();
}
if (style == null) {
- style = new CssBorderTopStyleCSS1();
- }
+ style = new CssBorderTopStyleCSS1();
+ }
if (color == null) {
- color = new CssBorderTopColorCSS1();
+ color = new CssBorderTopColorCSS1();
}
*/
}
-
+
public CssBorderTopCSS1(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
*/
@@ -148,7 +148,7 @@
return null;
}
}
-
+
/**
* Returns the width property
*/
@@ -159,7 +159,7 @@
return null;
}
}
-
+
/**
* Returns the style property
*/
@@ -170,7 +170,7 @@
return null;
}
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -193,18 +193,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.important = true;
@@ -216,7 +216,7 @@
color.important = true;
}
}
-
+
/**
* Returns true if this property is important.
* Overrides this method for a macro
@@ -226,14 +226,14 @@
(style == null || style.important) &&
(color == null || color.important));
}
-
+
/**
* Print this property.
*
* @param printer The printer.
* @see #toString()
* @see #getPropertyName()
- */
+ */
public void print(CssPrinterStyle printer) {
if ((width != null && style != null &&
color != null) &&
@@ -250,15 +250,15 @@
if (color != null)
color.print(printer);
}
-
+
}
-
+
/**
* Add this property to the CssStyle
*
* @param style The CssStyle
*/
- public void addToStyle(ApplContext ac, CssStyle style) {
+ public void addToStyle(ApplContext ac, CssStyle style) {
if(width != null) {
width.addToStyle(ac, style);
}
@@ -269,13 +269,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 ((Css1Style) style).getBorderTopCSS1();
@@ -283,16 +283,16 @@
return ((Css1Style) style).cssBorderCSS1.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);
}
@@ -303,7 +303,7 @@
color.setInfo(line, source);
}
}
-
+
/**
* Set the context.
* Overrides this method for a macro
@@ -323,25 +323,25 @@
color.setSelectors(selector);
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
if (property instanceof CssBorderTopCSS1) {
CssBorderTopCSS1 top = (CssBorderTopCSS1) property;
- return (width != null && width.equals(top.width) &&
- style != null && style.equals(top.style) &&
+ return (width != null && width.equals(top.width) &&
+ style != null && style.equals(top.style) &&
color != null && 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: CssBorderLeftCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderLeftCSS1.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderLeftCSS1.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorderLeftCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -49,48 +49,48 @@
* @version $Revision$
*/
public class CssBorderLeftCSS1 extends CssProperty implements CssOperator {
-
+
CssBorderLeftWidthCSS1 width;
CssBorderLeftStyleCSS1 style;
CssBorderLeftColorCSS1 color;
-
+
/**
* Create a new CssBorderLeftCSS1
*/
public CssBorderLeftCSS1() {
- }
-
+ }
+
/**
* Create a new CssBorderLeftCSS1
*
* @param expression The expression for this property
* @exception InvalidParamException The expression is incorrect
- */
+ */
public CssBorderLeftCSS1(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);
}
-
+
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 CssBorderLeftWidthCSS1(ac, expression);
@@ -122,19 +122,19 @@
color = new CssBorderLeftColorCSS1();
*/
}
-
- public CssBorderLeftCSS1(ApplContext ac, CssExpression expression)
+
+ public CssBorderLeftCSS1(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.important = true;
@@ -213,7 +213,7 @@
color.important = true;
}
}
-
+
/**
* Returns true if this property is important.
* Overrides this method for a macro
@@ -223,14 +223,14 @@
(style == null || style.important) &&
(color == null || color.important));
}
-
+
/**
* Print this property.
*
* @param printer The printer.
* @see #toString()
* @see #getPropertyName()
- */
+ */
public void print(CssPrinterStyle printer) {
if ((width != null && style != null &&
color != null) &&
@@ -247,15 +247,15 @@
if (color != null)
color.print(printer);
}
-
+
}
-
+
/**
* Add this property to the CssStyle
*
* @param style The CssStyle
*/
- public void addToStyle(ApplContext ac, CssStyle style) {
+ public void addToStyle(ApplContext ac, CssStyle style) {
if(width != null) {
width.addToStyle(ac, style);
}
@@ -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 ((Css1Style) style).getBorderLeftCSS1();
@@ -280,16 +280,16 @@
return ((Css1Style) style).cssBorderCSS1.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);
}
@@ -300,7 +300,7 @@
color.setInfo(line, source);
}
}
-
+
/**
* Set the context.
* Overrides this method for a macro
@@ -320,25 +320,25 @@
color.setSelectors(selector);
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
if (property instanceof CssBorderLeftCSS1) {
CssBorderLeftCSS1 left = (CssBorderLeftCSS1) property;
return (width != null && width.equals(left.width) &&
- style != null && style.equals(left.style) &&
+ style != null && style.equals(left.style) &&
color != null && 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: CssBorderBottomColorCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderBottomColorCSS2.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorderBottomColorCSS2.java 8 Sep 2005 12:23:33 -0000 1.3
+++ CssBorderBottomColorCSS2.java 14 Sep 2005 15:14:31 -0000 1.4
@@ -18,28 +18,28 @@
* @version $Revision$
*/
public class CssBorderBottomColorCSS2 extends CssProperty {
-
+
CssBorderFaceColorCSS2 face;
-
+
/**
* Create a new CssBorderBottomColorCSS2
*/
public CssBorderBottomColorCSS2() {
face = new CssBorderFaceColorCSS2();
}
-
+
/**
* Create a new CssBorderBottomColor with an another CssBorderFaceColor
*
* @param another An another face.
*/
public CssBorderBottomColorCSS2(CssBorderFaceColorCSS2 another) {
-
+
setByUser();
-
+
face = another;
}
-
+
/**
* Create a new CssBorderBottomColor
*
@@ -48,62 +48,62 @@
*/
public CssBorderBottomColorCSS2(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
face = new CssBorderFaceColorCSS2(ac, expression);
}
-
- public CssBorderBottomColorCSS2(ApplContext ac, CssExpression expression)
+
+ public CssBorderBottomColorCSS2(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
- }
-
+ }
+
/**
* Returns the value of this property
*/
public Object get() {
return face;
}
-
+
/**
* @return Returns the face.
*/
public CssBorderFaceColorCSS2 getFace() {
return face;
}
-
+
/**
* @param face The face to set.
*/
public void setFace(CssBorderFaceColorCSS2 face) {
this.face = face;
}
-
+
/**
* Returns the color of this property
*/
public CssValue getColor() {
return face.getColor();
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return face.toString();
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "border-bottom-color";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -115,13 +115,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 ((Css1Style) style).getBorderBottomColorCSS2();
@@ -129,23 +129,23 @@
return ((Css1Style) style).cssBorderCSS2.getBottom().color;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
return (property instanceof CssBorderBottomColorCSS2 && face.equals(((CssBorderBottomColorCSS2) property).face));
}
-
+
/**
* Print this property.
*
* @param printer The printer.
* @see #toString()
* @see #getPropertyName()
- */
+ */
public void print(CssPrinterStyle printer) {
if (face != null && !face.isDefault())
printer.print(this);
Index: CssTextIndent.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssTextIndent.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssTextIndent.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssTextIndent.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -38,32 +38,32 @@
* @version $Revision$
*/
public class CssTextIndent extends CssProperty {
-
+
CssValue value = new CssLength();
-
+
/**
* Create a new CssTextIndent
*/
public CssTextIndent() {
}
-
+
/**
* Create a new CssTextIndent
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssTextIndent(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)) {
value = inherit;
} else if (val instanceof CssLength || val instanceof CssPercentage) {
@@ -71,32 +71,32 @@
} else if (val instanceof CssNumber) {
value = ((CssNumber) val).getLength();
} else {
- throw new InvalidParamException("value", val.toString(),
+ throw new InvalidParamException("value", val.toString(),
getPropertyName(), ac);
}
-
+
expression.next();
}
-
- public CssTextIndent(ApplContext ac, CssExpression expression)
+
+ public CssTextIndent(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return value;
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "text-indent";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -104,14 +104,14 @@
public boolean isSoftlyInherited() {
return value == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -123,13 +123,13 @@
style0.addRedefinitionWarning(ac, this);
style0.cssTextIndent = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getTextIndent();
@@ -137,14 +137,14 @@
return ((Css1Style) style).cssTextIndent;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssTextIndent &&
+ return (property instanceof CssTextIndent &&
value.equals(((CssTextIndent) property).value));
}
}
Index: CssVerticalAlignTV.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssVerticalAlignTV.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssVerticalAlignTV.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssVerticalAlignTV.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -110,11 +110,11 @@
*/
public CssVerticalAlignTV(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
int hash = val.hashCode();
@@ -142,7 +142,7 @@
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
Index: CssFontStyleCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssFontStyleCSS1.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssFontStyleCSS1.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssFontStyleCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -42,32 +42,32 @@
* In the example above, emphasized text within 'H1' will appear in a normal
* face.
*
- * @version $Revision$
+ * @version $Revision$
*/
public class CssFontStyleCSS1 extends CssProperty implements CssFontConstantCSS1 {
-
+
int value;
-
+
/**
* Create a new CssFontStyleCSS1
*/
public CssFontStyleCSS1() {
// nothing to do
}
-
+
/**
* Creates a new CssFontStyleCSS1
*
* @param expression the font style
* @exception InvalidParamException values are incorrect
- */
+ */
public CssFontStyleCSS1(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
if (expression.getValue() instanceof CssIdent) {
int hash = ((CssIdent) expression.getValue()).hashCode();
@@ -78,23 +78,23 @@
return;
}
}
-
- throw new InvalidParamException("value", expression.getValue(),
+
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
-
+
public CssFontStyleCSS1(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value
- */
+ */
public Object get() {
return FONTSTYLE[value];
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -102,21 +102,21 @@
public boolean isSoftlyInherited() {
return value == FONTSTYLE.length - 1;
}
-
+
/**
* Returns a string representation of the object.
*/
- public String toString() {
+ public String toString() {
return FONTSTYLE[value];
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "font-style";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -128,13 +128,13 @@
style.addRedefinitionWarning(ac, this);
cssFont.fontStyle = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getFontStyleCSS1();
@@ -142,27 +142,27 @@
return ((Css1Style) style).cssFontCSS1.fontStyle;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssFontStyleCSS1 &&
+ return (property instanceof CssFontStyleCSS1 &&
((CssFontStyleCSS1) property).value == value);
}
-
+
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
- */
+ */
public boolean isDefault() {
return value == 0;
}
-
+
private static int[] hash_values;
-
+
static {
hash_values = new int[FONTSTYLE.length];
for (int i=0; i<FONTSTYLE.length; i++)
Index: CssBackgroundPositionCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBackgroundPositionCSS1.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- CssBackgroundPositionCSS1.java 8 Sep 2005 12:23:33 -0000 1.5
+++ CssBackgroundPositionCSS1.java 14 Sep 2005 15:14:31 -0000 1.6
@@ -82,56 +82,56 @@
* 'background-attachment' property above), the image is placed relative to
* the canvas instead of the element. E.g.:
* <PRE>
- * BODY {
+ * BODY {
* background-image: url(logo.png);
* background-attachment: fixed;
* background-position: 100% 100%;
- * }
+ * }
* </PRE>
* <P>
* In the example above, the image is placed in the lower right corner of the
* canvas.
* @version $Revision$
- * @see CssBackgroundAttachment
+ * @see CssBackgroundAttachment
*/
-public class CssBackgroundPositionCSS1 extends CssProperty
+public class CssBackgroundPositionCSS1 extends CssProperty
implements CssBackgroundConstants, CssOperator {
-
+
CssValue first;
CssValue second;
-
+
/**
* Create a new CssBackgroundPositionCSS1
*/
public CssBackgroundPositionCSS1() {
first = DefaultValue0;
second = DefaultValue0;
- }
-
+ }
+
/**
* Creates a new CssBackgroundPositionCSS1
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssBackgroundPositionCSS1(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
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);
- CssValue next = expression.getNextValue();
-
+ CssValue next = expression.getNextValue();
+
if(val instanceof CssIdent) {
int index1 = IndexOfIdent((String) val.get());
if(index1 == -1) {
@@ -148,10 +148,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);
}
@@ -164,8 +164,8 @@
first = val;
}
// the second value is invalid
- else {
- throw new InvalidParamException("value", next,
+ else {
+ throw new InvalidParamException("value", next,
getPropertyName(), ac);
}
}
@@ -190,52 +190,52 @@
}
}
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();
}
}
-
- public CssBackgroundPositionCSS1(ApplContext ac, CssExpression expression)
+
+ public CssBackgroundPositionCSS1(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return first;
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "background-position";
}
-
+
/**
* Returns the first value of the position
*/
public CssValue getHorizontalPosition() {
return first;
}
-
+
/**
* Returns the second value of the position
*/
public CssValue getVerticalPosition() {
return second;
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -243,7 +243,7 @@
public boolean isSoftlyInherited() {
return first == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -265,12 +265,12 @@
return ret;
}
}
-
+
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;
@@ -300,13 +300,13 @@
style.addRedefinitionWarning(ac, this);
cssBackground.position = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getBackgroundPositionCSS1();
@@ -314,42 +314,42 @@
return ((Css1Style) style).cssBackgroundCSS1.position;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssBackgroundPositionCSS1 &&
+ return (property instanceof CssBackgroundPositionCSS1 &&
first.equals(((CssBackgroundPositionCSS1) property).first)
&& second.equals(((CssBackgroundPositionCSS1) property).second));
}
-
+
/**
* 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 first.equals(DefaultValue0) && second.equals(DefaultValue0);
}
-
+
private int IndexOfIdent(String ident) throws InvalidParamException {
int hash = ident.hashCode();
for (int i = 0; i < POSITION.length; i++)
if (hash_values[i] == hash)
return i;
-
+
return -1;
}
-
+
private static int[] hash_values;
-
+
//private static int INVALID = -1;
private static CssPercentage DefaultValue0 = new CssPercentage(0);
//private static CssPercentage DefaultValue50 = new CssPercentage(50);
//private static CssPercentage DefaultValue100 = new CssPercentage(100);
-
+
static {
hash_values = new int[POSITION.length];
for (int i = 0; i < POSITION.length; i++)
Index: CssMarginRight.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssMarginRight.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssMarginRight.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssMarginRight.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -38,7 +38,7 @@
public CssMarginRight() {
super();
}
-
+
/**
* Create a new CssMarginRight with an another CssMarginSide
* @param another The another side.
@@ -46,7 +46,7 @@
public CssMarginRight(CssMarginSide another) {
super(another);
}
-
+
/**
* Create a new CssMarginRight
*
@@ -57,15 +57,15 @@
throws InvalidParamException {
super(ac, expression);
}
-
+
public CssMarginRight(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
super(ac, expression, check);
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "margin-right";
}
@@ -87,7 +87,7 @@
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getMarginRight();
@@ -100,9 +100,9 @@
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssMarginRight &&
+ return (property instanceof CssMarginRight &&
value.equals(((CssMarginRight) property).value));
}
Index: CssBackgroundRepeatCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBackgroundRepeatCSS2.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBackgroundRepeatCSS2.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBackgroundRepeatCSS2.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -32,7 +32,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;
* }
@@ -41,35 +41,35 @@
* In the example above, the image will only be repeated vertically.
* @version $Revision$
*/
-public class CssBackgroundRepeatCSS2 extends CssProperty
+public class CssBackgroundRepeatCSS2 extends CssProperty
implements CssBackgroundConstants {
-
+
int repeat;
-
+
private static int[] hash_values;
-
+
/**
* Create a new CssBackgroundRepeatCSS2
*/
public CssBackgroundRepeatCSS2() {
repeat = 0;
- }
-
+ }
+
/**
* Set the value of the property
* @param expression The expression for this property
* @exception InvalidParamException The expression is incorrect
- */
+ */
public CssBackgroundRepeatCSS2(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++) {
@@ -80,23 +80,23 @@
}
}
}
-
- throw new InvalidParamException("value", expression.getValue(),
+
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
-
- public CssBackgroundRepeatCSS2(ApplContext ac, CssExpression expression)
+
+ public CssBackgroundRepeatCSS2(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
@@ -104,21 +104,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.
*
@@ -130,13 +130,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 ((Css1Style) style).getBackgroundRepeatCSS2();
@@ -144,25 +144,25 @@
return ((Css1Style) style).cssBackgroundCSS2.repeat;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssBackgroundRepeatCSS2 &&
+ return (property instanceof CssBackgroundRepeatCSS2 &&
repeat == ((CssBackgroundRepeatCSS2) 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: CssMarkerOffset.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssMarkerOffset.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssMarkerOffset.java 23 Aug 2005 16:23:12 -0000 1.1
+++ CssMarkerOffset.java 14 Sep 2005 15:14:31 -0000 1.2
@@ -20,33 +20,33 @@
/**
*/
public class CssMarkerOffset extends CssProperty {
-
+
CssValue value;
-
+
private static CssIdent auto = new CssIdent("auto");
-
+
/**
* Create a new CssMarkerOffset
*/
public CssMarkerOffset() {
value = auto;
- }
-
+ }
+
/**
* Create a new CssMarkerOffset
*
* @param expression The expression for this property
* @exception InvalidParamException The expression is incorrect
- */
- public CssMarkerOffset(ApplContext ac, CssExpression expression,
+ */
+ public CssMarkerOffset(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)) {
value = inherit;
@@ -57,32 +57,32 @@
} else if (val instanceof CssNumber) {
value = ((CssNumber) val).getLength();
} else {
- throw new InvalidParamException("value", expression.getValue(),
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
-
+
expression.next();
}
-
+
public CssMarkerOffset(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return value;
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "marker-offset";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -90,14 +90,14 @@
public boolean isSoftlyInherited() {
return value == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -109,13 +109,13 @@
style0.addRedefinitionWarning(ac, this);
style0.cssMarkerOffset = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getMarkerOffset();
@@ -123,23 +123,23 @@
return ((Css1Style) style).cssMarkerOffset;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssMarkerOffset &&
+ return (property instanceof CssMarkerOffset &&
value.equals(((CssMarkerOffset) property).value));
}
-
+
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
- */
+ */
public boolean isDefault() {
return value == auto;
}
-
+
}
Index: CssFontWeight.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssFontWeight.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssFontWeight.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssFontWeight.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -98,7 +98,7 @@
* ----------------------+---------------+-------------------
* "Example2 Book" | 400 | 100, 200, 300
* "Example2 Medium" | 500 |
- * "Example2 Bold" | 700 | 600
+ * "Example2 Bold" | 700 | 600
* "Example2 Heavy" | 800 |
* "Example2 Black" | 900 |
* "Example2 ExtraBlack" | (none) |
@@ -128,48 +128,48 @@
* values. The only guarantee is that a face of a given value will be no less
* dark than the faces of lighter values.
*
- * @version $Revision$
+ * @version $Revision$
*/
public class CssFontWeight extends CssProperty implements CssFontConstant {
-
-
+
+
/**
* an index in a array
*
* @see CssFontConstant#FONTWEIGHT
- */
+ */
protected int value;
-
+
// internal hack to compare strings
private static int[] hash_values;
-
+
/**
* Create a new FontWeight with the default value.
- */
+ */
public CssFontWeight() {
// nothing to do
}
-
+
/**
* Creates a new CssFontWeight with an expression.
*
* @param expr the expression
* @exception InvalidParamException values are incorrect
- */
+ */
public CssFontWeight(ApplContext ac, CssExpression expr, boolean check)
throws InvalidParamException {
-
+
if(check && expr.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expr.getValue();
-
+
setByUser();
-
+
if (val instanceof CssIdent) {
int hash = expr.getValue().hashCode();
-
+
// try to find the hashCode in my internal hack array
for (int i=0; i<hash_values.length; i++)
if (hash_values[i] == hash) {
@@ -178,36 +178,38 @@
return;
}
} else if (val instanceof CssNumber) {
- float valf = ((Float) val.get()).floatValue();
- int vali = (int) valf;
- if (((valf - (float) vali) == 0) // real part number must be equal to zero
- && isCorrectWeight(vali)) { // verify the entire part number
- this.value = vali;
- expr.next();
- return;
+ Object valf = val.get();
+ if(valf instanceof Integer) {
+ int vali = ((Integer) valf).intValue();
+ if(isCorrectWeight(vali)) { // verify the entire part number
+ this.value = vali;
+ expr.next();
+ return;
+ }
}
+
}
-
- throw new InvalidParamException("value", expr.getValue().toString(),
+
+ throw new InvalidParamException("value", expr.getValue().toString(),
getPropertyName(), ac);
}
-
+
public CssFontWeight(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value.
- */
+ */
public Object get() {
if (value >= 100)
return new Integer(value);
else
return FONTWEIGHT[value];
}
-
-
+
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -215,7 +217,7 @@
public boolean isSoftlyInherited() {
return value == FONTWEIGHT.length - 1;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -225,32 +227,32 @@
else
return FONTWEIGHT[value];
}
-
+
/**
* Returns the name of this property.
- */
+ */
public String getPropertyName() {
return "font-weight";
}
-
+
/**
* Add this property to the CssStyle
*
* @param style The CssStyle
- */
+ */
public void addToStyle(ApplContext ac, CssStyle style) {
CssFont cssFont = ((Css1Style) style).cssFont;
if (cssFont.fontWeight != null)
style.addRedefinitionWarning(ac, this);
cssFont.fontWeight = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getFontWeight();
@@ -258,30 +260,30 @@
return ((Css1Style) style).cssFont.fontWeight;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssFontWeight &&
+ return (property instanceof CssFontWeight &&
((CssFontWeight) property).value == value);
}
-
+
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
- */
+ */
public boolean isDefault() {
return value == 0;
}
-
+
private boolean isCorrectWeight(int val) {
val = val / 100;
return val > 0 && val < 10;
}
-
+
static {
hash_values = new int[FONTWEIGHT.length];
for (int i=0; i<FONTWEIGHT.length; i++)
Index: CssBorderTopWidth.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderTopWidth.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderTopWidth.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssBorderTopWidth.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -44,16 +44,16 @@
* @version $Revision$
*/
public class CssBorderTopWidth extends CssProperty {
-
+
CssBorderFaceWidth face;
-
+
/**
* Create a new CssBorderTopWidth
*/
public CssBorderTopWidth() {
face = new CssBorderFaceWidth();
}
-
+
/**
* Create a new CssBorderTopWidth with an another CssBorderFaceWidth
*
@@ -61,10 +61,10 @@
*/
public CssBorderTopWidth(CssBorderFaceWidth another) {
setByUser();
-
+
face = another;
}
-
+
/**
* Create a new CssBorderTopWidth
*
@@ -73,27 +73,27 @@
*/
public CssBorderTopWidth(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
face = new CssBorderFaceWidth(ac, expression);
}
-
+
public CssBorderTopWidth(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
*/
@@ -103,7 +103,7 @@
}
return null;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -113,14 +113,14 @@
}
return "";
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "border-top-width";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -134,13 +134,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 ((Css1Style) style).getBorderTopWidth();
@@ -148,15 +148,15 @@
return ((Css1Style) style).cssBorder.getTop().width;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
return (property instanceof CssBorderTopWidth &&
face.equals(((CssBorderTopWidth) property).face));
}
-
+
}
Index: CssUnicodeBidiATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssUnicodeBidiATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssUnicodeBidiATSC.java 23 Aug 2005 16:23:12 -0000 1.1
+++ CssUnicodeBidiATSC.java 14 Sep 2005 15:14:31 -0000 1.2
@@ -19,37 +19,37 @@
/**
*/
public class CssUnicodeBidiATSC extends CssProperty {
-
+
CssValue value;
-
+
private static CssIdent normal = new CssIdent("normal");
-
+
private static CssIdent embed = new CssIdent("embed");
-
+
private static CssIdent bidi_override = new CssIdent("bidi-override");
-
+
/**
* Create a new CssUnicodeBidiATSC
*/
public CssUnicodeBidiATSC() {
value = normal;
- }
-
+ }
+
/**
* Create a new CssUnicodeBidiATSC
*
* @param expression The expression for this property
* @exception InvalidParamException The expression is incorrect
- */
+ */
public CssUnicodeBidiATSC(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
-
+
setByUser();
ac.getFrame().addWarning("atsc", val.toString());
@@ -72,36 +72,36 @@
expression.next();
return;
} else {
- throw new InvalidParamException("integer",
- val.toString(),
+ throw new InvalidParamException("integer",
+ val.toString(),
getPropertyName(), ac);
}
} else {
- throw new InvalidParamException("value", expression.getValue(),
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
-
+
}
-
+
public CssUnicodeBidiATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return value;
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "unicode-bidi";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -109,14 +109,14 @@
public boolean isSoftlyInherited() {
return value == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -128,7 +128,7 @@
style0.addRedefinitionWarning(ac, this);
style0.cssUnicodeBidiATSC = this;
}
-
+
/**
* Get this property in the style.
*
@@ -142,17 +142,17 @@
return ((Css1Style) style).cssUnicodeBidiATSC;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
*/
public boolean equals(CssProperty property) {
- return (property instanceof CssUnicodeBidiATSC &&
+ return (property instanceof CssUnicodeBidiATSC &&
value.equals(((CssUnicodeBidiATSC) property).value));
}
-
+
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
@@ -160,5 +160,5 @@
public boolean isDefault() {
return value == normal;
}
-
+
}
Index: CssColor.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssColor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssColor.java 26 Aug 2005 14:09:49 -0000 1.2
+++ CssColor.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -55,16 +55,16 @@
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
*/
- public CssColor(ApplContext ac, CssExpression expression, boolean check)
+ public CssColor(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();
@@ -218,7 +218,7 @@
params.getValue(),
getPropertyName(), ac);
}
- } else if (val instanceof CssIdent) {
+ } else if (val instanceof CssIdent) {
if ("css1".equals(ac.getCssVersion())) {
color = new org.w3c.css.values.CssColorCSS1(ac, (String) val.get());
} else if ("css2".equals(ac.getCssVersion())) {
@@ -230,17 +230,17 @@
}
// color = new org.w3c.css.values.CssColor();
expression.next();
- } else {
+ } else {
throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
}
- public CssColor(ApplContext ac, CssExpression expression)
+ public CssColor(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
Index: CssBorderFaceWidthCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderFaceWidthCSS2.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderFaceWidthCSS2.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorderFaceWidthCSS2.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -18,16 +18,16 @@
* @version $Revision$
*/
public class CssBorderFaceWidthCSS2 {
-
+
CssValue value;
-
+
/**
* Create a new CssBorderFaceWidthCSS2
*/
public CssBorderFaceWidthCSS2() {
value = medium;
}
-
+
/**
* Create a new CssBorderFaceWidthCSS2 from an another CssBorderFaceWidthCSS2
*
@@ -36,7 +36,7 @@
public CssBorderFaceWidthCSS2(CssBorderFaceWidthCSS2 another) {
value = another.value;
}
-
+
/**
* Create a new CssBorderFaceWidth
*
@@ -45,16 +45,16 @@
*/
public CssBorderFaceWidthCSS2(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);
@@ -71,45 +71,45 @@
} else {
throw new InvalidParamException("value", val.toString(), "width", ac);
}
-
+
expression.next();
- }
-
- public CssBorderFaceWidthCSS2(ApplContext ac, CssExpression expression)
+ }
+
+ public CssBorderFaceWidthCSS2(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() {
if(value != null) {
return value.toString();
}
return "";
}
-
+
/**
* Compares two sides for equality.
*
* @param value The another side.
- */
+ */
public boolean equals(CssBorderFaceWidthCSS2 another) {
return value.equals(another.value); // FIXME
}
-
+
private static CssIdent thin = new CssIdent("thin");
private static CssIdent medium = new CssIdent("medium");
private static CssIdent thick = new CssIdent("thick");
-
+
}
Index: CssFontConstant.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssFontConstant.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssFontConstant.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssFontConstant.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -47,10 +47,10 @@
/**
* Array of font values
*/
- static String[] FONT = { "icon", "window", "status-bar", "document",
- "workspace", "desktop", "tooltip", "message-box", "dialog",
+ static String[] FONT = { "icon", "window", "status-bar", "document",
+ "workspace", "desktop", "tooltip", "message-box", "dialog",
"small-caption", "caption", "button", "default-button", "hyperlink",
"menu", "pull-down-menu", "pop-up-menu", "list-menu", "field", "inherit"
};
-
+
}
Index: CssBorderRightColorCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderRightColorCSS1.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderRightColorCSS1.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssBorderRightColorCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -18,28 +18,28 @@
* @version $Revision$
*/
public class CssBorderRightColorCSS1 extends CssProperty {
-
+
CssBorderFaceColorCSS1 face;
-
+
/**
* Create a new CssBorderRightColorCSS1
*/
public CssBorderRightColorCSS1() {
face = new CssBorderFaceColorCSS1();
}
-
+
/**
* Create a new CssBorderRightColorCSS1 with an another CssBorderFaceColorCSS1
*
* @param another The another side.
*/
public CssBorderRightColorCSS1(CssBorderFaceColorCSS1 another) {
-
+
setByUser();
-
+
face = another;
}
-
+
/**
* Create a new CssBorderRightColorCSS1
*
@@ -47,29 +47,29 @@
* @exception InvalidParamException Values are incorrect
*/
public CssBorderRightColorCSS1(ApplContext ac, CssExpression expression,
- boolean check)
+ boolean check)
throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
face = new CssBorderFaceColorCSS1(ac, expression);
}
-
+
public CssBorderRightColorCSS1(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
*/
@@ -79,7 +79,7 @@
}
return null;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -89,14 +89,14 @@
}
return "";
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "border-right-color";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -108,13 +108,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 ((Css1Style) style).getBorderRightColorCSS1();
@@ -122,22 +122,22 @@
return ((Css1Style) style).cssBorderCSS1.getRight().color;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssBorderRightColorCSS1 &&
+ return (property instanceof CssBorderRightColorCSS1 &&
face.equals(((CssBorderRightColorCSS1) property).face));
}
-
+
/**
* Print this property.
*
* @param printer The printer.
- */
+ */
public void print(CssPrinterStyle printer) {
if (face != null && !face.isDefault())
printer.print(this);
Index: CssWordSpacing.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssWordSpacing.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssWordSpacing.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssWordSpacing.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -37,37 +37,37 @@
* Here, the word-spacing between each word in 'H1' elements would be increased
* by '1em'.
*
- * @version $Revision$
+ * @version $Revision$
*/
public class CssWordSpacing extends CssProperty {
-
+
private CssValue length;
private static CssIdent normal = new CssIdent("normal");
-
+
/**
* Create a new CssWordSpacing.
*/
public CssWordSpacing() {
length = normal;
- }
-
+ }
+
/**
* Create a new CssWordSpacing with an expression
*
* @param expression The expression
* @exception InvalidParamException The expression is incorrect
- */
+ */
public CssWordSpacing(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 CssLength) {
length = (CssLength) val;
expression.next();
@@ -81,30 +81,30 @@
length = normal;
expression.next();
} else {
- throw new InvalidParamException("value", expression.getValue(),
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
}
-
- public CssWordSpacing(ApplContext ac, CssExpression expression)
+
+ public CssWordSpacing(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return length;
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "word-spacing";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -112,32 +112,32 @@
public boolean isSoftlyInherited() {
return length == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return length.toString();
}
-
+
/**
* Adds this property to a style.
*
* @param style The style.
- */
+ */
public void addToStyle(ApplContext ac, CssStyle style) {
Css1Style style0 = (Css1Style) style;
if (style0.cssWordSpacing != null)
style0.addRedefinitionWarning(ac, this);
style0.cssWordSpacing = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getWordSpacing();
@@ -145,14 +145,14 @@
return ((Css1Style) style).cssWordSpacing;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssWordSpacing &&
+ return (property instanceof CssWordSpacing &&
length.equals(((CssWordSpacing) property).length));
- }
+ }
}
Index: CssMaxHeight.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssMaxHeight.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssMaxHeight.java 23 Aug 2005 16:23:12 -0000 1.1
+++ CssMaxHeight.java 14 Sep 2005 15:14:31 -0000 1.2
@@ -21,41 +21,41 @@
/**
*/
public class CssMaxHeight extends CssProperty {
-
+
CssValue value;
-
+
private static CssIdent none = new CssIdent("none");
-
+
/**
* Create a new CssMaxHeight
*/
public CssMaxHeight() {
value = none;
- }
-
+ }
+
/**
* Create a new CssMaxHeight.
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssMaxHeight(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)) {
value = inherit;
} else if (val instanceof CssLength || val instanceof CssPercentage) {
float f = ((Float) val.get()).floatValue();
if (f < 0) {
- throw new InvalidParamException("negative-value",
+ throw new InvalidParamException("negative-value",
val.toString(), ac);
}
value = val;
@@ -64,32 +64,32 @@
} else if (val instanceof CssNumber) {
value = ((CssNumber) val).getLength();
} else {
- throw new InvalidParamException("value", expression.getValue(),
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
-
+
expression.next();
}
-
+
public CssMaxHeight(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property.
*/
public Object get() {
return value;
}
-
+
/**
* Returns the name of this property.
- */
+ */
public String getPropertyName() {
return "max-height";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -97,15 +97,15 @@
public boolean isSoftlyInherited() {
return value == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
-
+
+
/**
* Add this property to the CssStyle.
*
@@ -117,13 +117,13 @@
style0.addRedefinitionWarning(ac, this);
style0.cssMaxHeight = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getMaxHeight();
@@ -131,23 +131,23 @@
return ((Css1Style) style).cssMaxHeight;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssMaxHeight
+ return (property instanceof CssMaxHeight
&& value.equals(((CssMaxHeight) property).value));
}
-
+
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
- */
+ */
public boolean isDefault() {
return value == none;
}
-
+
}
Index: CssLineHeightCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssLineHeightCSS1.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssLineHeightCSS1.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssLineHeightCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -16,7 +16,7 @@
import org.w3c.css.values.CssPercentage;
import org.w3c.css.values.CssValue;
-/**
+/**
* <H4>
* 'line-height'
* </H4>
@@ -45,35 +45,35 @@
* DIV { line-height: 120%; font-size: 10pt } /* percentage * /
* </PRE>
*
- * @version $Revision$
+ * @version $Revision$
*/
public class CssLineHeightCSS1 extends CssProperty {
-
+
/**
* Create a new CssLineHeightCSS1
*/
public CssLineHeightCSS1() {
value = normal;
}
-
+
/**
* Creates a new CssLineHeightCSS1
*
* @param expression The expression for this property
* @exception InvalidParamException The expression is incorrect
- */
+ */
public CssLineHeightCSS1(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 CssNumber || val instanceof CssLength ||
+ if (val instanceof CssNumber || val instanceof CssLength ||
val instanceof CssPercentage) {
float v = ((Float) val.get()).floatValue();
if (v >= 0) {
@@ -81,7 +81,7 @@
expression.next();
return;
} else {
- throw new InvalidParamException("negative-value",
+ throw new InvalidParamException("negative-value",
Float.toString(v), ac);
}
} else if (inherit.equals(val)) {
@@ -93,16 +93,16 @@
expression.next();
return;
}
-
- throw new InvalidParamException("value", expression.getValue(),
+
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
-
+
public CssLineHeightCSS1(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
@@ -111,14 +111,14 @@
return normal;
return value;
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "line-height";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -126,14 +126,14 @@
public boolean isSoftlyInherited() {
return value == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
- public String toString() {
+ public String toString() {
return value.toString();
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -145,13 +145,13 @@
style.addRedefinitionWarning(ac, this);
cssFont.lineHeight = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getLineHeightCSS1();
@@ -159,25 +159,25 @@
return ((Css1Style) style).cssFontCSS1.lineHeight;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssLineHeightCSS1 &&
+ return (property instanceof CssLineHeightCSS1 &&
((CssLineHeightCSS1) property).value == value);
}
-
+
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
- */
+ */
public boolean isDefault() {
return value == normal;
}
-
+
private CssValue value;
private static CssIdent normal = new CssIdent("normal");
}
Index: CssBorderBottomStyle.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderBottomStyle.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderBottomStyle.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorderBottomStyle.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -18,14 +18,14 @@
public class CssBorderBottomStyle extends CssProperty {
CssBorderFaceStyle face;
-
+
/**
* Create a new CssBorderBottomStyle
*/
public CssBorderBottomStyle() {
face = new CssBorderFaceStyle();
}
-
+
/**
* Create a new CssBorderBottomStyle with an another CssBorderFaceStyle
* @param another The another side.
@@ -35,7 +35,7 @@
face = another;
}
-
+
/**
* Create a new CssBorderBottomStyle eith an expression
*
@@ -44,7 +44,7 @@
*/
public CssBorderBottomStyle(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
@@ -52,12 +52,12 @@
setByUser();
face = new CssBorderFaceStyle(ac, expression);
}
-
- public CssBorderBottomStyle(ApplContext ac, CssExpression expression)
+
+ public CssBorderBottomStyle(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
@@ -87,7 +87,7 @@
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "border-bottom-style";
}
@@ -109,7 +109,7 @@
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getBorderBottomStyle();
@@ -122,7 +122,7 @@
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
return (property instanceof CssBorderBottomStyle &&
face.equals(((CssBorderBottomStyle) property).face));
Index: CssBackgroundColorCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBackgroundColorCSS1.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBackgroundColorCSS1.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBackgroundColorCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -52,7 +52,7 @@
*/
public CssBackgroundColorCSS1(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
@@ -80,11 +80,11 @@
}
}
- public CssBackgroundColorCSS1(ApplContext ac, CssExpression expression)
+ public CssBackgroundColorCSS1(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
Index: CssPositionTV.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssPositionTV.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssPositionTV.java 23 Aug 2005 16:23:12 -0000 1.1
+++ CssPositionTV.java 14 Sep 2005 15:14:31 -0000 1.2
@@ -41,11 +41,11 @@
*/
public CssPositionTV(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
setByUser();
@@ -63,7 +63,7 @@
throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
-
+
public CssPositionTV(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
Index: CssBackgroundImage.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBackgroundImage.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBackgroundImage.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBackgroundImage.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -35,9 +35,9 @@
* </PRE>
* @version $Revision$ */
public class CssBackgroundImage extends CssProperty {
-
+
CssValue url;
-
+
private static CssIdent none = new CssIdent("none");
/**
@@ -45,21 +45,21 @@
*/
public CssBackgroundImage() {
url = none;
- }
-
+ }
+
/**
* Creates a new CssBackgroundImage
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssBackgroundImage(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
CssValue val = expression.getValue();
@@ -73,23 +73,23 @@
url = none;
expression.next();
} else {
- throw new InvalidParamException("value", expression.getValue(),
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
}
-
- public CssBackgroundImage(ApplContext ac, CssExpression expression)
+
+ public CssBackgroundImage(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
@@ -100,7 +100,7 @@
}
return false;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -110,14 +110,14 @@
}
return "";
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "background-image";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -129,13 +129,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 ((Css1Style) style).getBackgroundImage();
@@ -143,23 +143,23 @@
return ((Css1Style) style).cssBackground.image;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
return (property instanceof CssBackgroundImage && url != null &&
url.equals(((CssBackgroundImage) 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: CssFontSizeAdjust.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssFontSizeAdjust.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssFontSizeAdjust.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssFontSizeAdjust.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -17,12 +17,12 @@
/**
*
* @see CssFont
- * @version $Revision$
+ * @version $Revision$
*/
public class CssFontSizeAdjust extends CssProperty implements CssFontConstant {
-
+
CssValue value;
-
+
private static CssIdent none = new CssIdent("none");
/**
@@ -31,21 +31,21 @@
public CssFontSizeAdjust() {
value = none;
}
-
+
/**
* Creates a new CssFontSize-Adjust
*
* @param expression the font size-adjust
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssFontSizeAdjust(ApplContext ac, CssExpression expression,
- boolean check)
+ boolean check)
throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
setByUser();
@@ -56,25 +56,25 @@
} else if (val instanceof CssNumber) {
value = val;
} else {
- throw new InvalidParamException("value", expression.getValue(),
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
-
+
expression.next();
}
-
+
public CssFontSizeAdjust(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value
- */
+ */
public Object get() {
return value;
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -82,21 +82,21 @@
public boolean isSoftlyInherited() {
return value == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "font-size-adjust";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -108,13 +108,13 @@
style0.addRedefinitionWarning(ac, this);
style0.cssFontSizeAdjust = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getFontSizeAdjust();
@@ -122,21 +122,21 @@
return ((Css1Style) style).cssFontSizeAdjust;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssFontSizeAdjust &&
+ return (property instanceof CssFontSizeAdjust &&
((CssFontSizeAdjust) property).value.equals(value));
}
-
+
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
- */
+ */
public boolean isDefault() {
return value == none;
}
Index: CssBorderTop.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderTop.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderTop.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssBorderTop.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -77,11 +77,11 @@
if(check && expression.getCount() > 4) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
boolean manyValues = (expression.getCount() > 1);
-
+
while (find) {
find = false;
val = expression.getValue();
@@ -94,7 +94,7 @@
if(manyValues && val.equals(inherit)) {
throw new InvalidParamException("unrecognize", null, null, ac);
}
-
+
if (op != SPACE)
throw new InvalidParamException("operator",
((new Character(op)).toString()), ac);
@@ -156,7 +156,7 @@
throws InvalidParamException {
this(ac, expression,false);
}
-
+
/**
* Returns the value of this property
*/
@@ -290,7 +290,7 @@
*
* @param style The CssStyle
*/
- public void addToStyle(ApplContext ac, CssStyle style) {
+ public void addToStyle(ApplContext ac, CssStyle style) {
if(width != null) {
width.addToStyle(ac, style);
}
@@ -324,7 +324,7 @@
* @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);
}
@@ -335,7 +335,7 @@
color.setInfo(line, source);
}
}
-
+
/**
* Set the context.
* Overrides this method for a macro
Index: TextShadowFace.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/TextShadowFace.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- TextShadowFace.java 23 Aug 2005 16:23:12 -0000 1.1
+++ TextShadowFace.java 14 Sep 2005 15:14:31 -0000 1.2
@@ -33,11 +33,11 @@
TextShadowFace(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
-
+
if(check && expression.getCount() > 4) {
throw new InvalidParamException("unrecognize", ac);
- }
-
+ }
+
val = expression.getValue();
op = expression.getOperator();
@@ -54,7 +54,7 @@
getLengths(ac, expression);
}
} else if (val instanceof CssLength || val instanceof CssNumber) {
- getLengths(ac, expression);
+ getLengths(ac, expression);
val = expression.getValue();
if (val instanceof CssColor) {
color = (CssColor) val;
@@ -66,16 +66,16 @@
expression.next();
}
} else {
- throw new InvalidParamException("value", expression.getValue(),
+ throw new InvalidParamException("value", expression.getValue(),
"text-shadow", ac);
}
}
TextShadowFace(ApplContext ac, CssExpression expression)
throws InvalidParamException {
- this(ac, expression, false);
+ this(ac, expression, false);
}
-
+
void getLengths(ApplContext ac, CssExpression expression) throws InvalidParamException {
CssLength le = getLength(expression.getValue());
op = expression.getOperator();
@@ -88,7 +88,7 @@
if ((op == SPACE) && (le != null)) {
lengths[1] = le;
op = expression.getOperator();
- expression.next();
+ expression.next();
le = getLength(expression.getValue());
if ((op == SPACE) && (le != null)) {
lengths[2] = le;
@@ -96,7 +96,7 @@
expression.next();
}
} else {
- throw new InvalidParamException("two-lengths",
+ throw new InvalidParamException("two-lengths",
expression.getValue(),
"text-shadow", ac);
}
Index: CssBorderLeftColor.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderLeftColor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderLeftColor.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorderLeftColor.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -20,27 +20,27 @@
* @version $Revision$
*/
public class CssBorderLeftColor extends CssProperty {
-
+
CssBorderFaceColor face;
-
+
/**
* Create a new CssBorderLeftColor
*/
public CssBorderLeftColor() {
face = new CssBorderFaceColor();
}
-
+
/**
* Create a new CssBorderLeftColor with an another CssBorderFaceColor
* @param another The another side.
*/
public CssBorderLeftColor(CssBorderFaceColor another) {
-
+
setByUser();
-
+
face = another;
}
-
+
/**
* Create a new CssBorderLeftColor
*
@@ -49,27 +49,27 @@
*/
public CssBorderLeftColor(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
face = new CssBorderFaceColor(ac, expression);
}
-
- public CssBorderLeftColor(ApplContext ac, CssExpression expression)
+
+ public CssBorderLeftColor(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
*/
@@ -79,7 +79,7 @@
}
return null;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -89,14 +89,14 @@
}
return "";
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "border-left-color";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -108,13 +108,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 ((Css1Style) style).getBorderLeftColor();
@@ -122,21 +122,21 @@
return ((Css1Style) style).cssBorder.getLeft().color;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
return (property instanceof CssBorderLeftColor && face.equals(((CssBorderLeftColor) property).face));
}
-
+
/**
* Print this property
*
* @param printer The printer.
- */
+ */
public void print(CssPrinterStyle printer) {
if (face != null && !face.isDefault())
printer.print(this);
Index: CssPaddingLeft.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssPaddingLeft.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssPaddingLeft.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssPaddingLeft.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -38,7 +38,7 @@
public CssPaddingLeft() {
super();
}
-
+
/**
* Create a new CssPaddingLeft with an another CssPaddingSide
* @param another The another side.
@@ -46,7 +46,7 @@
public CssPaddingLeft(CssPaddingSide another) {
super(another);
}
-
+
/**
* Create a new CssPaddingLeft
*
@@ -57,15 +57,15 @@
throws InvalidParamException {
super(ac, expression, check);
}
-
+
public CssPaddingLeft(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "padding-left";
}
@@ -87,7 +87,7 @@
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getPaddingLeft();
@@ -100,9 +100,9 @@
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssPaddingLeft &&
+ return (property instanceof CssPaddingLeft &&
value.equals(((CssPaddingLeft) property).value));
}
Index: CssFontCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssFontCSS1.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssFontCSS1.java 8 Sep 2005 12:23:34 -0000 1.3
+++ CssFontCSS1.java 14 Sep 2005 15:14:31 -0000 1.4
@@ -72,57 +72,57 @@
* @see CssFontFamily
* @see CssPercentage
* @see CssLength
- * @version $Revision$
+ * @version $Revision$
*/
-public class CssFontCSS1 extends CssProperty
+public class CssFontCSS1 extends CssProperty
implements CssOperator, CssFontConstantCSS1 {
-
+
CssValue value;
CssFontStyleCSS1 fontStyle;
CssFontVariantCSS1 fontVariant;
CssFontWeightCSS1 fontWeight;
-
+
CssFontSizeCSS1 fontSize;
CssLineHeightCSS1 lineHeight;
CssFontFamilyCSS1 fontFamily;
-
+
// internal hack for strings comparaison
//private static int[] hash_values;
-
+
static CssIdent normal = new CssIdent("normal");
-
+
/**
* Create a new CssFontCSS1
*/
public CssFontCSS1() {
- }
-
+ }
+
/**
* Creates a new CssFont
*
* @param expression The expression for this property
* @exception InvalidParamException The expression is incorrect
- */
+ */
public CssFontCSS1(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
-
+
CssValue val = expression.getValue();
char op = SPACE;
boolean find = true;
int max_values = 3;
-
+
int normalNb = 0;
-
+
while (find && max_values-- > 0) {
find = false;
val = expression.getValue();
- op = expression.getOperator();
+ op = expression.getOperator();
if (val == null) {
throw new InvalidParamException("few-value", getPropertyName(), ac);
- }
-
+ }
+
if(val.equals(normal)) {
normalNb++;
expression.next();
@@ -131,11 +131,11 @@
if (!find && fontStyle == null) {
try {
- fontStyle = new CssFontStyleCSS1(ac, expression);
+ fontStyle = new CssFontStyleCSS1(ac, expression);
find = true;
} catch (InvalidParamException e) {
}
- }
+ }
if (!find && fontVariant == null) {
try {
@@ -157,15 +157,15 @@
}
if (find && op != SPACE) {
- throw new InvalidParamException("operator",
+ throw new InvalidParamException("operator",
((new Character(op)).toString()), ac);
}
}
-
+
// "normal" values
CssExpression normalExpr = new CssExpression();
normalExpr.addValue(normal);
-
+
for(int i = 0; i < normalNb; i++) {
if (fontStyle == null) {
fontStyle = new CssFontStyleCSS1(ac, normalExpr);
@@ -182,40 +182,40 @@
}
val = expression.getValue();
- op = expression.getOperator();
-
+ op = expression.getOperator();
+
if (val == null) {
throw new InvalidParamException("few-value", getPropertyName(), ac);
}
-
+
fontSize = new CssFontSizeCSS1(ac, expression);
-
+
if (op == SLASH) {
op = expression.getOperator();
lineHeight = new CssLineHeightCSS1(ac, expression);
}
- if (op == SPACE && expression.getValue() != null) {
+ if (op == SPACE && expression.getValue() != null) {
fontFamily = new CssFontFamilyCSS1(ac, expression, true);
} else {
expression.starts();
throw new InvalidParamException("few-value", expression.toString(), ac);
- }
+ }
setByUser();
}
-
+
public CssFontCSS1(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return null;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -245,11 +245,11 @@
return ret.substring(1);
}
}
-
+
/**
* Set this property to be important.
* Overrides this method for a macro
- */
+ */
public void setImportant() {
super.setImportant();
if (value == null) {
@@ -267,7 +267,7 @@
fontFamily.important = true;
}
}
-
+
/**
* Returns true if this property is important.
* Overrides this method for a macro
@@ -284,14 +284,14 @@
(fontFamily == null || fontFamily.important));
}
}
-
+
/**
* Print this property.
*
* @param printer The printer
* @see #toString()
* @see #getPropertyName()
- */
+ */
public void print(CssPrinterStyle printer) {
if (value != null) {
printer.print(this);
@@ -326,9 +326,9 @@
((fontFamily.isSoftlyInherited()) || (fontFamily.size() != 0))) {
fontFamily.print(printer);
}
- }
+ }
}
-
+
/**
* Add this property to the CssStyle
*
@@ -352,14 +352,14 @@
fontFamily.addToStyle(ac, style);
}
}
-
+
/**
* 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 (value == null) {
@@ -377,16 +377,16 @@
fontFamily.setInfo(line, source);
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
return false;
}
-
+
/**
* Set the context.
* Overrides this method for a macro
@@ -415,13 +415,13 @@
fontFamily.setSelectors(selector);
}
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getFontCSS1();
@@ -429,7 +429,7 @@
return ((Css1Style) style).cssFontCSS1;
}
}
-
+
/**
* Returns the name of this property
*/
Index: CssBackgroundRepeat.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBackgroundRepeat.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBackgroundRepeat.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBackgroundRepeat.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -32,7 +32,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;
* }
@@ -41,35 +41,35 @@
* In the example above, the image will only be repeated vertically.
* @version $Revision$
*/
-public class CssBackgroundRepeat extends CssProperty
+public class CssBackgroundRepeat extends CssProperty
implements CssBackgroundConstants {
-
+
int repeat;
-
+
private static int[] hash_values;
-
+
/**
* Create a new CssBackgroundRepeat
*/
public CssBackgroundRepeat() {
repeat = 0;
- }
-
+ }
+
/**
* Set the value of the property
* @param expression The expression for this property
* @exception InvalidParamException The expression is incorrect
- */
+ */
public CssBackgroundRepeat(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++) {
@@ -79,23 +79,23 @@
return;
}
}
- }
- throw new InvalidParamException("value", expression.getValue(),
+ }
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
-
- public CssBackgroundRepeat(ApplContext ac, CssExpression expression)
+
+ public CssBackgroundRepeat(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
@@ -103,21 +103,21 @@
public boolean isSoftlyInherited() {
return repeat == 4;
}
-
+
/**
* Returns a string representation of the object.
*/
- public String toString() {
+ public String toString() {
return REPEAT[repeat];
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "background-repeat";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -129,13 +129,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 ((Css1Style) style).getBackgroundRepeat();
@@ -143,25 +143,25 @@
return ((Css1Style) style).cssBackground.repeat;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssBackgroundRepeat &&
+ return (property instanceof CssBackgroundRepeat &&
repeat == ((CssBackgroundRepeat) 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: CssCounterIncrement.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssCounterIncrement.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssCounterIncrement.java 23 Aug 2005 16:23:12 -0000 1.1
+++ CssCounterIncrement.java 14 Sep 2005 15:14:31 -0000 1.2
@@ -22,30 +22,30 @@
/**
*/
public class CssCounterIncrement extends CssProperty {
-
+
Vector values = new Vector();
-
+
private static CssIdent none = new CssIdent("none");
-
-
+
+
/**
* Create a new CssCounterIncrement
*/
public CssCounterIncrement() {
- }
-
+ }
+
/**
* Create a new CssCounterIncrement
*
* @param expression The expression for this property
* @exception InvalidParamException The expression is incorrect
- */
+ */
public CssCounterIncrement(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
CssValue val = expression.getValue();
int counter = 0;
char op = expression.getOperator();
-
+
setByUser();
if (val.equals(inherit)) {
if(expression.getCount() > 1) {
@@ -64,11 +64,11 @@
}
while(counter < expression.getCount()) {
-
+
if(val.equals(inherit) || val.equals(none)) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
// the operator must be a space
if(op != CssOperator.SPACE) {
throw new InvalidParamException("operator",
@@ -76,8 +76,8 @@
}
// an ident
if(val instanceof CssIdent) {
- values.addElement(val);
- }
+ values.addElement(val);
+ }
// a number associated to the previous ident
else if(val instanceof CssNumber
&& ((CssNumber) val).isInteger()
@@ -85,13 +85,13 @@
values.add(val);
}
else {
- throw new InvalidParamException("value",
- expression.getValue(),
+ throw new InvalidParamException("value",
+ expression.getValue(),
getPropertyName(), ac);
}
- expression.next();
+ expression.next();
counter++;
-
+
val = expression.getValue();
op = expression.getOperator();
}/*
@@ -109,14 +109,14 @@
&& ((CssNumber) val).isInteger()) {
// nothing
} else {
- throw new InvalidParamException("value",
- expression.getValue(),
+ throw new InvalidParamException("value",
+ expression.getValue(),
getPropertyName(), ac);
}
}
} else {
- throw new InvalidParamException("value",
- expression.getValue(),
+ throw new InvalidParamException("value",
+ expression.getValue(),
getPropertyName(), ac);
}
values.addElement(val);
@@ -127,26 +127,26 @@
}*/
}
-
+
public CssCounterIncrement(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return values;
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "counter-increment";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -154,7 +154,7 @@
public boolean isSoftlyInherited() {
return values.elementAt(0) == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -167,7 +167,7 @@
}
return ret.substring(1);
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -180,13 +180,13 @@
}
style0.cssCounterIncrement = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getCounterIncrement();
@@ -194,21 +194,21 @@
return ((Css1Style) style).cssCounterIncrement;
}
}
-
+
/**
* 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: CssZIndex.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssZIndex.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssZIndex.java 23 Aug 2005 16:23:12 -0000 1.1
+++ CssZIndex.java 14 Sep 2005 15:14:31 -0000 1.2
@@ -19,34 +19,34 @@
/**
*/
public class CssZIndex extends CssProperty {
-
+
CssValue value;
-
+
private static CssIdent auto = new CssIdent("auto");
-
+
/**
* Create a new CssZIndex
*/
public CssZIndex() {
value = auto;
- }
-
+ }
+
/**
* Create a new CssZIndex
*
* @param expression The expression for this property
* @param check true will test the number of parameters
* @exception InvalidParamException The expression is incorrect
- */
+ */
public CssZIndex(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)) {
value = inherit;
@@ -60,42 +60,42 @@
expression.next();
return;
} else {
- throw new InvalidParamException("integer",
- val.toString(),
+ throw new InvalidParamException("integer",
+ val.toString(),
getPropertyName(), ac);
}
} else {
- throw new InvalidParamException("value", expression.getValue(),
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
-
+
}
-
+
/**
* Create a new CssZIndex
*
* @param expression The expression for this property
* @exception InvalidParamException The expression is incorrect
- */
+ */
public CssZIndex(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return value;
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "z-index";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -103,14 +103,14 @@
public boolean isSoftlyInherited() {
return value == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -122,13 +122,13 @@
style0.addRedefinitionWarning(ac, this);
style0.cssZIndex = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getZIndex();
@@ -136,23 +136,23 @@
return ((Css1Style) style).cssZIndex;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssZIndex &&
+ return (property instanceof CssZIndex &&
value.equals(((CssZIndex) property).value));
}
-
+
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
- */
+ */
public boolean isDefault() {
return value == auto;
}
-
+
}
Index: CssDirectionATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssDirectionATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssDirectionATSC.java 23 Aug 2005 16:23:12 -0000 1.1
+++ CssDirectionATSC.java 14 Sep 2005 15:14:31 -0000 1.2
@@ -18,34 +18,34 @@
/**
*/
public class CssDirectionATSC extends CssProperty {
-
+
CssValue value;
-
+
private static CssIdent ltr = new CssIdent("ltr");
private static CssIdent rtl = new CssIdent("rtl");
-
+
/**
* Create a new CssDirectionATSC
*/
public CssDirectionATSC() {
value = ltr;
- }
-
+ }
+
/**
* Create a new CssDirectionATSC
*
* @param expression The expression for this property
* @exception InvalidParamException The expression is incorrect
- */
+ */
public CssDirectionATSC(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
-
+
ac.getFrame().addWarning("atsc", val.toString());
setByUser();
@@ -59,31 +59,31 @@
value = rtl;
expression.next();
} else {
- throw new InvalidParamException("value", expression.getValue(),
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
-
+
}
-
+
public CssDirectionATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return value;
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "direction";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -91,14 +91,14 @@
public boolean isSoftlyInherited() {
return value == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -110,13 +110,13 @@
style0.addRedefinitionWarning(ac, this);
style0.cssDirectionATSC = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getDirectionATSC();
@@ -124,23 +124,23 @@
return ((Css1Style) style).cssDirectionATSC;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssDirectionATSC &&
+ return (property instanceof CssDirectionATSC &&
value.equals(((CssDirectionATSC) property).value));
}
-
+
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
- */
+ */
public boolean isDefault() {
return value == ltr;
}
-
+
}
Index: CssBorderLeftWidthCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderLeftWidthCSS2.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderLeftWidthCSS2.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorderLeftWidthCSS2.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -44,16 +44,16 @@
* @version $Revision$
*/
public class CssBorderLeftWidthCSS2 extends CssProperty {
-
+
CssBorderFaceWidthCSS2 face;
-
+
/**
* Create a new CssBorderLeftWidthCSS2
*/
public CssBorderLeftWidthCSS2() {
face = new CssBorderFaceWidthCSS2();
}
-
+
/**
* Create a new CssBorderLeftWidthCSS2 with an another CssBorderFaceWidthCSS2
*
@@ -61,10 +61,10 @@
*/
public CssBorderLeftWidthCSS2(CssBorderFaceWidthCSS2 another) {
setByUser();
-
+
face = another;
}
-
+
/**
* Create a new CssBorderLeftWidthCSS2
*
@@ -73,27 +73,27 @@
*/
public CssBorderLeftWidthCSS2(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
face = new CssBorderFaceWidthCSS2(ac, expression);
}
-
+
public CssBorderLeftWidthCSS2(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
*/
@@ -103,7 +103,7 @@
}
return null;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -113,14 +113,14 @@
}
return "";
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "border-left-width";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -132,13 +132,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 ((Css1Style) style).getBorderLeftWidthCSS2();
@@ -146,15 +146,15 @@
return ((Css1Style) style).cssBorderCSS2.getLeft().width;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssBorderLeftWidthCSS2 &&
+ return (property instanceof CssBorderLeftWidthCSS2 &&
face.equals(((CssBorderLeftWidthCSS2) property).face));
}
-
+
}
Index: CssContentCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssContentCSS2.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssContentCSS2.java 1 Sep 2005 11:51:21 -0000 1.2
+++ CssContentCSS2.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -24,32 +24,32 @@
/**
*/
public class CssContentCSS2 extends CssProperty {
-
+
Vector values = new Vector();
-
+
private static String CONTENT[] = {
"open-quote", "close-quote", "no-open-quote", "no-close-quote" };
-
+
private static int[] hash_values;
-
-
+
+
/**
* Create a new CssContent
*/
public CssContentCSS2() {
- }
-
+ }
+
/**
* Create a new CssContent
*
* @param expression The expression for this property
* @exception InvalidParamException The expression is incorrect
- */
+ */
public CssContentCSS2(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
CssValue val = expression.getValue();
-
+
setByUser();
if (val.equals(inherit)) {
if(expression.getCount() > 1) {
@@ -59,7 +59,7 @@
expression.next();
return;
}
-
+
addContent(ac, expression);
}
@@ -69,7 +69,7 @@
* @param expression
* @throws InvalidParamException
*/
- protected void addContent(ApplContext ac, CssExpression expression)
+ protected void addContent(ApplContext ac, CssExpression expression)
throws InvalidParamException {
CssValue val = expression.getValue();
int counter = 0;
@@ -85,8 +85,8 @@
}
}
if (i == CONTENT.length) {
- throw new InvalidParamException("value",
- expression.getValue(),
+ throw new InvalidParamException("value",
+ expression.getValue(),
getPropertyName(), ac);
}
} else if (val instanceof CssString) {
@@ -97,11 +97,11 @@
CssFunction attr = (CssFunction) val;
CssExpression params = attr.getParameters();
CssValue v = params.getValue();
- if (attr.getName().equals("attr")) {
+ if (attr.getName().equals("attr")) {
if ((params.getCount() != 1)
|| !(v instanceof CssIdent)) {
- throw new InvalidParamException("attr",
- params.getValue(),
+ throw new InvalidParamException("attr",
+ params.getValue(),
getPropertyName(), ac);
}
} else if (attr.getName().equals("counter")) {
@@ -147,7 +147,7 @@
throw new InvalidParamException("counters",
params.getValue(),
getPropertyName(), ac);
- }
+ }
op = params.getOperator();
params.next();
v = params.getValue();
@@ -164,13 +164,13 @@
}
params.starts();
} else {
- throw new InvalidParamException("value",
- expression.getValue(),
+ throw new InvalidParamException("value",
+ expression.getValue(),
getPropertyName(), ac);
}
} else {
- throw new InvalidParamException("value",
- expression.getValue(),
+ throw new InvalidParamException("value",
+ expression.getValue(),
getPropertyName(), ac);
}
values.addElement(val);
@@ -180,12 +180,12 @@
op = expression.getOperator();
}
}
-
+
public CssContentCSS2(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
- }
-
+ }
+
/**
* @return Returns the values.
*/
@@ -206,14 +206,14 @@
public Object get() {
return values;
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "content";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -221,7 +221,7 @@
public boolean isSoftlyInherited() {
return values.elementAt(0) == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -234,7 +234,7 @@
}
return ret.substring(1);
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -247,13 +247,13 @@
}
style0.cssContentCSS2 = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getContent();
@@ -261,21 +261,21 @@
return ((Css1Style) style).cssContent;
}
}
-
+
/**
* 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: CssBorderColorCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderColorCSS1.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderColorCSS1.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorderColorCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -33,9 +33,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>
@@ -45,7 +45,7 @@
* @version $Revision$
*/
public class CssBorderColorCSS1 extends CssProperty implements CssOperator {
-
+
CssBorderTopColorCSS1 top;
CssBorderBottomColorCSS1 bottom;
CssBorderRightColorCSS1 right;
@@ -62,19 +62,19 @@
this.bottom = bottom;
this.left = left;
this.right = right;
- }
-
+ }
+
/**
* Create a new CssBorderCSS1
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssBorderColorCSS1(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
setByUser();
-
+
switch (expression.getCount()) {
case 1:
top = new CssBorderTopColorCSS1(ac, expression);
@@ -84,7 +84,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)) {
@@ -100,15 +100,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 CssBorderTopColorCSS1(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);
@@ -122,7 +122,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)) {
@@ -130,7 +130,7 @@
}
top = new CssBorderTopColorCSS1(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)) {
@@ -138,7 +138,7 @@
}
right = new CssBorderRightColorCSS1(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)) {
@@ -157,26 +157,26 @@
break;
}
}
-
- public CssBorderColorCSS1(ApplContext ac, CssExpression expression)
+
+ public CssBorderColorCSS1(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.
*/
@@ -211,11 +211,11 @@
}
*/
}
-
+
/**
* Set this property to be important.
* Overrides this method for a macro
- */
+ */
public void setImportant() {
if(top != null) {
top.important = true;
@@ -230,7 +230,7 @@
bottom.important = true;
}
}
-
+
/**
* Returns true if this property is important.
* Overrides this method for a macro
@@ -241,14 +241,14 @@
(left == null || left.important) &&
(bottom == null || bottom.important));
}
-
+
/**
* 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) &&
@@ -270,9 +270,9 @@
if (bottom != null)
bottom.print(printer);
}
-
+
}
-
+
/**
* Set the context.
* Overrides this method for a macro
@@ -295,7 +295,7 @@
left.setSelectors(selector);
}
}
-
+
/**
* Add this property to the CssStyle
*
@@ -315,25 +315,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) {
@@ -349,14 +349,14 @@
bottom.setInfo(line, source);
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
return false; // FIXME
}
-
+
}
Index: CssBorderLeftStyleCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderLeftStyleCSS1.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderLeftStyleCSS1.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorderLeftStyleCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -16,16 +16,16 @@
* @version $Revision$
*/
public class CssBorderLeftStyleCSS1 extends CssProperty {
-
+
CssBorderFaceStyleCSS1 face;
-
+
/**
* Create a new CssBorderLeftStyleCSS1
*/
public CssBorderLeftStyleCSS1() {
face = new CssBorderFaceStyleCSS1();
}
-
+
/**
* Create a new CssBorderLeftStyleCSS1 with an another CssBorderFaceStyleCSS1
*
@@ -33,10 +33,10 @@
*/
public CssBorderLeftStyleCSS1(CssBorderFaceStyleCSS1 another) {
setByUser();
-
+
face = another;
}
-
+
/**
* Create a new CssBorderLeftStyleCSS1
*
@@ -45,27 +45,27 @@
*/
public CssBorderLeftStyleCSS1(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
face = new CssBorderFaceStyleCSS1(ac, expression);
}
-
+
public CssBorderLeftStyleCSS1(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression,false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return face;
}
-
+
/**
* Returns the value
*/
@@ -75,7 +75,7 @@
}
return null;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -85,14 +85,14 @@
}
return "";
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "border-left-style";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -104,13 +104,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 ((Css1Style) style).getBorderLeftStyleCSS1();
@@ -118,14 +118,14 @@
return ((Css1Style) style).cssBorderCSS1.getLeft().style;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
return (property instanceof CssBorderLeftStyleCSS1 && face.equals(((CssBorderLeftStyleCSS1) property).face));
}
-
+
}
Index: CssBorderBottomCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderBottomCSS2.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorderBottomCSS2.java 8 Sep 2005 12:23:33 -0000 1.3
+++ CssBorderBottomCSS2.java 14 Sep 2005 15:14:31 -0000 1.4
@@ -49,64 +49,64 @@
* @version $Revision$
*/
public class CssBorderBottomCSS2 extends CssProperty implements CssOperator {
-
+
CssBorderBottomWidthCSS2 width;
CssBorderBottomStyleCSS2 style;
CssBorderBottomColorCSS2 color;
-
+
/**
* Create a new CssBorderFaceCSS2
*/
public CssBorderBottomCSS2() {
- }
-
+ }
+
/**
* Create a new CssBorderFace
* @param expression The expression for this property
* @exception InvalidParamException The expression is incorrect
- */
+ */
public CssBorderBottomCSS2(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
CssValue val = null;
char op = SPACE;
boolean find = true;
-
+
if(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 CssBorderBottomWidthCSS2(ac, expression);
+ width = new CssBorderBottomWidthCSS2(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 CssBorderBottomStyleCSS2(ac, expression);
+ style = new CssBorderBottomStyleCSS2(ac, expression);
find = true;
} catch(InvalidParamException e){
// nothing to do, color will test this value
@@ -115,10 +115,10 @@
if (!find && color == null) {
// throws an exception if the value is not valid
color = new CssBorderBottomColorCSS2(ac, expression);
- find = true;
+ find = true;
}
}
-
+
//if some values have not been set, we set them with their default ones
/*
if (width == null) {
@@ -132,12 +132,12 @@
}
*/
}
-
+
public CssBorderBottomCSS2(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* @param color The color to set.
*/
@@ -165,7 +165,7 @@
public Object get() {
return width;
}
-
+
/**
* Returns the color property
*/
@@ -176,7 +176,7 @@
return null;
}
}
-
+
/**
* Returns the width property
*/
@@ -187,7 +187,7 @@
return null;
}
}
-
+
/**
* Returns the style property
*/
@@ -198,7 +198,7 @@
return null;
}
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -221,18 +221,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.important = true;
@@ -244,7 +244,7 @@
color.important = true;
}
}
-
+
/**
* Returns true if this property is important.
* Overrides this method for a macro
@@ -254,14 +254,14 @@
(style == null || style.important) &&
(color == null || color.important));
}
-
+
/**
* Print this property.
*
* @param printer The printer.
* @see #toString()
* @see #getPropertyName()
- */
+ */
public void print(CssPrinterStyle printer) {
if ((width != null && style != null &&
color != null) &&
@@ -278,15 +278,15 @@
if (color != null)
color.print(printer);
}
-
+
}
-
+
/**
* Add this property to the CssStyle
*
* @param style The CssStyle
*/
- public void addToStyle(ApplContext ac, CssStyle style) {
+ public void addToStyle(ApplContext ac, CssStyle style) {
if(width != null) {
width.addToStyle(ac, style);
}
@@ -297,13 +297,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 ((Css1Style) style).getBorderBottomCSS2();
@@ -311,16 +311,16 @@
return ((Css1Style) style).cssBorderCSS2.getBottom();
}
}
-
+
/**
* 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);
}
@@ -331,7 +331,7 @@
color.setInfo(line, source);
}
}
-
+
/**
* Set the context.
* Overrides this method for a macro
@@ -351,25 +351,25 @@
color.setSelectors(selector);
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
- public boolean equals(CssProperty property) {
+ */
+ public boolean equals(CssProperty property) {
if (property instanceof CssBorderBottomCSS2) {
CssBorderBottomCSS2 bottom = (CssBorderBottomCSS2) property;
- return (width != null && width.equals(bottom.width)
- && style != null && style.equals(bottom.style)
+ return (width != null && width.equals(bottom.width)
+ && style != null && style.equals(bottom.style)
&& color != null && 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: CssBorderWidthCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderWidthCSS1.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderWidthCSS1.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssBorderWidthCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -56,12 +56,12 @@
* @version $Revision$
*/
public class CssBorderWidthCSS1 extends CssProperty implements CssOperator {
-
+
CssBorderTopWidthCSS1 top;
CssBorderBottomWidthCSS1 bottom;
CssBorderRightWidthCSS1 right;
CssBorderLeftWidthCSS1 left;
-
+
/**
* Create a new CssBorderWidthCSS1
*/
@@ -73,14 +73,14 @@
this.bottom = bottom;
this.left = left;
this.right = right;
- }
-
+ }
+
/**
* Create a new CssBorderCSS1
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssBorderWidthCSS1(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
@@ -94,7 +94,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)) {
@@ -110,7 +110,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)) {
@@ -118,7 +118,7 @@
}
top = new CssBorderTopWidthCSS1(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)) {
@@ -133,7 +133,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)) {
@@ -141,7 +141,7 @@
}
top = new CssBorderTopWidthCSS1(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)) {
@@ -149,7 +149,7 @@
}
right = new CssBorderRightWidthCSS1(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)) {
@@ -167,26 +167,26 @@
}
}
}
-
- CssBorderWidthCSS1(ApplContext ac, CssExpression expression)
+
+ CssBorderWidthCSS1(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.
*/
@@ -205,11 +205,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.important = true;
@@ -224,7 +224,7 @@
bottom.important = true;
}
}
-
+
/**
* Returns true if this property is important.
* Overrides this method for a macro
@@ -235,14 +235,14 @@
(left == null || left.important) &&
(bottom == null || bottom.important));
}
-
+
/**
* 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) &&
@@ -262,9 +262,9 @@
if (bottom != null)
bottom.print(printer);
}
-
+
}
-
+
/**
* Set the context.
* Overrides this method for a macro
@@ -287,7 +287,7 @@
left.setSelectors(selector);
}
}
-
+
/**
* Add this property to the CssStyle
*
@@ -307,25 +307,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) {
@@ -341,14 +341,14 @@
bottom.setInfo(line, source);
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
return false; // FIXME
}
-
+
}
Index: CssWidth.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssWidth.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssWidth.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssWidth.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -44,41 +44,41 @@
* @version $Revision$
*/
public class CssWidth extends CssProperty {
-
+
CssValue value;
-
+
private static CssIdent auto = new CssIdent("auto");
-
+
/**
* Create a new CssWidth
*/
public CssWidth() {
value = auto;
- }
-
+ }
+
/**
* Create a new CssWidth.
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssWidth(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)) {
value = inherit;
} else if (val instanceof CssLength || val instanceof CssPercentage) {
float f = ((Float) val.get()).floatValue();
if (f < 0) {
- throw new InvalidParamException("negative-value",
+ throw new InvalidParamException("negative-value",
val.toString(), ac);
}
value = val;
@@ -87,32 +87,32 @@
} else if (val instanceof CssNumber) {
value = ((CssNumber) val).getLength();
} else {
- throw new InvalidParamException("value", val,
+ throw new InvalidParamException("value", val,
getPropertyName(), ac);
}
-
+
expression.next();
}
-
+
public CssWidth(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property.
*/
public Object get() {
return value;
}
-
+
/**
* Returns the name of this property.
- */
+ */
public String getPropertyName() {
return "width";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -120,15 +120,15 @@
public boolean isSoftlyInherited() {
return value == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
-
+
+
/**
* Add this property to the CssStyle.
*
@@ -140,13 +140,13 @@
style0.addRedefinitionWarning(ac, this);
style0.cssWidth = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getWidth();
@@ -154,22 +154,22 @@
return ((Css1Style) style).cssWidth;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
return (property instanceof CssWidth && value.equals(((CssWidth) property).value));
}
-
+
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
- */
+ */
public boolean isDefault() {
return value == auto;
}
-
+
}
Index: CssBorderTopCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderTopCSS2.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorderTopCSS2.java 8 Sep 2005 12:23:34 -0000 1.3
+++ CssBorderTopCSS2.java 14 Sep 2005 15:14:31 -0000 1.4
@@ -49,57 +49,57 @@
* @version $Revision$
*/
public class CssBorderTopCSS2 extends CssProperty implements CssOperator {
-
+
CssBorderTopWidthCSS2 width;
CssBorderTopStyleCSS2 style;
CssBorderTopColorCSS2 color;
-
+
/**
* Create a new CssBorderFaceCSS2
*/
public CssBorderTopCSS2() {
- }
-
+ }
+
/**
* Create a new CssBorderFaceCSS2
*
* @param expression The expression for this property
* @exception InvalidParamException The expression is incorrect
- */
+ */
public CssBorderTopCSS2(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 CssBorderTopWidthCSS2(ac, expression);
+ width = new CssBorderTopWidthCSS2(ac, expression);
find = true;
} catch(InvalidParamException e){
//nothing to do, style will test this value
@@ -107,7 +107,7 @@
}
if (!find && style == null) {
try {
- style = new CssBorderTopStyleCSS2(ac, expression);
+ style = new CssBorderTopStyleCSS2(ac, expression);
find = true;
} catch(InvalidParamException e){
//nothing to do, color will test this value
@@ -116,28 +116,28 @@
if (!find && color == null) {
// throws an exception if the value is not valid
color = new CssBorderTopColorCSS2(ac, expression);
- find = true;
+ find = true;
}
}
-
+
//if some values have not been set, we set them with their default ones
/*
if (width == null) {
width = new CssBorderTopWidthCSS2();
}
if (style == null) {
- style = new CssBorderTopStyleCSS2();
+ style = new CssBorderTopStyleCSS2();
}
if (color == null) {
- color = new CssBorderTopColorCSS2();
- }*/
+ color = new CssBorderTopColorCSS2();
+ }*/
}
-
+
public CssBorderTopCSS2(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression,false);
}
-
+
/**
* @return Returns the color.
*/
@@ -186,7 +186,7 @@
public Object get() {
return width;
}
-
+
/**
* Returns the color property
*/
@@ -197,7 +197,7 @@
return null;
}
}
-
+
/**
* Returns the width property
*/
@@ -208,7 +208,7 @@
return null;
}
}
-
+
/**
* Returns the style property
*/
@@ -219,12 +219,12 @@
return null;
}
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
- String ret = "";
+ String ret = "";
if(width != null) {
ret += width;
}
@@ -239,21 +239,21 @@
ret += " ";
}
ret += color;
- }
+ }
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.important = true;
@@ -265,7 +265,7 @@
color.important = true;
}
}
-
+
/**
* Returns true if this property is important.
* Overrides this method for a macro
@@ -275,14 +275,14 @@
(style == null || style.important) &&
(color == null || color.important));
}
-
+
/**
* Print this property.
*
* @param printer The printer.
* @see #toString()
* @see #getPropertyName()
- */
+ */
public void print(CssPrinterStyle printer) {
if ((width != null && style != null &&
color != null) &&
@@ -299,15 +299,15 @@
if (color != null)
color.print(printer);
}
-
+
}
-
+
/**
* Add this property to the CssStyle
*
* @param style The CssStyle
*/
- public void addToStyle(ApplContext ac, CssStyle style) {
+ public void addToStyle(ApplContext ac, CssStyle style) {
if(width != null) {
width.addToStyle(ac, style);
}
@@ -318,13 +318,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 ((Css1Style) style).getBorderTopCSS2();
@@ -332,16 +332,16 @@
return ((Css1Style) style).cssBorderCSS2.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);
}
@@ -352,7 +352,7 @@
color.setInfo(line, source);
}
}
-
+
/**
* Set the context.
* Overrides this method for a macro
@@ -372,25 +372,25 @@
color.setSelectors(selector);
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
- public boolean equals(CssProperty property) {
+ */
+ public boolean equals(CssProperty property) {
if (property instanceof CssBorderTopCSS2) {
CssBorderTopCSS2 top = (CssBorderTopCSS2) property;
- return (width != null && width.equals(top.width)
- && style != null && style.equals(top.style)
+ return (width != null && width.equals(top.width)
+ && style != null && style.equals(top.style)
&& color != null && 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: CssListStyle.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssListStyle.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssListStyle.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssListStyle.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -70,40 +70,40 @@
* <P> In the example above, the 'disc' will be used when the image is
* unavailable.
*
- * @version $Revision$
+ * @version $Revision$
*/
public class CssListStyle extends CssProperty implements CssOperator {
-
+
CssListStyleType listStyleType;
CssListStyleImage listStyleImage;
CssListStylePosition listStylePosition;
boolean inheritedValue;
-
+
/**
* Create a new CssListStyle
*/
public CssListStyle() {
// nothing to do
- }
-
+ }
+
/**
* Create a new CssListStyle
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssListStyle(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 3) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
char op = SPACE;
boolean find = true;
-
+
setByUser();
if (val.equals(inherit)) {
@@ -114,16 +114,16 @@
expression.next();
return;
}
-
+
while (find) {
find = false;
val = expression.getValue();
op = expression.getOperator();
-
+
if(val != null && val.equals(inherit)) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
if ((listStyleType == null)
&& (val != null)) {
try {
@@ -132,16 +132,16 @@
} catch (InvalidParamException e) {
}
}
- if (!find
+ if (!find
&& (listStyleImage == null)
&& (val != null)) {
try {
listStyleImage = new CssListStyleImage(ac, expression);
find = true;
} catch (InvalidParamException e) {
- }
+ }
}
- if (!find
+ if (!find
&& (val != null)
&& (listStylePosition == null)) {
listStylePosition = new CssListStylePosition(ac, expression);
@@ -151,7 +151,7 @@
throw new InvalidParamException("unrecognize", ac);
}
if (op != SPACE) {
- throw new InvalidParamException("operator",
+ throw new InvalidParamException("operator",
((new Character(op)).toString()),
ac);
}
@@ -160,35 +160,35 @@
if (listStyleType == null) {
listStyleType = new CssListStyleType();
}
-
+
if (listStyleImage == null) {
listStyleImage = new CssListStyleImage();
}
-
+
if (listStylePosition == null) {
listStylePosition = new CssListStylePosition();
}*/
}
-
+
public CssListStyle(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return listStyleType;
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "list-style";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -196,7 +196,7 @@
public boolean isSoftlyInherited() {
return inheritedValue;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -217,13 +217,13 @@
return ret.trim();
}
}
-
-
-
+
+
+
/**
* Set this property to be important.
* Overrides this method for a macro
- */
+ */
public void setImportant() {
if (!inheritedValue) {
if(listStyleType != null)
@@ -234,7 +234,7 @@
listStylePosition.important = true;
}
}
-
+
/**
* Returns true if this property is important.
* Overrides this method for a macro
@@ -244,13 +244,13 @@
(listStyleImage == null || listStyleImage.important) &&
(listStylePosition == null || listStylePosition.important));
}
-
+
/**
* Print this property.
*
* @see #toString()
* @see #getPropertyName()
- */
+ */
public void print(CssPrinterStyle printer) {
if (inheritedValue) {
printer.print(this);
@@ -272,9 +272,9 @@
listStylePosition.print(printer);
}
}
-
+
}
-
+
/**
* Set the context.
* Overrides this method for a macro
@@ -294,7 +294,7 @@
listStylePosition.setSelectors(selector);
}
}
-
+
/**
* Add this property to the CssStyle
*
@@ -312,13 +312,13 @@
((Css1Style) style).cssListStyle.inheritedValue = true;
}
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getListStyle();
@@ -326,14 +326,14 @@
return ((Css1Style) style).cssListStyle;
}
}
-
+
/**
* 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 (!inheritedValue) {
@@ -345,15 +345,15 @@
listStylePosition.setInfo(line, source);
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
// @FIXME
return false;
}
-
+
}
Index: CssFontSizeCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssFontSizeCSS1.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssFontSizeCSS1.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssFontSizeCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -72,33 +72,33 @@
* <P>
* If the suggested scaling factor of 1.5 is used, the last three declarations
* are identical.
- * @version $Revision$
+ * @version $Revision$
*/
public class CssFontSizeCSS1 extends CssProperty implements CssFontConstantCSS1 {
-
+
int value;
CssValue cssValue;
-
+
/**
* Create a new FontSizeCSS1
- */
+ */
public CssFontSizeCSS1() {
value = 3; // default value is medium
}
-
+
/**
* Creates a new CssFontSizeCSS1
*
* @param expression the expression of the size
* @exception InvalidParamException The expression is incorrect
- */
+ */
public CssFontSizeCSS1(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) {
@@ -114,7 +114,7 @@
} else if (val instanceof CssPercentage) {
float num = ((Float) val.get()).floatValue();
if (num < 0) {
- throw new InvalidParamException("negative-value",
+ throw new InvalidParamException("negative-value",
val.toString(), ac);
}
this.cssValue = val;
@@ -134,30 +134,30 @@
expression.next();
return;
} else {
- throw new InvalidParamException("negative-value",
+ throw new InvalidParamException("negative-value",
val.toString(), ac);
}
}
- throw new InvalidParamException("value",
+ throw new InvalidParamException("value",
val, getPropertyName(), ac);
}
-
+
public CssFontSizeCSS1(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value
- */
+ */
public Object get() {
if (cssValue != null)
return cssValue;
else
return FONTSIZE[value];
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -165,7 +165,7 @@
public boolean isSoftlyInherited() {
return value == FONTSIZE.length - 1;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -175,15 +175,15 @@
else
return FONTSIZE[value];
}
-
-
+
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "font-size";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -195,13 +195,13 @@
style.addRedefinitionWarning(ac, this);
cssFont.fontSize = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getFontSizeCSS1();
@@ -209,23 +209,23 @@
return ((Css1Style) style).cssFontCSS1.fontSize;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
if (cssValue == null)
- return (property instanceof CssFontSizeCSS1 &&
+ return (property instanceof CssFontSizeCSS1 &&
((CssFontSizeCSS1) property).value == value);
else
- return (property instanceof CssFontSizeCSS1 &&
+ return (property instanceof CssFontSizeCSS1 &&
((CssFontSizeCSS1) property).cssValue.equals(cssValue));
}
-
+
private static int[] hash_values;
-
+
static {
hash_values = new int[FONTSIZE.length];
for (int i=0; i<FONTSIZE.length; i++)
Index: CssDisplayCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssDisplayCSS1.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssDisplayCSS1.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssDisplayCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -54,39 +54,39 @@
* default values for all HTML elements according to the suggested rendering
* of elements in the HTML specification.
*
- * @version $Revision$
+ * @version $Revision$
*/
public class CssDisplayCSS1 extends CssProperty {
-
+
int value;
-
+
private static String[] DISPLAY = {
"inline", "block", "list-item", "none", };
private static int[] hash_values;
-
+
/**
* Create a new CssDisplayCSS1
*/
public CssDisplayCSS1() {
// nothing to do
- }
-
+ }
+
/**
* Create a new CssDisplayCSS1
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorect
- */
+ */
public CssDisplayCSS1(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
-
+
setByUser();
if ( val instanceof CssIdent) {
@@ -99,30 +99,30 @@
}
}
}
-
- throw new InvalidParamException("value", expression.getValue(),
+
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
-
+
public CssDisplayCSS1(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return DISPLAY[value];
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "display";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -130,14 +130,14 @@
public boolean isSoftlyInherited() {
return value == DISPLAY.length - 1;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return DISPLAY[value];
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -149,13 +149,13 @@
style0.addRedefinitionWarning(ac, this);
style0.cssDisplayCSS1 = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getDisplayCSS1();
@@ -163,25 +163,25 @@
return ((Css1Style) style).cssDisplayCSS1;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssDisplayCSS1 &&
+ return (property instanceof CssDisplayCSS1 &&
value == ((CssDisplay) property).value);
}
-
+
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
- */
+ */
public boolean isDefault() {
return value == 0;
}
-
+
static {
hash_values = new int[DISPLAY.length];
for (int i = 0; i < DISPLAY.length; i++)
Index: CssCounterReset.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssCounterReset.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssCounterReset.java 23 Aug 2005 16:23:12 -0000 1.1
+++ CssCounterReset.java 14 Sep 2005 15:14:31 -0000 1.2
@@ -22,30 +22,30 @@
/**
*/
public class CssCounterReset extends CssProperty {
-
+
Vector values = new Vector();
-
+
private static CssIdent none = new CssIdent("none");
-
-
+
+
/**
* Create a new CssCounterReset
*/
public CssCounterReset() {
- }
-
+ }
+
/**
* Create a new CssCounterReset
*
* @param expression The expression for this property
* @exception InvalidParamException The expression is incorrect
- */
+ */
public CssCounterReset(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
CssValue val = expression.getValue();
int counter = 0;
char op = expression.getOperator();
-
+
setByUser();
if (val.equals(inherit)) {
if(expression.getCount() > 1) {
@@ -62,13 +62,13 @@
expression.next();
return;
}
-
+
while(counter < expression.getCount()) {
-
+
if(val.equals(inherit) || val.equals(none)) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
// the operator must be a space
if(op != CssOperator.SPACE) {
throw new InvalidParamException("operator",
@@ -76,7 +76,7 @@
}
// an ident
if(val instanceof CssIdent) {
- values.addElement(val);
+ values.addElement(val);
}
// a number associated to the previous ident
else if(val instanceof CssNumber
@@ -85,13 +85,13 @@
values.add(val);
}
else {
- throw new InvalidParamException("value",
- expression.getValue(),
+ throw new InvalidParamException("value",
+ expression.getValue(),
getPropertyName(), ac);
}
- expression.next();
+ expression.next();
counter++;
-
+
val = expression.getValue();
op = expression.getOperator();
}
@@ -110,14 +110,14 @@
&& ((CssNumber) val).isInteger()) {
// nothing
} else {
- throw new InvalidParamException("value",
- expression.getValue(),
+ throw new InvalidParamException("value",
+ expression.getValue(),
getPropertyName(), ac);
}
}
} else {
- throw new InvalidParamException("value",
- expression.getValue(),
+ throw new InvalidParamException("value",
+ expression.getValue(),
getPropertyName(), ac);
}
values.addElement(val);
@@ -127,26 +127,26 @@
op = expression.getOperator();
}*/
}
-
+
public CssCounterReset(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return values;
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "counter-reset";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -154,7 +154,7 @@
public boolean isSoftlyInherited() {
return values.elementAt(0) == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -167,7 +167,7 @@
}
return ret.substring(1);
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -180,13 +180,13 @@
}
style0.cssCounterReset = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getCounterReset();
@@ -194,21 +194,21 @@
return ((Css1Style) style).cssCounterReset;
}
}
-
+
/**
* 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: CssListStyleConstants.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssListStyleConstants.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssListStyleConstants.java 8 Sep 2005 12:23:34 -0000 1.3
+++ CssListStyleConstants.java 14 Sep 2005 15:14:31 -0000 1.4
@@ -10,34 +10,34 @@
* @version $Revision$
*/
public interface CssListStyleConstants {
-
+
public static String[] LISTSTYLETYPE = {
"box", "check", "circle", "diamond", "disc", "hyphen", "square",
"armenian", "cjk-ideographic", "ethiopic-numeric", "georgian", "hebrew",
"japanese-formal", "japanese-informal", "lower-armenian", "lower-roman",
- "simp-chinese-formal", "simp-chinese-informal", "syriac", "tamil",
+ "simp-chinese-formal", "simp-chinese-informal", "syriac", "tamil",
"trad-chinese-formal", "trad-chinese-informal", "upper-armenian",
- "upper-roman", "arabic-indic", "binary", "bengali", "cambodian",
+ "upper-roman", "arabic-indic", "binary", "bengali", "cambodian",
"decimal", "decimal-leading-zero", "devanagari", "gujarati", "gurmukhi",
"kannada", "khmer", "lao", "lower-hexadecimal", "malayalam",
- "mongolian", "myanmar", "octal", "oriya", "persian", "telugu",
- "tibetan", "thai", "upper-hexadecimal", "urdu", "afar", "amharic",
+ "mongolian", "myanmar", "octal", "oriya", "persian", "telugu",
+ "tibetan", "thai", "upper-hexadecimal", "urdu", "afar", "amharic",
"amharic-abegede", "cjk-earthly-branch", "cjk-heavenly-stem", "ethiopic",
"ethiopic-abegede", "ethiopic-abegede-am-et", "ethiopic-abegede-gez",
- "ethiopic-abegede-ti-er", "ethiopic-abegede-ti-et",
- "ethiopic-halehame-aa-er", "ethiopic-halehame-aa-et",
- "ethiopic-halehame-am-et", "ethiopic-halehame-gez",
+ "ethiopic-abegede-ti-er", "ethiopic-abegede-ti-et",
+ "ethiopic-halehame-aa-er", "ethiopic-halehame-aa-et",
+ "ethiopic-halehame-am-et", "ethiopic-halehame-gez",
"ethiopic-halehame-om-et", "ethiopic-halehame-sid-et",
- "ethiopic-halehame-so-et", "ethiopic-halehame-ti-er",
- "ethiopic-halehame-ti-et", "ethiopic-halehame-tig", "hangul",
- "hangul-consonant", "hiragana", "hiragana-iroha", "katakana",
- "katakana-iroha", "lower-alpha", "lower-greek", "lower-norwegian",
+ "ethiopic-halehame-so-et", "ethiopic-halehame-ti-er",
+ "ethiopic-halehame-ti-et", "ethiopic-halehame-tig", "hangul",
+ "hangul-consonant", "hiragana", "hiragana-iroha", "katakana",
+ "katakana-iroha", "lower-alpha", "lower-greek", "lower-norwegian",
"lower-latin", "oromo", "sidama", "somali", "tigre", "tigrinya-er",
- "tigrinya-er-abegede", "tigrinya-et", "tigrinya-et-abegede",
- "upper-alpha", "upper-greek", "upper-norwegian", "upper-latin",
- "asterisks", "footnotes", "circled-decimal", "circled-lower-latin",
+ "tigrinya-er-abegede", "tigrinya-et", "tigrinya-et-abegede",
+ "upper-alpha", "upper-greek", "upper-norwegian", "upper-latin",
+ "asterisks", "footnotes", "circled-decimal", "circled-lower-latin",
"circled-upper-latin", "dotted-decimal", "double-circled-decimal",
- "filled-circled-decimal", "parenthesised-decimal",
+ "filled-circled-decimal", "parenthesised-decimal",
"parenthesised-lower-latin", "normal", "none", "inherit"
};
@@ -54,8 +54,8 @@
"lower-latin", "upper-alpha", "upper-latin", "hebrew", "armenian",
"georgian", "cjk-ideographic", "hiragana", "katakana", "hiragana-iroha",
"katakana-iroha", "none", "inherit"
- };
-
+ };
+
public static String[] LISTSTYLETYPETV = {
"disc", "circle", "square", "decimal",
"lower-roman", "upper-roman",
Index: CssMarginSide.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssMarginSide.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssMarginSide.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssMarginSide.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -19,16 +19,16 @@
* @version $Revision$
*/
public abstract class CssMarginSide extends CssProperty {
-
+
CssValue value;
-
+
/**
* Create a new CssMarginSide
*/
public CssMarginSide() {
value = new CssLength();
}
-
+
/**
* Create a new CssMarginSide with an another CssMarginSide
*
@@ -37,24 +37,24 @@
public CssMarginSide(CssMarginSide another) {
value = another.value;
}
-
+
/**
* Create a new CssMarginSide
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssMarginSide(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)) {
value = inherit;
expression.next();
@@ -68,30 +68,30 @@
value = auto;
expression.next();
} else {
- throw new InvalidParamException("value", val.toString(),
+ throw new InvalidParamException("value", val.toString(),
getPropertyName(), ac);
}
}
-
+
public CssMarginSide(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return value;
}
-
+
/**
* Returns the internal CssValue value.
*/
public CssValue getValue() {
return value;
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -99,32 +99,32 @@
public boolean isSoftlyInherited() {
return value == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
- public String toString() {
+ public String toString() {
return value.toString();
}
-
+
/**
* Compares two sides for equality.
*
* @param side The other side.
- */
+ */
public boolean equals(CssMarginSide side) {
return value.equals(side.value);
}
-
+
/**
* Is this property contains a default value.
- */
+ */
public boolean isDefault() {
if (value != auto)
return ((Float) value.get()).floatValue() == 0;
else
return false;
}
-
+
private static CssIdent auto = new CssIdent("auto");
}
Index: CssVerticalAlignMob.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssVerticalAlignMob.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssVerticalAlignMob.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssVerticalAlignMob.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -90,38 +90,38 @@
*
* @version $Revision$
*/
-public class CssVerticalAlignMob extends CssProperty
+public class CssVerticalAlignMob extends CssProperty
implements CssTextPropertiesConstants {
-
+
Object value;
-
+
private static int[] hash_values;
-
+
/**
* Create a new CssVerticalAlignMob
*/
public CssVerticalAlignMob() {
value = VERTICALALIGNMOB[0];
}
-
+
/**
* Create a new CssVerticalAlign
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssVerticalAlignMob(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
int hash = val.hashCode();
-
+
setByUser();
-
+
if (val instanceof CssIdent) {
for (int i = 0; i < VERTICALALIGNMOB.length; i++)
if (hash_values[i] == hash) {
@@ -129,7 +129,7 @@
expression.next();
return;
}
- throw new InvalidParamException("value",
+ throw new InvalidParamException("value",
val.toString(), getPropertyName(), ac);
} else if (val instanceof CssPercentage) {
value = val;
@@ -141,37 +141,37 @@
value = ((CssNumber) val).getLength();
expression.next();
} else {
- throw new InvalidParamException("value",
+ throw new InvalidParamException("value",
val.toString(), getPropertyName(), ac);
}
}
-
+
public CssVerticalAlignMob(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return value;
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "vertical-align";
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -183,13 +183,13 @@
style0.addRedefinitionWarning(ac, this);
style0.cssVerticalAlignMob = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getVerticalAlignMob();
@@ -197,24 +197,24 @@
return ((Css1Style) style).cssVerticalAlignMob;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
return (property instanceof CssVerticalAlignMob && value.equals(((CssVerticalAlignMob) property).value));
}
-
+
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
- */
+ */
public boolean isDefault() {
return value.equals(VERTICALALIGNMOB[0]);
}
-
+
static {
hash_values = new int[VERTICALALIGNMOB.length];
for (int i=0; i<VERTICALALIGNMOB.length; i++)
Index: CssBorderLeftCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderLeftCSS2.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorderLeftCSS2.java 8 Sep 2005 12:23:33 -0000 1.3
+++ CssBorderLeftCSS2.java 14 Sep 2005 15:14:31 -0000 1.4
@@ -49,64 +49,64 @@
* @version $Revision$
*/
public class CssBorderLeftCSS2 extends CssProperty implements CssOperator {
-
+
CssBorderLeftWidthCSS2 width;
CssBorderLeftStyleCSS2 style;
CssBorderLeftColorCSS2 color;
-
+
/**
* Create a new CssBorderLeftCSS2
*/
public CssBorderLeftCSS2() {
- }
-
+ }
+
/**
* Create a new CssBorderLeftCSS2
*
* @param expression The expression for this property
* @exception InvalidParamException The expression is incorrect
- */
+ */
public CssBorderLeftCSS2(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 CssBorderLeftWidthCSS2(ac, expression);
+ width = new CssBorderLeftWidthCSS2(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 CssBorderLeftStyleCSS2(ac, expression);
+ style = new CssBorderLeftStyleCSS2(ac, expression);
find = true;
} catch(InvalidParamException e){
// nothing to do, color will test this value
@@ -115,7 +115,7 @@
if (!find && color == null) {
// throws an exception if the value is not valid
color = new CssBorderLeftColorCSS2(ac, expression);
- find = true;
+ find = true;
}
}
/*
@@ -124,19 +124,19 @@
width = new CssBorderLeftWidthCSS2();
}
if (style == null) {
- style = new CssBorderLeftStyleCSS2();
- }
+ style = new CssBorderLeftStyleCSS2();
+ }
if (color == null) {
- color = new CssBorderLeftColorCSS2();
+ color = new CssBorderLeftColorCSS2();
}
*/
}
-
- public CssBorderLeftCSS2(ApplContext ac, CssExpression expression)
+
+ public CssBorderLeftCSS2(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* @param color The color to set.
*/
@@ -164,7 +164,7 @@
public Object get() {
return width;
}
-
+
/**
* Returns the color property
*/
@@ -175,7 +175,7 @@
return null;
}
}
-
+
/**
* Returns the width property
*/
@@ -186,7 +186,7 @@
return null;
}
}
-
+
/**
* Returns the style property
*/
@@ -197,7 +197,7 @@
return null;
}
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -220,18 +220,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.important = true;
@@ -243,7 +243,7 @@
color.important = true;
}
}
-
+
/**
* Returns true if this property is important.
* Overrides this method for a macro
@@ -253,14 +253,14 @@
(style == null || style.important) &&
(color == null || color.important));
}
-
+
/**
* Print this property.
*
* @param printer The printer.
* @see #toString()
* @see #getPropertyName()
- */
+ */
public void print(CssPrinterStyle printer) {
if ((width != null && style != null &&
color != null) &&
@@ -277,9 +277,9 @@
if (color != null)
color.print(printer);
}
-
+
}
-
+
/**
* Set the context.
* Overrides this method for a macro
@@ -299,13 +299,13 @@
color.setSelectors(selector);
}
}
-
+
/**
* Add this property to the CssStyle
*
* @param style The CssStyle
*/
- public void addToStyle(ApplContext ac, CssStyle style) {
+ public void addToStyle(ApplContext ac, CssStyle style) {
if(width != null) {
width.addToStyle(ac, style);
}
@@ -316,13 +316,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 ((Css1Style) style).getBorderLeftCSS2();
@@ -330,16 +330,16 @@
return ((Css1Style) style).cssBorderCSS2.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);
}
@@ -350,25 +350,25 @@
color.setInfo(line, source);
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
if (property instanceof CssBorderLeftCSS2) {
CssBorderLeftCSS2 left = (CssBorderLeftCSS2) property;
- return (width != null && width.equals(left.width) &&
+ return (width != null && width.equals(left.width) &&
style != null && style.equals(left.style) &&
color != null && 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: CssBorderRightCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderRightCSS1.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderRightCSS1.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorderRightCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -49,50 +49,50 @@
* @version $Revision$
*/
public class CssBorderRightCSS1 extends CssProperty implements CssOperator {
-
+
CssBorderRightWidthCSS1 width;
CssBorderRightStyleCSS1 style;
CssBorderRightColorCSS1 color;
-
+
/**
* Create a new CssBorderFaceCSS1
*/
public CssBorderRightCSS1() {
- }
-
+ }
+
/**
* Create a new CssBorderFaceCSS1
*
* @param expression The expression for this property
* @param check true will test the number of parameters
* @exception InvalidParamException The expression is incorrect
- */
+ */
public CssBorderRightCSS1(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);
}
-
+
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 CssBorderRightWidthCSS1(ac, expression);
@@ -124,26 +124,26 @@
color = new CssBorderRightColorCSS1();
*/
}
-
+
/**
* Create a new CssBorderFaceCSS1
*
* @param expression The expression for this property
* @param check true will test the number of parameters
* @exception InvalidParamException The expression is incorrect
- */
+ */
public CssBorderRightCSS1(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
*/
@@ -154,7 +154,7 @@
return null;
}
}
-
+
/**
* Returns the width property
*/
@@ -165,7 +165,7 @@
return null;
}
}
-
+
/**
* Returns the style property
*/
@@ -176,7 +176,7 @@
return null;
}
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -199,18 +199,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.important = true;
@@ -222,7 +222,7 @@
color.important = true;
}
}
-
+
/**
* Returns true if this property is important.
* Overrides this method for a macro
@@ -232,14 +232,14 @@
(style == null || style.important) &&
(color == null || color.important));
}
-
+
/**
* Print this property.
*
* @param printer The printer.
* @see #toString()
* @see #getPropertyName()
- */
+ */
public void print(CssPrinterStyle printer) {
if ((width != null && style != null &&
color != null) &&
@@ -256,15 +256,15 @@
if (color != null)
color.print(printer);
}
-
+
}
-
+
/**
* Add this property to the CssStyle
*
* @param style The CssStyle
*/
- public void addToStyle(ApplContext ac, CssStyle style) {
+ public void addToStyle(ApplContext ac, CssStyle style) {
if(width != null) {
width.addToStyle(ac, style);
}
@@ -275,13 +275,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 ((Css1Style) style).getBorderRightCSS1();
@@ -289,16 +289,16 @@
return ((Css1Style) style).cssBorderCSS1.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);
}
@@ -309,7 +309,7 @@
color.setInfo(line, source);
}
}
-
+
/**
* Set the context.
* Overrides this method for a macro
@@ -329,25 +329,25 @@
color.setSelectors(selector);
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
if (property instanceof CssBorderRightCSS1) {
CssBorderRightCSS1 right = (CssBorderRightCSS1) property;
- return (width != null && width.equals(right.width) &&
- style != null && style.equals(right.style) &&
+ return (width != null && width.equals(right.width) &&
+ style != null && style.equals(right.style) &&
color != null && 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: CssMaxHeightATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssMaxHeightATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssMaxHeightATSC.java 23 Aug 2005 16:23:12 -0000 1.1
+++ CssMaxHeightATSC.java 14 Sep 2005 15:14:31 -0000 1.2
@@ -21,35 +21,35 @@
/**
*/
public class CssMaxHeightATSC extends CssProperty {
-
+
CssValue value;
-
+
private static CssIdent none = new CssIdent("none");
-
+
/**
* Create a new CssMaxHeightATSC
*/
public CssMaxHeightATSC() {
value = none;
- }
-
+ }
+
/**
* Create a new CssMaxHeightATSC
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssMaxHeightATSC(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
-
+
setByUser();
-
+
ac.getFrame().addWarning("atsc", val.toString());
if (val.equals(inherit)) {
@@ -57,7 +57,7 @@
} else if (val instanceof CssLength || val instanceof CssPercentage) {
float f = ((Float) val.get()).floatValue();
if (f < 0) {
- throw new InvalidParamException("negative-value",
+ throw new InvalidParamException("negative-value",
val.toString(), ac);
}
value = val;
@@ -66,32 +66,32 @@
} else if (val instanceof CssNumber) {
value = ((CssNumber) val).getLength();
} else {
- throw new InvalidParamException("value", expression.getValue(),
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
-
+
expression.next();
}
-
+
public CssMaxHeightATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property.
*/
public Object get() {
return value;
}
-
+
/**
* Returns the name of this property.
- */
+ */
public String getPropertyName() {
return "max-height";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -99,15 +99,15 @@
public boolean isSoftlyInherited() {
return value == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
-
+
+
/**
* Add this property to the CssStyle.
*
@@ -119,13 +119,13 @@
style0.addRedefinitionWarning(ac, this);
style0.cssMaxHeightATSC = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getMaxHeightATSC();
@@ -133,23 +133,23 @@
return ((Css1Style) style).cssMaxHeightATSC;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssMaxHeightATSC
+ return (property instanceof CssMaxHeightATSC
&& value.equals(((CssMaxHeightATSC) property).value));
}
-
+
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
- */
+ */
public boolean isDefault() {
return value == none;
}
-
+
}
Index: CssFontStretchCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssFontStretchCSS1.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssFontStretchCSS1.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssFontStretchCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -15,35 +15,35 @@
/**
*
* @see CssFont
- * @version $Revision$
+ * @version $Revision$
*/
public class CssFontStretchCSS1 extends CssProperty implements CssFontConstantCSS1 {
-
+
int value;
-
+
private static int[] hash_values;
-
+
/**
* Create a new CssFontStretch
*/
public CssFontStretchCSS1() {
// nothing to do
}
-
+
/**
* Creates a new CssFontStretch
*
* @param expression the font stretch
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssFontStretchCSS1(ApplContext ac, CssExpression expression,
- boolean check)
+ boolean check)
throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
if (expression.getValue() instanceof CssIdent) {
int hash = expression.getValue().hashCode();
@@ -54,23 +54,23 @@
return;
}
}
-
- throw new InvalidParamException("value", expression.getValue(),
+
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
-
+
public CssFontStretchCSS1(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value
- */
+ */
public Object get() {
return FONTSTRETCH[value];
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -78,21 +78,21 @@
public boolean isSoftlyInherited() {
return value == FONTSTRETCH.length - 1;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return FONTSTRETCH[value];
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "font-stretch";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -104,13 +104,13 @@
style0.addRedefinitionWarning(ac, this);
style0.cssFontStretchCSS1 = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getFontStretchCSS1();
@@ -118,25 +118,25 @@
return ((Css1Style) style).cssFontStretchCSS1;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssFontStretchCSS1 &&
+ return (property instanceof CssFontStretchCSS1 &&
((CssFontStretchCSS1) property).value == value);
}
-
+
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
- */
+ */
public boolean isDefault() {
return value == 0;
}
-
+
static {
hash_values = new int[FONTSTRETCH.length];
for (int i=0;i<FONTSTRETCH.length;i++)
Index: CssBorderBottomCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderBottomCSS1.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderBottomCSS1.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorderBottomCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -49,48 +49,48 @@
* @version $Revision$
*/
public class CssBorderBottomCSS1 extends CssProperty implements CssOperator {
-
+
CssBorderBottomWidthCSS1 width;
CssBorderBottomStyleCSS1 style;
CssBorderBottomColorCSS1 color;
-
+
/**
* Create a new CssBorderFaceCSS1
*/
public CssBorderBottomCSS1() {
- }
-
+ }
+
/**
* Create a new CssBorderFace
* @param expression The expression for this property
* @exception InvalidParamException The expression is incorrect
- */
+ */
public CssBorderBottomCSS1(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);
}
-
+
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 CssBorderBottomWidthCSS1(ac, expression);
@@ -122,19 +122,19 @@
color = new CssBorderBottomColorCSS1();
*/
}
-
- public CssBorderBottomCSS1(ApplContext ac, CssExpression expression)
+
+ public CssBorderBottomCSS1(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-bottom";
}
-
+
/**
* Set this property to be important.
* Overrides this method for a macro
- */
+ */
public void setImportant() {
if(width != null) {
width.important = true;
@@ -213,7 +213,7 @@
color.important = true;
}
}
-
+
/**
* Returns true if this property is important.
* Overrides this method for a macro
@@ -223,14 +223,14 @@
(style == null || style.important) &&
(color == null || color.important));
}
-
+
/**
* Print this property.
*
* @param printer The printer.
* @see #toString()
* @see #getPropertyName()
- */
+ */
public void print(CssPrinterStyle printer) {
if ((width != null && style != null &&
color != null) &&
@@ -247,15 +247,15 @@
if (color != null)
color.print(printer);
}
-
+
}
-
+
/**
* Add this property to the CssStyle
*
* @param style The CssStyle
*/
- public void addToStyle(ApplContext ac, CssStyle style) {
+ public void addToStyle(ApplContext ac, CssStyle style) {
if(width != null) {
width.addToStyle(ac, style);
}
@@ -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 ((Css1Style) style).getBorderBottomCSS1();
@@ -280,16 +280,16 @@
return ((Css1Style) style).cssBorderCSS1.getBottom();
}
}
-
+
/**
* 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,25 +320,25 @@
color.setSelectors(selector);
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
if (property instanceof CssBorderBottomCSS1) {
CssBorderBottomCSS1 bottom = (CssBorderBottomCSS1) property;
return (width != null && width.equals(bottom.width) &&
- style != null && style.equals(bottom.style) &&
+ style != null && style.equals(bottom.style) &&
color != null && 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: CssTextTransform.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssTextTransform.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssTextTransform.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssTextTransform.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -58,31 +58,31 @@
*
* @version $Revision$
*/
-public class CssTextTransform extends CssProperty
+public class CssTextTransform extends CssProperty
implements CssTextPropertiesConstants {
-
+
/**
* Create a new CssTextTransform
*/
public CssTextTransform() {
- }
-
+ }
+
/**
* Create a new CssTextTransform
*
* @param expression The expression for this property
* @exception InvalidParamException The value is incorrect
- */
+ */
public CssTextTransform(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
int hash = val.hashCode();
-
+
if (val instanceof CssIdent) {
for (int i = 0; i < TEXTTRANSFORM.length; i++) {
if (hash_values[i] == hash) {
@@ -94,26 +94,26 @@
}
throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
}
-
+
public CssTextTransform(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return TEXTTRANSFORM[value];
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "text-transform";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -121,14 +121,14 @@
public boolean isSoftlyInherited() {
return value == (TEXTTRANSFORM.length - 1);
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return TEXTTRANSFORM[value];
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -140,13 +140,13 @@
style0.addRedefinitionWarning(ac, this);
style0.cssTextTransform = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getTextTransform();
@@ -154,21 +154,21 @@
return ((Css1Style) style).cssTextTransform;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssTextTransform &&
+ return (property instanceof CssTextTransform &&
value == ((CssTextTransform) property).value);
}
-
+
private int value;
-
+
private static int[] hash_values;
-
+
static {
hash_values = new int[TEXTTRANSFORM.length];
for (int i=0; i<TEXTTRANSFORM.length; i++)
Index: CssFontFamilyCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssFontFamilyCSS2.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssFontFamilyCSS2.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssFontFamilyCSS2.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -20,7 +20,7 @@
import org.w3c.css.values.CssString;
import org.w3c.css.values.CssValue;
-/**
+/**
* <H4>
* 'font-family'
* </H4>
@@ -75,29 +75,29 @@
* If quoting is omitted, any whitespace characters before and after the font
* name are ignored and any sequence of whitespace characters inside the font
* name is converted to a single space.
- *
+ *
* @see CssFont
- * @version $Revision$
+ * @version $Revision$
*/
public class CssFontFamilyCSS2 extends CssProperty implements CssOperator {
-
+
Vector family_name = new Vector();
boolean inheritedValue;
static String[] genericFamily = { "serif", "sans-serif", "cursive",
"fantasy", "monospace" };
-
+
static int[] genericFamilyHash;
-
+
boolean withSpace = false;
/**
* Create a new CssFontFamilyCSS2
*/
public CssFontFamilyCSS2() {
- }
-
+ }
+
/**
* Create a new CssFontFamilyCSS2
*
@@ -105,17 +105,17 @@
* @exception InvalidParamException The expression is incorrect
*/
public CssFontFamilyCSS2(ApplContext ac, CssExpression expression,
- boolean check)
+ boolean check)
throws InvalidParamException {
boolean family = true;
CssValue val = expression.getValue();
char op;
-
+
boolean manyValues = expression.getCount() > 1;
-
+
setByUser();
//@@ and if name is already in the vector ?
-
+
if (val.equals(inherit)) {
if(expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
@@ -125,20 +125,20 @@
return;
}
- while (family) {
+ while (family) {
val = expression.getValue();
op = expression.getOperator();
if(manyValues && val != null && val.equals(inherit)) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
if ((op != COMMA) && (op != SPACE)) {
- throw new InvalidParamException("operator",
+ throw new InvalidParamException("operator",
((new Character(op)).toString()), ac);
}
-
- if (val instanceof CssString) {
+
+ if (val instanceof CssString) {
String familyName = null;
if (op == COMMA) { // "helvetica", "roman"
familyName = trimToOneSpace(val.toString());
@@ -160,13 +160,13 @@
}
family_name.addElement(familyName);
} else if (val instanceof CssIdent) {
-
+
if (op == COMMA) {
family_name.addElement(convertString(val.toString()));
expression.next();
} else {
CssValue next = expression.getNextValue();
- if (next != null) {
+ if (next != null) {
CssIdent New = new CssIdent(val.get() + " " + next.get());
withSpace = true;
expression.remove();
@@ -174,7 +174,7 @@
expression.remove();
expression.insert(New);
expression.setCurrentOperator(op);
- } else {
+ } else {
family_name.addElement(convertString(val.toString()));
expression.next();
family = false;
@@ -183,45 +183,45 @@
} else {
throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
- }
+ }
}
if(check && !expression.end()) {
throw new InvalidParamException("unrecognize", ac);
}
if (!containsGenericFamily()) {
ac.getFrame().addWarning("no-generic-family", "font-family");
- }
+ }
}
-
+
public CssFontFamilyCSS2(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns all fonts name
- */
+ */
public Enumeration elements() {
return family_name.elements();
}
-
+
/**
* Returns the size
*/
public int size() {
return family_name.size();
}
-
+
/**
* Returns the font (null if no font)
- */
+ */
public Object get() {
if (family_name.size() == 0) {
return null;
}
return family_name.firstElement();
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -229,11 +229,11 @@
public boolean isSoftlyInherited() {
return inheritedValue;
}
-
+
/**
* Returns a string representation of the object.
*/
- public String toString() {
+ public String toString() {
if (inheritedValue) {
return inherit.toString();
} else {
@@ -247,12 +247,12 @@
return r.substring(2);
}
}
-
+
String convertString (String value) {
if (value.indexOf('"') != -1) {
return '\'' + value + '\'';
} else if (value.indexOf('\'') != -1) {
- return '"' + value + '"';
+ return '"' + value + '"';
} else {
return value;
}
@@ -260,11 +260,11 @@
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "font-family";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -277,13 +277,13 @@
style.addRedefinitionWarning(ac, this);
cssFont.fontFamily = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getFontFamilyCSS2();
@@ -291,40 +291,40 @@
return ((Css1Style) style).cssFontCSS2.fontFamily;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
return false; //@@ FIXME
}
-
+
private static String trimToOneSpace(String name) {
int count = name.length();
char[] dst = new char[count];
char[] src = new char[count];
int index = -1;
-
+
name.getChars(0, count, src, 0);
for(int i=0; i < count; i++)
- if ( i == 0 || ! Util.isWhiteSpace(src[i]) ||
- ( Util.isWhiteSpace(src[i]) &&
+ if ( i == 0 || ! Util.isWhiteSpace(src[i]) ||
+ ( Util.isWhiteSpace(src[i]) &&
!Util.isWhiteSpace(dst[index]) ) )
dst[++index] = src[i];
-
+
return new String(dst, 0, index+1);
}
-
+
/**
* Returns true if this property contains a generic family name
- */
+ */
public boolean containsGenericFamily() {
if (family_name.size() == 0) {
return true;
} else {
- for (Enumeration e = family_name.elements();
+ for (Enumeration e = family_name.elements();
e.hasMoreElements();) {
int hash = ((String) e.nextElement()).toLowerCase().hashCode();
for (int i = 0; i < genericFamilyHash.length; i++) {
@@ -335,8 +335,8 @@
return false;
}
}
-
-
+
+
static {
genericFamilyHash = new int[genericFamily.length];
for (int i = 0; i < genericFamily.length; i++) {
Index: CssBorderCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderCSS1.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderCSS1.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorderCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -18,12 +18,12 @@
* @version $Revision$
*/
public class CssBorderCSS1 extends CssProperty {
-
+
CssBorderTopCSS1 top;
CssBorderRightCSS1 right;
CssBorderBottomCSS1 bottom;
CssBorderLeftCSS1 left;
-
+
/**
* Create a new CssBorderFaceCSS1
*/
@@ -32,73 +32,73 @@
right = new CssBorderRightCSS1();
bottom = new CssBorderBottomCSS1();
left = new CssBorderLeftCSS1();
- }
-
+ }
+
/**
* Create a new CssBorderFaceCSS1
*
* @param value The value for this property
* @exception InvalidParamException The value is incorrect
- */
+ */
public CssBorderCSS1(ApplContext ac, CssExpression value,
boolean check) throws InvalidParamException {
CssValue val = value.getValue();
-
+
// too many values
if(check && value.getCount() > 3) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
-
-
+
+
top = new CssBorderTopCSS1(ac, value);
if (val == value.getValue()) {
- throw new InvalidParamException("value",
- value.getValue(),
+ throw new InvalidParamException("value",
+ value.getValue(),
getPropertyName(), ac);
}
-
+
right = new CssBorderRightCSS1();
bottom = new CssBorderBottomCSS1();
left = new CssBorderLeftCSS1();
CssBorderTopWidthCSS1 w = top.width;
CssBorderTopStyleCSS1 s = top.style;
- CssBorderTopColorCSS1 c = top.color;
-
- if(w != null) {
- right.width =
- new CssBorderRightWidthCSS1((CssBorderFaceWidthCSS1) w.get());
- left.width =
- new CssBorderLeftWidthCSS1((CssBorderFaceWidthCSS1) w.get());
- bottom.width =
- new CssBorderBottomWidthCSS1((CssBorderFaceWidthCSS1) w.get());
- }
+ CssBorderTopColorCSS1 c = top.color;
+
+ if(w != null) {
+ right.width =
+ new CssBorderRightWidthCSS1((CssBorderFaceWidthCSS1) w.get());
+ left.width =
+ new CssBorderLeftWidthCSS1((CssBorderFaceWidthCSS1) w.get());
+ bottom.width =
+ new CssBorderBottomWidthCSS1((CssBorderFaceWidthCSS1) w.get());
+ }
if(s != null) {
- right.style =
+ right.style =
new CssBorderRightStyleCSS1((CssBorderFaceStyleCSS1) s.get());
- left.style =
+ left.style =
new CssBorderLeftStyleCSS1((CssBorderFaceStyleCSS1) s.get());
- bottom.style =
+ bottom.style =
new CssBorderBottomStyleCSS1((CssBorderFaceStyleCSS1) s.get());
- }
+ }
if(c != null) {
- right.color =
+ right.color =
new CssBorderRightColorCSS1((CssBorderFaceColorCSS1) c.get());
- left.color =
+ left.color =
new CssBorderLeftColorCSS1((CssBorderFaceColorCSS1) c.get());
- bottom.color =
+ bottom.color =
new CssBorderBottomColorCSS1((CssBorderFaceColorCSS1) c.get());
- }
+ }
}
-
+
public CssBorderCSS1(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
@@ -108,35 +108,35 @@
}
return null;
}
-
+
/**
* Returns the top property
*/
public CssBorderTopCSS1 getTop() {
return top;
}
-
+
/**
* Returns the right property
*/
public CssBorderRightCSS1 getRight() {
return right;
}
-
+
/**
* Returns the bottom property
*/
public CssBorderBottomCSS1 getBottom() {
return bottom;
}
-
+
/**
* Returns the left property
*/
public CssBorderLeftCSS1 getLeft() {
return left;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -146,22 +146,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();
@@ -176,7 +176,7 @@
bottom.setImportant();
}
}
-
+
/**
* Returns true if this property is important.
* Overrides this method for a macro
@@ -187,24 +187,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.important && bottom.width.important &&
+ ((top.width.important && bottom.width.important &&
right.width.important && left.width.important) ||
- (!top.width.important && !bottom.width.important &&
+ (!top.width.important && !bottom.width.important &&
!right.width.important && !left.width.important))) {
- CssBorderWidthCSS1 width = new CssBorderWidthCSS1(top.width, bottom.width,
+ CssBorderWidthCSS1 width = new CssBorderWidthCSS1(top.width, bottom.width,
right.width, left.width);
if (top.important) {
width.setImportant();
@@ -214,11 +214,11 @@
}
if ((top.style != null && bottom.style != null &&
right.style != null && left.style != null) &&
- ((top.style.important && bottom.style.important &&
+ ((top.style.important && bottom.style.important &&
right.style.important && left.style.important) ||
- (!top.style.important && !bottom.style.important &&
+ (!top.style.important && !bottom.style.important &&
!right.style.important && !left.style.important))) {
- CssBorderStyleCSS1 style = new CssBorderStyleCSS1(top.style, bottom.style,
+ CssBorderStyleCSS1 style = new CssBorderStyleCSS1(top.style, bottom.style,
right.style, left.style);
if (top.important) {
style.setImportant();
@@ -228,11 +228,11 @@
}
if ((top.color != null && bottom.color != null &&
right.color != null && left.color != null) &&
- ((top.color.important && bottom.color.important &&
+ ((top.color.important && bottom.color.important &&
right.color.important && left.color.important) ||
- (!top.color.important && !bottom.color.important &&
+ (!top.color.important && !bottom.color.important &&
!right.color.important && !left.color.important))) {
- CssBorderColorCSS1 color = new CssBorderColorCSS1(top.color, bottom.color,
+ CssBorderColorCSS1 color = new CssBorderColorCSS1(top.color, bottom.color,
right.color, left.color);
if (top.important) {
color.setImportant();
@@ -240,7 +240,7 @@
printMacro |= 4;
color.print(printer);
}
-
+
if (printMacro == 0) {
top.print(printer);
right.print(printer);
@@ -252,7 +252,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);
@@ -266,9 +266,9 @@
if (left.color != null) left.color.print(printer);
}
}
-
+
}
-
+
/**
* Set the context.
* Overrides this method for a macro
@@ -291,7 +291,7 @@
left.setSelectors(selector);
}
}
-
+
/**
* Add this property to the CssStyle
*
@@ -311,13 +311,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 ((Css1Style) style).getBorderCSS1();
@@ -325,14 +325,14 @@
return ((Css1Style) style).cssBorderCSS1;
}
}
-
+
/**
* 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,7 +348,7 @@
bottom.setInfo(line, source);
}
}
-
+
void check() {
if(top != null) {
top.check();
Index: CssBorderBottomStyleCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderBottomStyleCSS2.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderBottomStyleCSS2.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorderBottomStyleCSS2.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -18,14 +18,14 @@
public class CssBorderBottomStyleCSS2 extends CssProperty {
CssBorderFaceStyleCSS2 face;
-
+
/**
* Create a new CssBorderBottomStyleCSS2
*/
public CssBorderBottomStyleCSS2() {
face = new CssBorderFaceStyleCSS2();
}
-
+
/**
* Create a new CssBorderBottomStyleCSS2 with an another CssBorderFaceStyleCSS2
* @param another The another side.
@@ -35,7 +35,7 @@
face = another;
}
-
+
/**
* Create a new CssBorderBottomStyle eith an expression
*
@@ -44,7 +44,7 @@
*/
public CssBorderBottomStyleCSS2(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
@@ -52,12 +52,12 @@
setByUser();
face = new CssBorderFaceStyleCSS2(ac, expression);
}
-
- public CssBorderBottomStyleCSS2(ApplContext ac, CssExpression expression)
+
+ public CssBorderBottomStyleCSS2(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
@@ -87,7 +87,7 @@
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "border-bottom-style";
}
@@ -109,7 +109,7 @@
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getBorderBottomStyleCSS2();
@@ -122,7 +122,7 @@
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
return (property instanceof CssBorderBottomStyleCSS2 && face.equals(((CssBorderBottomStyleCSS2) property).face));
}
Index: CssFontStyleCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssFontStyleCSS2.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssFontStyleCSS2.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssFontStyleCSS2.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -42,32 +42,32 @@
* In the example above, emphasized text within 'H1' will appear in a normal
* face.
*
- * @version $Revision$
+ * @version $Revision$
*/
public class CssFontStyleCSS2 extends CssProperty implements CssFontConstantCSS2 {
-
+
int value;
-
+
/**
* Create a new CssFontStyleCSS2
*/
public CssFontStyleCSS2() {
// nothing to do
}
-
+
/**
* Creates a new CssFontStyleCSS2
*
* @param expression the font style
* @exception InvalidParamException values are incorrect
- */
+ */
public CssFontStyleCSS2(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
if (expression.getValue() instanceof CssIdent) {
int hash = ((CssIdent) expression.getValue()).hashCode();
@@ -78,23 +78,23 @@
return;
}
}
-
- throw new InvalidParamException("value", expression.getValue(),
+
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
-
+
public CssFontStyleCSS2(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value
- */
+ */
public Object get() {
return FONTSTYLE[value];
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -102,21 +102,21 @@
public boolean isSoftlyInherited() {
return value == FONTSTYLE.length - 1;
}
-
+
/**
* Returns a string representation of the object.
*/
- public String toString() {
+ public String toString() {
return FONTSTYLE[value];
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "font-style";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -128,13 +128,13 @@
style.addRedefinitionWarning(ac, this);
cssFont.fontStyle = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getFontStyleCSS2();
@@ -142,27 +142,27 @@
return ((Css1Style) style).cssFontCSS2.fontStyle;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssFontStyleCSS2 &&
+ return (property instanceof CssFontStyleCSS2 &&
((CssFontStyleCSS2) property).value == value);
}
-
+
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
- */
+ */
public boolean isDefault() {
return value == 0;
}
-
+
private static int[] hash_values;
-
+
static {
hash_values = new int[FONTSTYLE.length];
for (int i=0; i<FONTSTYLE.length; i++)
Index: CssBorderFaceStyleCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderFaceStyleCSS2.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderFaceStyleCSS2.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorderFaceStyleCSS2.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -16,22 +16,22 @@
* @version $Revision$
*/
public class CssBorderFaceStyleCSS2 {
-
+
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 CssBorderFaceStyleCSS2
*/
public CssBorderFaceStyleCSS2() {
// nothing to do
- }
-
+ }
+
/**
* Create a new CssBorderFaceStyleCSS2 with an another CssBorderFaceStyle
*
@@ -40,22 +40,22 @@
public CssBorderFaceStyleCSS2(CssBorderFaceStyleCSS2 another) {
value = another.value;
}
-
+
/**
* Create a new CssBorderFaceStyleCSS2
*
* @param expression The expression for this face
* @exception InvalidParamException The expression is incorrect
- */
+ */
public CssBorderFaceStyleCSS2(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++)
@@ -65,15 +65,15 @@
return;
}
}
-
+
throw new InvalidParamException("value", val.toString(), "style", ac);
}
-
+
public CssBorderFaceStyleCSS2(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression,false);
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -81,34 +81,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(CssBorderFaceStyleCSS2 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: CssFloat.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssFloat.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssFloat.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssFloat.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -23,7 +23,7 @@
* <EM>Applies to:</EM> all elements<BR>
* <EM>Inherited:</EM> no<BR>
* <EM>Percentage values:</EM> N/A<BR>
-
+
* <P> With the value 'none', the element will be displayed where it appears
* in the text. With a value of 'left' ('right') the element will be moved to
* the left ('right') and the text will wrap on the right (left) side of the
@@ -33,7 +33,7 @@
* <H3>
* Floating elements
* </H3>
-
+
* <P> Using the <A HREF="#float">'float'</A> property, an element can be
* declared to be outside the normal flow of elements and is then formatted as
* a block-level element. For example, by setting the 'float' property of an
@@ -42,47 +42,47 @@
* wrap around on the right side. The margins, borders and padding of the
* element itself will be honored, and the margins never collapse with the
* margins of adjacent elements.
-
+
* <P> A floating element is positioned subject to the following constraints:
-
+
* <OL>
-
+
* <LI> The left outer edge of a left-floating element may not be to the
* left of the left inner edge of its parent element. Analogously for right
* floating elements.
-
+
* <LI> The left outer edge of a left floating element must be to the right
* of the right outer edge of every earlier (in the HTML source)
* left-floating element or the top of the former must be lower than the
* bottom of the latter. Analogously for right floating elements.
-
+
* <LI> The right outer edge of a left-floating element may not be to the
* right of the left outer edge of any right-floating element that is to the
* right of it. Analogously for right-floating elements.
-
+
* <LI> A floating element's top may not be higher than the inner top of its
* parent.
-
+
* <LI> A floating element's top may not be higher than the top of any
* earlier floating or block-level element.
-
+
* <LI> A floating element's top may not be higher than the top of any
* <EM>line-box</EM> (see section 4.4) with content that precedes the
* floating element in the HTML source.
-
+
* <LI> A floating element must be placed as high as possible.
-
+
* <LI> A left-floating element must be put as far to the left as possible,
* a right-floating element as far to the right as possible. A higher
* position is preferred over one that is further to the left/right.
-
+
* </OL>
* <PRE>
* <STYLE TYPE="text/css">
* IMG { float: left }
* BODY, P, IMG { margin: 2em }
* </STYLE>
-
+
* <BODY>
* <P>
* <IMG SRC=img.gif>
@@ -98,7 +98,7 @@
* | ______________________________
* | | | Some sample text
* | B | P | IMG margins that has no other
- * | O | | _____ purpose than to
+ * | O | | _____ purpose than to
* | D | m | | | show how floating
* | Y | a | | IMG | elements are moved
* | | r | | | to the side of the
@@ -106,7 +106,7 @@
* | a | i | while honoring
* | r | n | margins, borders
* | g | | and padding. Note
- * | i | |how adjacent vertical margins
+ * | i | |how adjacent vertical margins
* | n | |are collapsed between non-
* | | |floating block-level elements.
* </PRE>
@@ -121,35 +121,35 @@
* inside
* </UL>
*
- * @version $Revision$
+ * @version $Revision$
*/
public class CssFloat extends CssProperty {
-
+
int value;
-
+
private static String[] FLOAT = { "none", "left", "right", "inherit" };
private static int[] hash_values;
-
+
/**
* Create a new CssFloat
*/
public CssFloat() {
// nothing to do
- }
-
+ }
+
/**
* Create a new CssFloat
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssFloat(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) {
@@ -161,29 +161,29 @@
return;
}
}
- throw new InvalidParamException("value", expression.getValue(),
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
-
+
public CssFloat(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return FLOAT[value];
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "float";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -191,14 +191,14 @@
public boolean isSoftlyInherited() {
return value == FLOAT.length - 1;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return FLOAT[value];
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -210,13 +210,13 @@
style0.addRedefinitionWarning(ac, this);
style0.cssFloat = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getFloat();
@@ -224,25 +224,25 @@
return ((Css1Style) style).cssFloat;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssFloat &&
+ return (property instanceof CssFloat &&
value == ((CssFloat) property).value);
}
-
+
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
- */
+ */
public boolean isDefault() {
return value == 0;
}
-
+
static {
hash_values = new int[FLOAT.length];
for (int i = 0; i < FLOAT.length; i++)
Index: CssBackgroundPositionMob.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBackgroundPositionMob.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBackgroundPositionMob.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBackgroundPositionMob.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -47,7 +47,7 @@
* background image. Keywords cannot be combined with percentage values, or
* length values. The possible combinations of keywords and their
* interpretations are as follows:
-
+
* <UL>
* <LI>
* 'top left' and 'left top' both mean the same as '0% 0%'.
@@ -81,55 +81,55 @@
* 'background-attachment' property above), the image is placed relative to
* the canvas instead of the element. E.g.:
* <PRE>
- * BODY {
+ * BODY {
* background-image: url(logo.png);
* background-attachment: fixed;
* background-position: 100% 100%;
- * }
+ * }
* </PRE>
* <P>
* In the example above, the image is placed in the lower right corner of the
* canvas.
* @version $Revision$
- * @see CssBackgroundAttachment
+ * @see CssBackgroundAttachment
*/
-public class CssBackgroundPositionMob extends CssProperty
+public class CssBackgroundPositionMob extends CssProperty
implements CssBackgroundConstants, CssOperator {
-
+
CssValue horizontal;
CssValue vertical;
-
+
/**
* Create a new CssBackgroundPositionMob
*/
public CssBackgroundPositionMob() {
horizontal = DefaultValue0;
vertical = DefaultValue0;
- }
-
+ }
+
/**
* Creates a new CssBackgroundPositionMob
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssBackgroundPositionMob(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 2) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
CssValue val = expression.getValue();
char op = expression.getOperator();
int index;
-
+
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);
@@ -138,7 +138,7 @@
vertical = inherit;
expression.next();
return;
- } else if (val instanceof CssIdent
+ } else if (val instanceof CssIdent
&& (index=IndexOfIdent((String) val.get())) != INVALID) {
CssValue next = expression.getNextValue();
if(next.equals(inherit)) {
@@ -156,7 +156,7 @@
getPercentageFromIdent(index, INVALID);
}
}
- } else if (val instanceof CssLength ||
+ } else if (val instanceof CssLength ||
val instanceof CssPercentage || val instanceof CssNumber) {
if (val instanceof CssNumber) {
val = ((CssNumber) val).getLength();
@@ -167,7 +167,7 @@
if(val.equals(inherit)) {
throw new InvalidParamException("unrecognize", ac);
}
- if (val instanceof CssLength ||
+ if (val instanceof CssLength ||
val instanceof CssPercentage || val instanceof CssNumber) {
if (val instanceof CssNumber) {
val = ((CssNumber) val).getLength();
@@ -175,43 +175,43 @@
vertical = val;
expression.next();
} else if(val != null) {
- throw new InvalidParamException("value", expression.getValue(),
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
- }
+ }
} else {
- throw new InvalidParamException("value", expression.getValue(),
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
-
+
}
-
- public CssBackgroundPositionMob(ApplContext ac, CssExpression expression)
+
+ public CssBackgroundPositionMob(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return horizontal;
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "background-position";
}
-
+
/**
* Returns the horizontal value of the position
*/
public CssValue getHorizontalPosition() {
return horizontal;
}
-
+
/**
* Returns the vertical value of the position
*/
@@ -226,7 +226,7 @@
public boolean isSoftlyInherited() {
return horizontal == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -247,7 +247,7 @@
return ret;
}
}
-
+
private void getPercentageFromIdent(int first, int second) {
horizontal = DefaultValue50;
vertical = DefaultValue50;
@@ -260,7 +260,7 @@
if (first == POSITION_BOTTOM || second == POSITION_BOTTOM)
vertical = DefaultValue100;
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -272,13 +272,13 @@
style.addRedefinitionWarning(ac, this);
cssBackground.position = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getBackgroundPositionMob();
@@ -286,43 +286,43 @@
return ((Css1Style) style).cssBackgroundMob.position;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssBackgroundPositionMob &&
+ return (property instanceof CssBackgroundPositionMob &&
horizontal.equals(((CssBackgroundPositionMob) property).horizontal)
&& vertical.equals(((CssBackgroundPositionMob) property).vertical));
}
-
+
/**
* 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 horizontal != null && vertical != null &&
horizontal.equals(DefaultValue0) && vertical.equals(DefaultValue0);
}
-
+
private int IndexOfIdent(String ident) throws InvalidParamException {
int hash = ident.hashCode();
for (int i = 0; i < POSITION.length; i++)
if (hash_values[i] == hash)
return i;
-
+
return -1;
}
-
+
private static int[] hash_values;
-
+
private static int INVALID = -1;
private static CssPercentage DefaultValue0 = new CssPercentage(0);
private static CssPercentage DefaultValue50 = new CssPercentage(50);
private static CssPercentage DefaultValue100 = new CssPercentage(100);
-
+
static {
hash_values = new int[POSITION.length];
for (int i = 0; i < POSITION.length; i++)
Index: CssListStyleTypeCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssListStyleTypeCSS2.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssListStyleTypeCSS2.java 8 Sep 2005 12:23:34 -0000 1.3
+++ CssListStyleTypeCSS2.java 14 Sep 2005 15:14:31 -0000 1.4
@@ -33,36 +33,36 @@
* OL { list-style-type: lower-roman } /* i ii iii iv v etc. * /
* </PRE>
* @version $Revision$ */
-public class CssListStyleTypeCSS2 extends CssProperty
+public class CssListStyleTypeCSS2 extends CssProperty
implements CssListStyleConstants {
-
+
int value;
-
+
private static int[] hash_values;
-
+
/**
* Create a new CssListStyleTypeCSS2
*/
public CssListStyleTypeCSS2() {
// nothing to do
- }
-
+ }
+
/**
* Create a new CssListStyleTypeCSS2
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssListStyleTypeCSS2(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 < LISTSTYLETYPECSS2.length; i++)
@@ -72,15 +72,15 @@
return;
}
}
-
+
throw new InvalidParamException("value", val, getPropertyName(), ac);
}
-
+
public CssListStyleTypeCSS2(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* @return Returns the value.
*/
@@ -101,14 +101,14 @@
public Object get() {
return LISTSTYLETYPECSS2[value];
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "list-style-type";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -116,14 +116,14 @@
public boolean isSoftlyInherited() {
return value == (LISTSTYLETYPECSS2.length - 1);
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return LISTSTYLETYPECSS2[value];
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -135,13 +135,13 @@
style.addRedefinitionWarning(ac, this);
cssListStyle.listStyleType = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getListStyleTypeCSS2();
@@ -149,25 +149,25 @@
return ((Css1Style) style).cssListStyleCSS2.listStyleType;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssListStyleTypeCSS2 &&
+ return (property instanceof CssListStyleTypeCSS2 &&
((CssListStyleTypeCSS2) property).value == value);
}
-
+
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
- */
+ */
public boolean isDefault() {
return value == 0;
}
-
+
static {
hash_values = new int[LISTSTYLETYPECSS2.length];
for (int i = 0; i < LISTSTYLETYPECSS2.length; i++)
Index: CssBorderRightColorCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderRightColorCSS2.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorderRightColorCSS2.java 8 Sep 2005 12:23:34 -0000 1.3
+++ CssBorderRightColorCSS2.java 14 Sep 2005 15:14:31 -0000 1.4
@@ -18,28 +18,28 @@
* @version $Revision$
*/
public class CssBorderRightColorCSS2 extends CssProperty {
-
+
CssBorderFaceColorCSS2 face;
-
+
/**
* Create a new CssBorderRightColorCSS2
*/
public CssBorderRightColorCSS2() {
face = new CssBorderFaceColorCSS2();
}
-
+
/**
* Create a new CssBorderRightColorCSS2 with an another CssBorderFaceColorCSS2
*
* @param another The another side.
*/
public CssBorderRightColorCSS2(CssBorderFaceColorCSS2 another) {
-
+
setByUser();
-
+
face = another;
}
-
+
/**
* Create a new CssBorderRightColorCSS2
*
@@ -48,20 +48,20 @@
*/
public CssBorderRightColorCSS2(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
face = new CssBorderFaceColorCSS2(ac, expression);
}
-
+
public CssBorderRightColorCSS2(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression,false);
}
-
+
/**
* @return Returns the face.
*/
@@ -82,7 +82,7 @@
public Object get() {
return face;
}
-
+
/**
* Returns the color of this property
*/
@@ -92,7 +92,7 @@
}
return null;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -102,14 +102,14 @@
}
return "";
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "border-right-color";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -121,13 +121,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 ((Css1Style) style).getBorderRightColorCSS2();
@@ -135,22 +135,22 @@
return ((Css1Style) style).cssBorderCSS2.getRight().color;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssBorderRightColorCSS2 &&
+ return (property instanceof CssBorderRightColorCSS2 &&
face.equals(((CssBorderRightColorCSS2) property).face));
}
-
+
/**
* Print this property.
*
* @param printer The printer.
- */
+ */
public void print(CssPrinterStyle printer) {
if (!face.isDefault())
printer.print(this);
Index: CssListStylePositionCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssListStylePositionCSS2.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssListStylePositionCSS2.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssListStylePositionCSS2.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -28,35 +28,35 @@
* drawn with regard to the content. For a formatting example see
* @version $Revision$
*/
-public class CssListStylePositionCSS2 extends CssProperty
+public class CssListStylePositionCSS2 extends CssProperty
implements CssListStyleConstants {
-
+
int value;
-
+
/**
* Create a new CssListStylePositionCSS2
*/
public CssListStylePositionCSS2() {
// nothing to do
- }
-
+ }
+
/**
* Create a new CssListStylePositionCSS2
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssListStylePositionCSS2(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 < LISTSTYLEPOSITION.length; i++) {
@@ -69,26 +69,26 @@
}
throw new InvalidParamException("value", val, getPropertyName(), ac);
}
-
+
public CssListStylePositionCSS2(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return LISTSTYLEPOSITION[value];
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "list-style-position";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -96,14 +96,14 @@
public boolean isSoftlyInherited() {
return value == (LISTSTYLEPOSITION.length - 1);
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return LISTSTYLEPOSITION[value];
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -115,13 +115,13 @@
style.addRedefinitionWarning(ac, this);
cssListStyle.listStylePosition = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getListStylePositionCSS2();
@@ -129,27 +129,27 @@
return ((Css1Style) style).cssListStyleCSS2.listStylePosition;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssListStylePositionCSS2 &&
+ return (property instanceof CssListStylePositionCSS2 &&
((CssListStylePositionCSS2) property).value == value);
}
-
+
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
- */
+ */
public boolean isDefault() {
return value == 0;
}
-
+
private static int[] hash_values;
-
+
static {
hash_values = new int[LISTSTYLEPOSITION.length];
for (int i = 0; i < LISTSTYLEPOSITION.length; i++)
Index: CssBackgroundAttachmentCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBackgroundAttachmentCSS1.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBackgroundAttachmentCSS1.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBackgroundAttachmentCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -28,7 +28,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;
@@ -36,37 +36,37 @@
* </PRE>
* @version $Revision$
*/
-public class CssBackgroundAttachmentCSS1 extends CssProperty
+public class CssBackgroundAttachmentCSS1 extends CssProperty
implements CssBackgroundConstants {
-
+
int attachment;
-
+
private static int[] hash_values;
-
+
/**
* Create a new CssBackgroundAttachmentCSS1
*/
public CssBackgroundAttachmentCSS1() {
// nothing to do
- }
-
+ }
+
/**
* Creates a new CssBackgroundAttachmentCSS1
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssBackgroundAttachmentCSS1(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++)
@@ -76,23 +76,23 @@
return;
}
}
-
- throw new InvalidParamException("value", expression.getValue(),
+
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
-
- public CssBackgroundAttachmentCSS1(ApplContext ac, CssExpression expression)
+
+ public CssBackgroundAttachmentCSS1(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
@@ -100,21 +100,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.
*
@@ -126,13 +126,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 ((Css1Style) style).getBackgroundAttachmentCSS1();
@@ -140,25 +140,25 @@
return ((Css1Style) style).cssBackgroundCSS1.attachment;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssBackgroundAttachmentCSS1 &&
+ return (property instanceof CssBackgroundAttachmentCSS1 &&
attachment == ((CssBackgroundAttachmentCSS1) 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: CssVerticalAlignCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssVerticalAlignCSS1.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssVerticalAlignCSS1.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssVerticalAlignCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -88,38 +88,38 @@
*
* @version $Revision$
*/
-public class CssVerticalAlignCSS1 extends CssProperty
+public class CssVerticalAlignCSS1 extends CssProperty
implements CssTextPropertiesConstants {
-
+
Object value;
-
+
private static int[] hash_values;
-
+
/**
* Create a new CssVerticalAlignCSS1
*/
public CssVerticalAlignCSS1() {
value = VERTICALALIGN[0];
}
-
+
/**
* Create a new CssVerticalAlignCSS1
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssVerticalAlignCSS1(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
int hash = val.hashCode();
-
+
setByUser();
-
+
if (val instanceof CssIdent) {
for (int i = 0; i < VERTICALALIGN.length; i++)
if (hash_values[i] == hash) {
@@ -127,43 +127,43 @@
expression.next();
return;
}
- throw new InvalidParamException("value",
+ throw new InvalidParamException("value",
val.toString(), getPropertyName(), ac);
} else if (val instanceof CssPercentage) {
value = val;
expression.next();
} else {
- throw new InvalidParamException("value",
+ throw new InvalidParamException("value",
val.toString(), getPropertyName(), ac);
}
}
-
+
public CssVerticalAlignCSS1(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return value;
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "vertical-align";
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -175,13 +175,13 @@
style0.addRedefinitionWarning(ac, this);
style0.cssVerticalAlignCSS1 = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getVerticalAlignCSS1();
@@ -189,24 +189,24 @@
return ((Css1Style) style).cssVerticalAlignCSS1;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
return (property instanceof CssVerticalAlignCSS1 && value.equals(((CssVerticalAlignCSS1) property).value));
}
-
+
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
- */
+ */
public boolean isDefault() {
return value.equals(VERTICALALIGN[0]);
}
-
+
static {
hash_values = new int[VERTICALALIGN.length];
for (int i=0; i<VERTICALALIGN.length; i++)
Index: CssBackgroundImageCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBackgroundImageCSS2.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBackgroundImageCSS2.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBackgroundImageCSS2.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -35,9 +35,9 @@
* </PRE>
* @version $Revision$ */
public class CssBackgroundImageCSS2 extends CssProperty {
-
+
CssValue url;
-
+
private static CssIdent none = new CssIdent("none");
/**
@@ -45,17 +45,17 @@
*/
public CssBackgroundImageCSS2() {
url = none;
- }
-
+ }
+
/**
* Creates a new CssBackgroundImageCSS2
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssBackgroundImageCSS2(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
@@ -73,23 +73,23 @@
url = none;
expression.next();
} else {
- throw new InvalidParamException("value", expression.getValue(),
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
}
-
- public CssBackgroundImageCSS2(ApplContext ac, CssExpression expression)
+
+ public CssBackgroundImageCSS2(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
@@ -100,7 +100,7 @@
}
return false;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -110,14 +110,14 @@
}
return "";
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "background-image";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -129,13 +129,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 ((Css1Style) style).getBackgroundImageCSS2();
@@ -143,25 +143,25 @@
return ((Css1Style) style).cssBackgroundCSS2.image;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
return ((property == null && url == null)
- || (property instanceof CssBackgroundImageCSS2 &&
+ || (property instanceof CssBackgroundImageCSS2 &&
url != null &&
url.equals(((CssBackgroundImageCSS2) 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: CssQuotes.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssQuotes.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssQuotes.java 23 Aug 2005 16:23:12 -0000 1.1
+++ CssQuotes.java 14 Sep 2005 15:14:31 -0000 1.2
@@ -22,33 +22,33 @@
/**
*/
public class CssQuotes extends CssProperty {
-
+
Vector values = new Vector();
-
+
private static CssIdent none = new CssIdent("none");
-
-
+
+
/**
* Create a new CssQuotes
*/
public CssQuotes() {
- }
-
+ }
+
/**
* Create a new CssQuotes
*
* @param expression The expression for this property
* @exception InvalidParamException The expression is incorrect
- */
+ */
public CssQuotes(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
-
+
CssValue val = expression.getValue();
int counter = 0;
char op = expression.getOperator();
-
+
int valuesNb = expression.getCount();
-
+
setByUser();
if (val.equals(inherit)) {
if(valuesNb > 1) {
@@ -69,28 +69,28 @@
while(counter < valuesNb) {
// there must be a pair number of values
- if(val.equals(inherit) || val.equals(none) || valuesNb % 2 == 1) {
+ if(val.equals(inherit) || val.equals(none) || valuesNb % 2 == 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
// the operator must be a space
if(op != CssOperator.SPACE) {
throw new InvalidParamException("operator",
new Character(op), ac);
}
-
+
// as String
if(val instanceof CssString) {
- values.addElement(val);
+ values.addElement(val);
}
else {
- throw new InvalidParamException("value",
- expression.getValue(),
+ throw new InvalidParamException("value",
+ expression.getValue(),
getPropertyName(), ac);
}
expression.next();
counter++;
-
+
val = expression.getValue();
op = expression.getOperator();
}
@@ -101,7 +101,7 @@
if(val.equals(inherit) || val.equals(none)) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
if (val instanceof CssString) {
values.addElement(val);
expression.next();
@@ -112,13 +112,13 @@
&& (val instanceof CssString)) {
// nothing
} else {
- throw new InvalidParamException("value",
- expression.getValue(),
+ throw new InvalidParamException("value",
+ expression.getValue(),
getPropertyName(), ac);
}
} else {
- throw new InvalidParamException("value",
- expression.getValue(),
+ throw new InvalidParamException("value",
+ expression.getValue(),
getPropertyName(), ac);
}
values.addElement(val);
@@ -129,26 +129,26 @@
}
*/
}
-
- public CssQuotes(ApplContext ac, CssExpression expression)
+
+ public CssQuotes(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return values;
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "quotes";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -156,7 +156,7 @@
public boolean isSoftlyInherited() {
return values.elementAt(0) == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -169,7 +169,7 @@
}
return ret.substring(1);
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -182,13 +182,13 @@
}
style0.cssQuotes = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getQuotes();
@@ -196,21 +196,21 @@
return ((Css1Style) style).cssQuotes;
}
}
-
+
/**
* 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: CssBorderFaceStyle.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderFaceStyle.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderFaceStyle.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorderFaceStyle.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -50,11 +50,11 @@
*/
public CssBorderFaceStyle(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) {
@@ -70,11 +70,11 @@
throw new InvalidParamException("value", val.toString(), "style", ac);
}
- public CssBorderFaceStyle(ApplContext ac, CssExpression expression)
+ public CssBorderFaceStyle(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
Index: CssBorderTopWidthCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderTopWidthCSS2.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderTopWidthCSS2.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssBorderTopWidthCSS2.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -44,16 +44,16 @@
* @version $Revision$
*/
public class CssBorderTopWidthCSS2 extends CssProperty {
-
+
CssBorderFaceWidthCSS2 face;
-
+
/**
* Create a new CssBorderTopWidth
*/
public CssBorderTopWidthCSS2() {
face = new CssBorderFaceWidthCSS2();
}
-
+
/**
* Create a new CssBorderTopWidth with an another CssBorderFaceWidth
*
@@ -61,10 +61,10 @@
*/
public CssBorderTopWidthCSS2(CssBorderFaceWidthCSS2 another) {
setByUser();
-
+
face = another;
}
-
+
/**
* Create a new CssBorderTopWidthCSS2
*
@@ -73,27 +73,27 @@
*/
public CssBorderTopWidthCSS2(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
face = new CssBorderFaceWidthCSS2(ac, expression);
}
-
+
public CssBorderTopWidthCSS2(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
*/
@@ -103,7 +103,7 @@
}
return null;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -113,14 +113,14 @@
}
return null;
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "border-top-width";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -134,13 +134,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 ((Css1Style) style).getBorderTopWidthCSS2();
@@ -148,15 +148,15 @@
return ((Css1Style) style).cssBorderCSS2.getTop().width;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
return (property instanceof CssBorderTopWidthCSS2 &&
face.equals(((CssBorderTopWidthCSS2) property).face));
}
-
+
}
Index: CssFontStyle.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssFontStyle.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssFontStyle.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssFontStyle.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -42,32 +42,32 @@
* In the example above, emphasized text within 'H1' will appear in a normal
* face.
*
- * @version $Revision$
+ * @version $Revision$
*/
public class CssFontStyle extends CssProperty implements CssFontConstant {
-
+
int value;
-
+
/**
* Create a new CssFontStyle
*/
public CssFontStyle() {
// nothing to do
}
-
+
/**
* Creates a new CssFontStyle
*
* @param expression the font style
* @exception InvalidParamException values are incorrect
- */
+ */
public CssFontStyle(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
if (expression.getValue() instanceof CssIdent) {
int hash = ((CssIdent) expression.getValue()).hashCode();
@@ -78,23 +78,23 @@
return;
}
}
-
- throw new InvalidParamException("value", expression.getValue(),
+
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
-
+
public CssFontStyle(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value
- */
+ */
public Object get() {
return FONTSTYLE[value];
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -102,21 +102,21 @@
public boolean isSoftlyInherited() {
return value == FONTSTYLE.length - 1;
}
-
+
/**
* Returns a string representation of the object.
*/
- public String toString() {
+ public String toString() {
return FONTSTYLE[value];
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "font-style";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -128,13 +128,13 @@
style.addRedefinitionWarning(ac, this);
cssFont.fontStyle = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getFontStyle();
@@ -142,27 +142,27 @@
return ((Css1Style) style).cssFont.fontStyle;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssFontStyle &&
+ return (property instanceof CssFontStyle &&
((CssFontStyle) property).value == value);
}
-
+
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
- */
+ */
public boolean isDefault() {
return value == 0;
}
-
+
private static int[] hash_values;
-
+
static {
hash_values = new int[FONTSTYLE.length];
for (int i=0; i<FONTSTYLE.length; i++)
Index: CssBorderWidthCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderWidthCSS2.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderWidthCSS2.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssBorderWidthCSS2.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -56,12 +56,12 @@
* @version $Revision$
*/
public class CssBorderWidthCSS2 extends CssProperty implements CssOperator {
-
+
CssBorderTopWidthCSS2 top;
CssBorderBottomWidthCSS2 bottom;
CssBorderRightWidthCSS2 right;
CssBorderLeftWidthCSS2 left;
-
+
/**
* Create a new CssBorderWidthCSS2
*/
@@ -73,14 +73,14 @@
this.bottom = bottom;
this.left = left;
this.right = right;
- }
-
+ }
+
/**
* Create a new CssBorderCSS2
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssBorderWidthCSS2(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
@@ -94,7 +94,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)) {
@@ -110,7 +110,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)) {
@@ -118,7 +118,7 @@
}
top = new CssBorderTopWidthCSS2(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)) {
@@ -133,7 +133,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)) {
@@ -141,7 +141,7 @@
}
top = new CssBorderTopWidthCSS2(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)) {
@@ -149,10 +149,10 @@
}
right = new CssBorderRightWidthCSS2(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 CssBorderBottomWidthCSS2(ac, expression);
@@ -167,26 +167,26 @@
}
}
}
-
- public CssBorderWidthCSS2(ApplContext ac, CssExpression expression)
+
+ public CssBorderWidthCSS2(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.
*/
@@ -205,11 +205,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.important = true;
@@ -224,7 +224,7 @@
bottom.important = true;
}
}
-
+
/**
* Returns true if this property is important.
* Overrides this method for a macro
@@ -235,14 +235,14 @@
(left == null || left.important) &&
(bottom == null || bottom.important));
}
-
+
/**
* 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) &&
@@ -262,9 +262,9 @@
if (bottom != null)
bottom.print(printer);
}
-
+
}
-
+
/**
* Set the context.
* Overrides this method for a macro
@@ -287,7 +287,7 @@
left.setSelectors(selector);
}
}
-
+
/**
* Add this property to the CssStyle
*
@@ -307,25 +307,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) {
@@ -341,14 +341,14 @@
bottom.setInfo(line, source);
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
return false; // FIXME
}
-
+
}
Index: CssBorderRight.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderRight.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderRight.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorderRight.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -77,11 +77,11 @@
if(check && expression.getCount() > 4) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
-
+
boolean manyValues = (expression.getCount() > 1);
-
+
while (find) {
find = false;
val = expression.getValue();
@@ -94,7 +94,7 @@
if(manyValues && val.equals(inherit)) {
throw new InvalidParamException("unrecognize", null, null, ac);
}
-
+
if (op != SPACE)
throw new InvalidParamException("operator",
((new Character(op)).toString()),
@@ -153,7 +153,7 @@
throws InvalidParamException {
this(ac, expression,false);
}
-
+
/**
* Returns the value of this property
*/
@@ -287,7 +287,7 @@
*
* @param style The CssStyle
*/
- public void addToStyle(ApplContext ac, CssStyle style) {
+ public void addToStyle(ApplContext ac, CssStyle style) {
if(width != null) {
width.addToStyle(ac, style);
}
@@ -321,7 +321,7 @@
* @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);
}
@@ -332,7 +332,7 @@
color.setInfo(line, source);
}
}
-
+
/**
* Set the context.
* Overrides this method for a macro
@@ -369,7 +369,7 @@
}
}
- void check() {
+ void check() {
if ((style != null)
&& (style.face.value == 0)) {
if (width != null) {
Index: CssMinWidth.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssMinWidth.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssMinWidth.java 23 Aug 2005 16:23:12 -0000 1.1
+++ CssMinWidth.java 14 Sep 2005 15:14:31 -0000 1.2
@@ -20,70 +20,70 @@
/**
*/
public class CssMinWidth extends CssProperty {
-
+
CssValue value;
-
+
/**
* Create a new CssMinWidth
*/
public CssMinWidth() {
- }
-
+ }
+
/**
* Create a new CssMinWidth.
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssMinWidth(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)) {
value = inherit;
} else if (val instanceof CssLength || val instanceof CssPercentage) {
float f = ((Float) val.get()).floatValue();
if (f < 0) {
- throw new InvalidParamException("negative-value",
+ throw new InvalidParamException("negative-value",
val.toString(), ac);
}
value = val;
} else if (val instanceof CssNumber) {
value = ((CssNumber) val).getLength();
} else {
- throw new InvalidParamException("value", expression.getValue(),
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
-
+
expression.next();
}
-
+
public CssMinWidth(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property.
*/
public Object get() {
return value;
}
-
+
/**
* Returns the name of this property.
- */
+ */
public String getPropertyName() {
return "min-width";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -91,15 +91,15 @@
public boolean isSoftlyInherited() {
return value == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
-
+
+
/**
* Add this property to the CssStyle.
*
@@ -111,13 +111,13 @@
style0.addRedefinitionWarning(ac, this);
style0.cssMinWidth = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getMinWidth();
@@ -125,15 +125,15 @@
return ((Css1Style) style).cssMinWidth;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssMinWidth
+ return (property instanceof CssMinWidth
&& value.equals(((CssMinWidth) property).value));
}
-
+
}
Index: CssBorderRightCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderRightCSS2.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorderRightCSS2.java 8 Sep 2005 12:23:33 -0000 1.3
+++ CssBorderRightCSS2.java 14 Sep 2005 15:14:31 -0000 1.4
@@ -49,64 +49,64 @@
* @version $Revision$
*/
public class CssBorderRightCSS2 extends CssProperty implements CssOperator {
-
+
CssBorderRightWidthCSS2 width;
CssBorderRightStyleCSS2 style;
CssBorderRightColorCSS2 color;
-
+
/**
* Create a new CssBorderFaceCSS2
*/
public CssBorderRightCSS2() {
- }
-
+ }
+
/**
* Create a new CssBorderFaceCSS2
*
* @param expression The expression for this property
* @exception InvalidParamException The expression is incorrect
- */
+ */
public CssBorderRightCSS2(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 CssBorderRightWidthCSS2(ac, expression);
+ width = new CssBorderRightWidthCSS2(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 CssBorderRightStyleCSS2(ac, expression);
+ style = new CssBorderRightStyleCSS2(ac, expression);
find = true;
} catch(InvalidParamException e){
// nothing to do, color will test this value
@@ -115,29 +115,29 @@
if (!find && color == null) {
// throws an exception if the value is not valid
color = new CssBorderRightColorCSS2(ac, expression);
- find = true;
+ find = true;
}
}
-
+
//if some values have not been set, we set them with their default ones
/*
if (width == null) {
width = new CssBorderRightWidthCSS2();
}
if (style == null) {
- style = new CssBorderRightStyleCSS2();
- }
+ style = new CssBorderRightStyleCSS2();
+ }
if (color == null) {
- color = new CssBorderRightColorCSS2();
+ color = new CssBorderRightColorCSS2();
}
*/
}
-
+
public CssBorderRightCSS2(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression,false);
}
-
+
/**
* @param color The color to set.
*/
@@ -165,7 +165,7 @@
public Object get() {
return width;
}
-
+
/**
* Returns the color property
*/
@@ -176,7 +176,7 @@
return null;
}
}
-
+
/**
* Returns the width property
*/
@@ -187,7 +187,7 @@
return null;
}
}
-
+
/**
* Returns the style property
*/
@@ -198,7 +198,7 @@
return null;
}
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -221,18 +221,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.important = true;
@@ -244,7 +244,7 @@
color.important = true;
}
}
-
+
/**
* Returns true if this property is important.
* Overrides this method for a macro
@@ -254,14 +254,14 @@
(style == null || style.important) &&
(color == null || color.important));
}
-
+
/**
* Print this property.
*
* @param printer The printer.
* @see #toString()
* @see #getPropertyName()
- */
+ */
public void print(CssPrinterStyle printer) {
if ((width != null && style != null &&
color != null) &&
@@ -278,9 +278,9 @@
if (color != null)
color.print(printer);
}
-
+
}
-
+
/**
* Set the context.
* Overrides this method for a macro
@@ -300,13 +300,13 @@
color.setSelectors(selector);
}
}
-
+
/**
* Add this property to the CssStyle
*
* @param style The CssStyle
*/
- public void addToStyle(ApplContext ac, CssStyle style) {
+ public void addToStyle(ApplContext ac, CssStyle style) {
if(width != null) {
width.addToStyle(ac, style);
}
@@ -317,13 +317,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 ((Css1Style) style).getBorderRightCSS2();
@@ -331,16 +331,16 @@
return ((Css1Style) style).cssBorderCSS2.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);
}
@@ -351,25 +351,25 @@
color.setInfo(line, source);
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
if (property instanceof CssBorderRightCSS2) {
CssBorderRightCSS2 right = (CssBorderRightCSS2) property;
- return (width != null && width.equals(right.width) &&
+ return (width != null && width.equals(right.width) &&
style != null && style.equals(right.style) &&
color != null && 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: CssBorderTopColorCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderTopColorCSS1.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderTopColorCSS1.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssBorderTopColorCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -18,26 +18,26 @@
* @version $Revision$
*/
public class CssBorderTopColorCSS1 extends CssProperty {
-
+
CssBorderFaceColorCSS1 face;
-
+
/**
* Create a new CssBorderTopColorCSS1
*/
public CssBorderTopColorCSS1() {
face = new CssBorderFaceColorCSS1();
}
-
+
/**
* Create a new CssBorderTopColorCSS1 with an another CssBorderFaceColorCSS1
* @param another The another side.
*/
public CssBorderTopColorCSS1(CssBorderFaceColorCSS1 another) {
setByUser();
-
+
face = another;
}
-
+
/**
* Create a new CssBorderTopColorCSS1
*
@@ -46,27 +46,27 @@
*/
public CssBorderTopColorCSS1(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
face = new CssBorderFaceColorCSS1(ac, expression);
}
-
+
public CssBorderTopColorCSS1(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression,false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return face;
}
-
+
/**
* Returns the color
*/
@@ -77,7 +77,7 @@
return null;
}
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -87,14 +87,14 @@
}
return "";
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "border-top-color";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -106,7 +106,7 @@
style.addRedefinitionWarning(ac, this);
top.color = this;
}
-
+
/**
* Get this property in the style.
*
@@ -120,26 +120,26 @@
return ((Css1Style) style).cssBorderCSS1.getTop().color;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssBorderTopColorCSS1 &&
+ return (property instanceof CssBorderTopColorCSS1 &&
face.equals(((CssBorderTopColorCSS1) property).face));
}
-
+
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
*
* @see #print(CssPrinterStyle)
- */
+ */
public void print(CssPrinterStyle printer) {
if (face != null && !face.isDefault())
printer.print(this);
}
-
+
}
Index: CssMargin.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssMargin.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssMargin.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssMargin.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -53,29 +53,29 @@
* @version $Revision$
*/
public class CssMargin extends CssProperty implements CssOperator {
-
+
CssMarginTop top;
CssMarginBottom bottom;
CssMarginRight right;
CssMarginLeft left;
boolean inheritedValue;
-
+
/**
* Create a new CssMargin
*/
public CssMargin() {
- }
-
+ }
+
/**
* Create a new CssMargin
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
- public CssMargin(ApplContext ac, CssExpression expression, boolean check)
+ */
+ public CssMargin(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
-
+
//CssValue val = expression.getValue();
setByUser();
@@ -89,7 +89,7 @@
right.value = inherit;
left = new CssMarginLeft();
left.value = inherit;
- }*/
+ }*/
switch (expression.getCount()) {
case 1:
top = new CssMarginTop(ac, expression);
@@ -171,54 +171,54 @@
throw new InvalidParamException("unrecognize", ac);
}
}
-
+
public CssMargin(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return top;
}
-
+
/**
* Returns the top property
*/
public CssMarginTop getTop() {
return top;
}
-
+
/**
* Returns the right property
*/
public CssMarginRight getRight() {
return right;
}
-
+
/**
* Returns the bottom property
*/
public CssMarginBottom getBottom() {
return bottom;
}
-
+
/**
* Returns the left property
*/
public CssMarginLeft getLeft() {
return left;
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "margin";
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -240,11 +240,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.important = true;
@@ -259,7 +259,7 @@
left.important = true;
}
}
-
+
/**
* Returns true if this property is important.
* Overrides this method for a macro
@@ -270,13 +270,13 @@
(bottom == null || bottom.important) &&
(left == null || left.important));
}
-
+
/**
* Print this property.
*
* @see #toString()
* @see #getPropertyName()
- */
+ */
public void print(CssPrinterStyle printer) {
if (inheritedValue) {
printer.print(this);
@@ -298,9 +298,9 @@
if (left != null)
left.print(printer);
}
-
+
}
-
+
/**
* Set the context.
* Overrides this method for a macro
@@ -323,7 +323,7 @@
left.setSelectors(selector);
}
}
-
+
/**
* Add this property to the CssStyle
*
@@ -344,13 +344,13 @@
left.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 ((Css1Style) style).getMargin();
@@ -358,33 +358,33 @@
return ((Css1Style) style).cssMargin;
}
}
-
+
/**
* 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);
// it assumes that values exists, that may not be the case
// always. What would be the cause of that, an invalid clause?
- // in this case a proper exception should be sent
+ // in this case a proper exception should be sent
// So... a FIXME
top.setInfo(line, source);
right.setInfo(line, source);
bottom.setInfo(line, source);
left.setInfo(line, source);
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
return false;
}
-
+
}
Index: CssFontSizeAdjustCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssFontSizeAdjustCSS2.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssFontSizeAdjustCSS2.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssFontSizeAdjustCSS2.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -17,12 +17,12 @@
/**
*
* @see CssFont
- * @version $Revision$
+ * @version $Revision$
*/
public class CssFontSizeAdjustCSS2 extends CssProperty implements CssFontConstantCSS2 {
-
+
CssValue value;
-
+
private static CssIdent none = new CssIdent("none");
/**
@@ -31,21 +31,21 @@
public CssFontSizeAdjustCSS2() {
value = none;
}
-
+
/**
* Creates a new CssFontSize-AdjustCSS2
*
* @param expression the font size-adjust
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssFontSizeAdjustCSS2(ApplContext ac, CssExpression expression,
- boolean check)
+ boolean check)
throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
setByUser();
@@ -56,25 +56,25 @@
} else if (val instanceof CssNumber) {
value = val;
} else {
- throw new InvalidParamException("value", expression.getValue(),
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
-
+
expression.next();
}
-
+
public CssFontSizeAdjustCSS2(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
- }
-
+ }
+
/**
* Returns the current value
- */
+ */
public Object get() {
return value;
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -82,21 +82,21 @@
public boolean isSoftlyInherited() {
return value == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "font-size-adjust";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -108,13 +108,13 @@
style0.addRedefinitionWarning(ac, this);
style0.cssFontSizeAdjustCSS2 = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getFontSizeAdjustCSS2();
@@ -122,21 +122,21 @@
return ((Css1Style) style).cssFontSizeAdjustCSS2;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssFontSizeAdjustCSS2 &&
+ return (property instanceof CssFontSizeAdjustCSS2 &&
((CssFontSizeAdjustCSS2) property).value.equals(value));
}
-
+
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
- */
+ */
public boolean isDefault() {
return value == none;
}
Index: CssBackgroundImageMob.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBackgroundImageMob.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBackgroundImageMob.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBackgroundImageMob.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -35,9 +35,9 @@
* </PRE>
* @version $Revision$ */
public class CssBackgroundImageMob extends CssProperty {
-
+
CssValue url;
-
+
private static CssIdent none = new CssIdent("none");
/**
@@ -45,17 +45,17 @@
*/
public CssBackgroundImageMob() {
url = none;
- }
-
+ }
+
/**
* Creates a new CssBackgroundImageMob
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssBackgroundImageMob(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
@@ -73,23 +73,23 @@
url = none;
expression.next();
} else {
- throw new InvalidParamException("value", expression.getValue(),
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
}
-
- public CssBackgroundImageMob(ApplContext ac, CssExpression expression)
+
+ public CssBackgroundImageMob(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
@@ -100,7 +100,7 @@
}
return false;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -110,14 +110,14 @@
}
return "";
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "background-image";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -129,13 +129,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 ((Css1Style) style).getBackgroundImageMob();
@@ -143,25 +143,25 @@
return ((Css1Style) style).cssBackgroundMob.image;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
return ((url == null && property == null) ||
- (property instanceof CssBackgroundImageMob &&
+ (property instanceof CssBackgroundImageMob &&
url != null &&
url.equals(((CssBackgroundImageMob) 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: CssFontCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssFontCSS2.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssFontCSS2.java 8 Sep 2005 12:23:34 -0000 1.3
+++ CssFontCSS2.java 14 Sep 2005 15:14:31 -0000 1.4
@@ -72,48 +72,48 @@
* @see CssFontFamily
* @see CssPercentage
* @see CssLength
- * @version $Revision$
+ * @version $Revision$
*/
-public class CssFontCSS2 extends CssProperty
+public class CssFontCSS2 extends CssProperty
implements CssOperator, CssFontConstant {
-
+
CssValue value;
CssFontStyleCSS2 fontStyle;
CssFontVariantCSS2 fontVariant;
CssFontWeightCSS2 fontWeight;
-
+
CssFontSizeCSS2 fontSize;
CssLineHeightCSS2 lineHeight;
CssFontFamilyCSS2 fontFamily;
-
+
// internal hack for strings comparaison
private static int[] hash_values;
-
- static CssIdent normal = new CssIdent("normal");
-
+
+ static CssIdent normal = new CssIdent("normal");
+
/**
* Create a new CssFont
*/
public CssFontCSS2() {
- }
-
+ }
+
/**
* Creates a new CssFont
*
* @param expression The expression for this property
* @exception InvalidParamException The expression is incorrect
- */
+ */
public CssFontCSS2(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
-
+
CssValue val = expression.getValue();
char op = SPACE;
boolean find = true;
int max_values = 3;
-
+
int normalNb = 0;
-
+
if (val instanceof CssIdent) {
CssIdent ident = checkIdent((CssIdent) val);
if (ident != null) {
@@ -129,16 +129,16 @@
while (find && max_values-- > 0) {
find = false;
val = expression.getValue();
- op = expression.getOperator();
+ op = expression.getOperator();
if (val == null) {
throw new InvalidParamException("few-value", getPropertyName(), ac);
}
-
+
if(val.equals(inherit)) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
if(val.equals(normal)) {
normalNb++;
expression.next();
@@ -147,11 +147,11 @@
if (!find && fontStyle == null) {
try {
- fontStyle = new CssFontStyleCSS2(ac, expression);
+ fontStyle = new CssFontStyleCSS2(ac, expression);
find = true;
} catch (InvalidParamException e) {
}
- }
+ }
if (!find && fontVariant == null) {
try {
@@ -173,15 +173,15 @@
}
if (find && op != SPACE) {
- throw new InvalidParamException("operator",
+ throw new InvalidParamException("operator",
((new Character(op)).toString()), ac);
}
}
-
+
// "normal" values
CssExpression normalExpr = new CssExpression();
normalExpr.addValue(normal);
-
+
for(int i = 0; i < normalNb; i++) {
if (fontStyle == null) {
fontStyle = new CssFontStyleCSS2(ac, normalExpr);
@@ -198,51 +198,51 @@
}
val = expression.getValue();
- op = expression.getOperator();
-
+ op = expression.getOperator();
+
if (val == null) {
throw new InvalidParamException("few-value", getPropertyName(), ac);
}
-
+
if(val.equals(inherit)) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
fontSize = new CssFontSizeCSS2(ac, expression);
-
+
if (op == SLASH) {
op = expression.getOperator();
if(expression.getValue().equals(inherit)) {
throw new InvalidParamException("unrecognize", ac);
}
lineHeight = new CssLineHeightCSS2(ac, expression);
- }
-
+ }
+
if(expression.getValue().equals(inherit)) {
throw new InvalidParamException("unrecognize", ac);
}
- if (op == SPACE && expression.getValue() != null) {
+ if (op == SPACE && expression.getValue() != null) {
fontFamily = new CssFontFamilyCSS2(ac, expression, true);
} else {
expression.starts();
throw new InvalidParamException("few-value", expression.toString(), ac);
- }
+ }
setByUser();
}
-
+
public CssFontCSS2(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return null;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -272,11 +272,11 @@
return ret.substring(1);
}
}
-
+
/**
* Set this property to be important.
* Overrides this method for a macro
- */
+ */
public void setImportant() {
super.setImportant();
if (value == null) {
@@ -294,7 +294,7 @@
fontFamily.important = true;
}
}
-
+
/**
* Returns true if this property is important.
* Overrides this method for a macro
@@ -311,14 +311,14 @@
(fontFamily == null || fontFamily.important));
}
}
-
+
/**
* Print this property.
*
* @param printer The printer
* @see #toString()
* @see #getPropertyName()
- */
+ */
public void print(CssPrinterStyle printer) {
if (value != null) {
printer.print(this);
@@ -353,9 +353,9 @@
((fontFamily.isSoftlyInherited()) || (fontFamily.size() != 0))) {
fontFamily.print(printer);
}
- }
+ }
}
-
+
/**
* Add this property to the CssStyle
*
@@ -379,14 +379,14 @@
fontFamily.addToStyle(ac, style);
}
}
-
+
/**
* 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 (value == null) {
@@ -404,16 +404,16 @@
fontFamily.setInfo(line, source);
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
return false;
}
-
+
/**
* Set the context.
* Overrides this method for a macro
@@ -442,13 +442,13 @@
fontFamily.setSelectors(selector);
}
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getFontCSS2();
@@ -456,7 +456,7 @@
return ((Css1Style) style).cssFontCSS2;
}
}
-
+
/**
* Returns the name of this property
*/
@@ -471,7 +471,7 @@
return ident;
}
}
-
+
return null;
}
Index: CssBorderRightStyleCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderRightStyleCSS2.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderRightStyleCSS2.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssBorderRightStyleCSS2.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -16,18 +16,18 @@
* @version $Revision$
*/
public class CssBorderRightStyleCSS2 extends CssProperty {
-
+
CssBorderFaceStyleCSS2 face;
-
+
/**
* Create a new CssBorderRightStyleCSS2
*/
public CssBorderRightStyleCSS2() {
setByUser();
-
+
face = new CssBorderFaceStyleCSS2();
}
-
+
/**
* Create a new CssBorderRightStyle with an another CssBorderFaceStyle
*
@@ -35,10 +35,10 @@
*/
public CssBorderRightStyleCSS2(CssBorderFaceStyleCSS2 another) {
setByUser();
-
+
face = another;
}
-
+
/**
* Create a new CssBorderRightStyleCSS2
*
@@ -47,28 +47,28 @@
*/
public CssBorderRightStyleCSS2(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
-
+
face = new CssBorderFaceStyleCSS2(ac, expression);
}
-
+
public CssBorderRightStyleCSS2(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression,false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return face;
}
-
+
/**
* Returns the value
*/
@@ -81,7 +81,7 @@
}
return null;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -91,14 +91,14 @@
}
return "";
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "border-right-style";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -110,13 +110,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 ((Css1Style) style).getBorderRightStyleCSS2();
@@ -124,15 +124,15 @@
return ((Css1Style) style).cssBorderCSS2.getRight().style;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssBorderRightStyleCSS2 &&
+ return (property instanceof CssBorderRightStyleCSS2 &&
face.equals(((CssBorderRightStyleCSS2) property).face));
}
-
+
}
Index: CssTop.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssTop.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssTop.java 23 Aug 2005 16:23:12 -0000 1.1
+++ CssTop.java 14 Sep 2005 15:14:31 -0000 1.2
@@ -23,7 +23,7 @@
public CssTop() {
super();
}
-
+
/**
* Create a new CssTop
*
@@ -34,15 +34,15 @@
throws InvalidParamException {
super(ac, expression, check);
}
-
+
public CssTop(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "top";
}
@@ -64,7 +64,7 @@
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getTop();
@@ -77,9 +77,9 @@
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssTop &&
+ return (property instanceof CssTop &&
value.equals(((CssTop) property).value));
}
Index: CssBorderRightWidth.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderRightWidth.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderRightWidth.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssBorderRightWidth.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -41,19 +41,19 @@
* <P>
* Border widths cannot be negative.
*
- * @version $Revision$
+ * @version $Revision$
*/
public class CssBorderRightWidth extends CssProperty {
-
+
CssBorderFaceWidth face;
-
+
/**
* Create a new CssBorderRightWidth
*/
public CssBorderRightWidth() {
face = new CssBorderFaceWidth();
}
-
+
/**
* Create a new CssBorderRightWidth with an another CssBorderFaceWidth
*
@@ -61,10 +61,10 @@
*/
public CssBorderRightWidth(CssBorderFaceWidth another) {
setByUser();
-
+
face = another;
}
-
+
/**
* Create a new CssBorderRightWidth
*
@@ -73,28 +73,28 @@
*/
public CssBorderRightWidth(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
-
+
face = new CssBorderFaceWidth(ac, expression);
}
-
+
public CssBorderRightWidth(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
*/
@@ -104,7 +104,7 @@
}
return null;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -114,14 +114,14 @@
}
return "";
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "border-right-width";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -133,13 +133,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 ((Css1Style) style).getBorderRightWidth();
@@ -147,15 +147,15 @@
return ((Css1Style) style).cssBorder.getRight().width;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssBorderRightWidth &&
+ return (property instanceof CssBorderRightWidth &&
face.equals(((CssBorderRightWidth) property).face));
}
-
+
}
Index: CssBorderWidth.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderWidth.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderWidth.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssBorderWidth.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -56,12 +56,12 @@
* @version $Revision$
*/
public class CssBorderWidth extends CssProperty implements CssOperator {
-
+
CssBorderTopWidth top;
CssBorderBottomWidth bottom;
CssBorderRightWidth right;
CssBorderLeftWidth left;
-
+
/**
* Create a new CssBorderWidth
*/
@@ -73,18 +73,18 @@
this.bottom = bottom;
this.left = left;
this.right = right;
- }
-
+ }
+
/**
* Create a new CssBorder
*
* @param expression The expression for this property
* @param check true will test the number of values
* @exception InvalidParamException Values are incorrect
- */
- public CssBorderWidth(ApplContext ac, CssExpression expression, boolean check)
- throws InvalidParamException {
-
+ */
+ public CssBorderWidth(ApplContext ac, CssExpression expression, boolean check)
+ throws InvalidParamException {
+
setByUser();
switch (expression.getCount()) {
case 1:
@@ -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 CssBorderTopWidth(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)) {
@@ -138,7 +138,7 @@
throw new InvalidParamException("unrecognize", ac);
}
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 CssBorderTopWidth(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 CssBorderRightWidth(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)) {
@@ -165,29 +165,29 @@
throw new InvalidParamException("unrecognize", ac);
}
left = new CssBorderLeftWidth(ac, expression);
- break;
+ break;
}
}
-
- public CssBorderWidth(ApplContext ac, CssExpression expression)
+
+ public CssBorderWidth(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,18 +206,18 @@
return top + " " + right + " " + bottom + " " + left;
}
}
-
+
/**
* Set this property to be important.
* Overrides this method for a macro
- */
+ */
public void setImportant() {
top.important = true;
right.important = true;
left.important = true;
bottom.important = true;
}
-
+
/**
* Returns true if this property is important.
* Overrides this method for a macro
@@ -228,14 +228,14 @@
(left == null || left.important) &&
(bottom == null || bottom.important));
}
-
+
/**
* 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) &&
@@ -255,9 +255,9 @@
if (bottom != null)
bottom.print(printer);
}
-
+
}
-
+
/**
* Set the context.
* Overrides this method for a macro
@@ -280,7 +280,7 @@
left.setSelectors(selector);
}
}
-
+
/**
* Add this property to the CssStyle
*
@@ -300,25 +300,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) {
@@ -334,14 +334,14 @@
bottom.setInfo(line, source);
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
return false; //FIXME
}
-
+
}
Index: CssFontSizeCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssFontSizeCSS2.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssFontSizeCSS2.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssFontSizeCSS2.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -72,33 +72,33 @@
* <P>
* If the suggested scaling factor of 1.5 is used, the last three declarations
* are identical.
- * @version $Revision$
+ * @version $Revision$
*/
public class CssFontSizeCSS2 extends CssProperty implements CssFontConstantCSS2 {
-
+
int value;
CssValue cssValue;
-
+
/**
* Create a new FontSizeCSS2
- */
+ */
public CssFontSizeCSS2() {
value = 3; // default value is medium
}
-
+
/**
* Creates a new CssFontSizeCSS2
*
* @param expression the expression of the size
* @exception InvalidParamException The expression is incorrect
- */
+ */
public CssFontSizeCSS2(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) {
@@ -114,7 +114,7 @@
} else if (val instanceof CssPercentage) {
float num = ((Float) val.get()).floatValue();
if (num < 0) {
- throw new InvalidParamException("negative-value",
+ throw new InvalidParamException("negative-value",
val.toString(), ac);
}
this.cssValue = val;
@@ -134,30 +134,30 @@
expression.next();
return;
} else {
- throw new InvalidParamException("negative-value",
+ throw new InvalidParamException("negative-value",
val.toString(), ac);
}
}
- throw new InvalidParamException("value",
+ throw new InvalidParamException("value",
val, getPropertyName(), ac);
}
-
+
public CssFontSizeCSS2(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value
- */
+ */
public Object get() {
if (cssValue != null)
return cssValue;
else
return FONTSIZE[value];
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -165,7 +165,7 @@
public boolean isSoftlyInherited() {
return value == FONTSIZE.length - 1;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -175,15 +175,15 @@
else
return FONTSIZE[value];
}
-
-
+
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "font-size";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -195,13 +195,13 @@
style.addRedefinitionWarning(ac, this);
cssFont.fontSize = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getFontSizeCSS2();
@@ -209,23 +209,23 @@
return ((Css1Style) style).cssFontCSS2.fontSize;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
if (cssValue == null)
- return (property instanceof CssFontSizeCSS2 &&
+ return (property instanceof CssFontSizeCSS2 &&
((CssFontSizeCSS2) property).value == value);
else
- return (property instanceof CssFontSizeCSS2 &&
+ return (property instanceof CssFontSizeCSS2 &&
((CssFontSizeCSS2) property).cssValue.equals(cssValue));
}
-
+
private static int[] hash_values;
-
+
static {
hash_values = new int[FONTSIZE.length];
for (int i=0; i<FONTSIZE.length; i++)
Index: CssTextAlignMob.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssTextAlignMob.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssTextAlignMob.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssTextAlignMob.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -39,38 +39,38 @@
* languages.
* @version $Revision$
*/
-public class CssTextAlignMob extends CssProperty
+public class CssTextAlignMob extends CssProperty
implements CssTextPropertiesConstants {
-
+
int value;
CssValue valueString;
-
+
private static int[] hash_values;
-
+
/**
* Create a new CssTextAlignMob
*/
public CssTextAlignMob() {
// depends on user agent and writing direction
- }
-
+ }
+
/**
* Create a new CssTextAlignMob
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssTextAlignMob(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
int hash = val.hashCode();
-
+
setByUser();
-
+
if (val.equals(inherit)) {
valueString = inherit;
expression.next();
@@ -87,12 +87,12 @@
throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
}
-
- public CssTextAlignMob(ApplContext ac, CssExpression expression)
+
+ public CssTextAlignMob(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
@@ -103,14 +103,14 @@
return TEXTALIGN[value];
}
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "text-align";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -118,7 +118,7 @@
public boolean isSoftlyInherited() {
return valueString == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -129,7 +129,7 @@
return TEXTALIGN[value];
}
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -141,13 +141,13 @@
style0.addRedefinitionWarning(ac, this);
style0.cssTextAlignMob = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getTextAlignMob();
@@ -155,22 +155,22 @@
return ((Css1Style) style).cssTextAlignMob;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
if (valueString != null) {
- return (property instanceof CssTextAlignMob
+ return (property instanceof CssTextAlignMob
&& valueString.equals(((CssTextAlignMob) property).valueString));
} else {
- return (property instanceof CssTextAlignMob
+ return (property instanceof CssTextAlignMob
&& value == ((CssTextAlignMob) property).value);
}
}
-
+
static {
hash_values = new int[TEXTALIGN.length];
for (int i=0; i<TEXTALIGN.length; i++)
Index: CssDisplayCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssDisplayCSS2.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssDisplayCSS2.java 8 Sep 2005 12:23:34 -0000 1.3
+++ CssDisplayCSS2.java 14 Sep 2005 15:14:31 -0000 1.4
@@ -54,42 +54,42 @@
* default values for all HTML elements according to the suggested rendering
* of elements in the HTML specification.
*
- * @version $Revision$
+ * @version $Revision$
*/
public class CssDisplayCSS2 extends CssProperty {
-
+
int value;
-
+
private static String[] DISPLAY = {
- "inline", "block", "list-item", "run-in", "compact", "marker", "table",
- "inline-table", "table-row-group", "table-column-group",
+ "inline", "block", "list-item", "run-in", "compact", "marker", "table",
+ "inline-table", "table-row-group", "table-column-group",
"table-header-group", "table-footer-group", "table-row", "table-column",
"table-cell", "table-caption", "none", "inherit" };
private static int[] hash_values;
-
+
/**
* Create a new CssDisplay
*/
public CssDisplayCSS2() {
// nothing to do
- }
-
+ }
+
/**
* Create a new CssDisplay
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorect
- */
+ */
public CssDisplayCSS2(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) {
@@ -102,16 +102,16 @@
}
}
}
-
- throw new InvalidParamException("value", expression.getValue(),
+
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
-
+
public CssDisplayCSS2(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
- }
-
+ }
+
/**
* @return Returns the value.
*/
@@ -132,14 +132,14 @@
public Object get() {
return DISPLAY[value];
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "display";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -147,14 +147,14 @@
public boolean isSoftlyInherited() {
return value == DISPLAY.length - 1;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return DISPLAY[value];
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -166,13 +166,13 @@
style0.addRedefinitionWarning(ac, this);
style0.cssDisplayCSS2 = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getDisplayCSS2();
@@ -180,25 +180,25 @@
return ((Css1Style) style).cssDisplayCSS2;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssDisplayCSS2 &&
+ return (property instanceof CssDisplayCSS2 &&
value == ((CssDisplay) property).value);
}
-
+
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
- */
+ */
public boolean isDefault() {
return value == 0;
}
-
+
static {
hash_values = new int[DISPLAY.length];
for (int i = 0; i < DISPLAY.length; i++)
Index: CssBackgroundPositionCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBackgroundPositionCSS2.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- CssBackgroundPositionCSS2.java 8 Sep 2005 12:23:33 -0000 1.5
+++ CssBackgroundPositionCSS2.java 14 Sep 2005 15:14:31 -0000 1.6
@@ -48,7 +48,7 @@
* background image. Keywords cannot be combined with percentage values, or
* length values. The possible combinations of keywords and their
* interpretations are as follows:
-
+
* <UL>
* <LI>
* 'top left' and 'left top' both mean the same as '0% 0%'.
@@ -82,54 +82,54 @@
* 'background-attachment' property above), the image is placed relative to
* the canvas instead of the element. E.g.:
* <PRE>
- * BODY {
+ * BODY {
* background-image: url(logo.png);
* background-attachment: fixed;
* background-position: 100% 100%;
- * }
+ * }
* </PRE>
* <P>
* In the example above, the image is placed in the lower right corner of the
* canvas.
* @version $Revision$
- * @see CssBackgroundAttachment
+ * @see CssBackgroundAttachment
*/
-public class CssBackgroundPositionCSS2 extends CssProperty
+public class CssBackgroundPositionCSS2 extends CssProperty
implements CssBackgroundConstants, CssOperator {
-
+
CssValue first;
CssValue second;
-
+
/**
* Create a new CssBackgroundPositionCSS2
*/
public CssBackgroundPositionCSS2() {
first = DefaultValue0;
second = DefaultValue0;
- }
-
+ }
+
/**
* Creates a new CssBackgroundPositionCSS2
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssBackgroundPositionCSS2(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
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);
@@ -139,16 +139,16 @@
expression.next();
return;
}
-
- CssValue next = expression.getNextValue();
- if(val instanceof CssIdent) {
+ CssValue next = expression.getNextValue();
+
+ if(val instanceof CssIdent) {
int index1 = IndexOfIdent((String) val.get());
if(index1 == -1) {
throw new InvalidParamException("value", val, "background-position", ac);
}
// two keywords
- if(next instanceof CssIdent) {
+ if(next instanceof CssIdent) {
int index2 = IndexOfIdent((String) next.get());
if(index2 == -1 && check) {
throw new InvalidParamException("value", next, "background-position", ac);
@@ -158,24 +158,24 @@
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);
}
else {
first = val;
}
- }
+ }
// only one value
else if(next == null || !check) {
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);
}
}
@@ -200,19 +200,19 @@
}
}
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();
}
/*
- else if (val instanceof CssIdent
+ else if (val instanceof CssIdent
&& (index=IndexOfIdent((String) val.get())) != INVALID) {
CssValue next = expression.getNextValue();
expression.next();
@@ -230,10 +230,10 @@
getPercentageFromIdent(index, INVALID);
}
}
- else if (next instanceof CssLength ||
+ else if (next instanceof CssLength ||
next instanceof CssPercentage || next instanceof CssNumber) {
- if (next instanceof CssNumber) {
- next = ((CssNumber) next).getLength();
+ if (next instanceof CssNumber) {
+ next = ((CssNumber) next).getLength();
}
if(index == POSITION_LEFT || index == POSITION_RIGHT ||
index == POSITION_CENTER) {
@@ -243,31 +243,31 @@
throw new InvalidParamException("incompatible", val ,
next , ac);
}
- expression.next();
+ expression.next();
}
else {
throw new InvalidParamException("incompatible", val ,
next , ac);
}
- } else if (val instanceof CssLength ||
+ } else if (val instanceof CssLength ||
val instanceof CssPercentage || val instanceof CssNumber) {
if (val instanceof CssNumber) {
val = ((CssNumber) val).getLength();
}
- horizontal = val;
+ horizontal = val;
expression.next();
CssValue next = expression.getValue();
if(next != null && next.equals(inherit)) {
throw new InvalidParamException("unrecognize", ac);
}
System.out.println(next);
- if (next instanceof CssLength ||
+ if (next instanceof CssLength ||
next instanceof CssPercentage || next instanceof CssNumber) {
- if (next instanceof CssNumber) {
- next = ((CssNumber) next).getLength();
+ if (next instanceof CssNumber) {
+ next = ((CssNumber) next).getLength();
}
vertical = next;
- expression.next();
+ expression.next();
}
else if(next instanceof CssIdent) {
int index2 = IndexOfIdent((String) next.get());
@@ -281,31 +281,31 @@
horizontal, next, ac);
}
}
- else if(next != null) {
+ else if(next != null) {
throw new InvalidParamException("incompatible",
horizontal, val, ac);
- }
+ }
} else {
- throw new InvalidParamException("value", expression.getValue(),
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
- }*/
+ }*/
}
-
+
protected boolean isHorizontal(int index) {
return index == POSITION_LEFT || index == POSITION_RIGHT ||
index == POSITION_CENTER;
}
-
+
protected boolean isVertical(int index) {
return index == POSITION_TOP || index == POSITION_BOTTOM ||
index == POSITION_CENTER;
}
-
- public CssBackgroundPositionCSS2(ApplContext ac, CssExpression expression)
+
+ public CssBackgroundPositionCSS2(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* @return Returns the first.
*/
@@ -340,21 +340,21 @@
public Object get() {
return first;
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "background-position";
}
-
+
/**
* Returns the horizontal value of the position
*/
public CssValue getHorizontalPosition() {
return first;
}
-
+
/**
* Returns the vertical value of the position
*/
@@ -369,7 +369,7 @@
public boolean isSoftlyInherited() {
return first == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -416,13 +416,13 @@
style.addRedefinitionWarning(ac, this);
cssBackground.position = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getBackgroundPositionCSS2();
@@ -430,26 +430,26 @@
return ((Css1Style) style).cssBackgroundCSS2.position;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssBackgroundPositionCSS2 &&
+ return (property instanceof CssBackgroundPositionCSS2 &&
first.equals(((CssBackgroundPositionCSS2) property).first)
&& second.equals(((CssBackgroundPositionCSS2) property).second));
}
-
+
/**
* 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 first.equals(DefaultValue0) && second.equals(DefaultValue0);
}
-
+
protected int IndexOfIdent(String ident) {
int hash = ident.hashCode();
for (int i = 0; i < POSITION.length; i++)
@@ -457,14 +457,14 @@
return i;
return -1;
}
-
+
private static int[] hash_values;
-
+
//private static int INVALID = -1;
private static CssPercentage DefaultValue0 = new CssPercentage(0);
//private static CssPercentage DefaultValue50 = new CssPercentage(50);
//private static CssPercentage DefaultValue100 = new CssPercentage(100);
-
+
static {
hash_values = new int[POSITION.length];
for (int i = 0; i < POSITION.length; i++)
Index: CssClip.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssClip.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssClip.java 23 Aug 2005 16:23:12 -0000 1.1
+++ CssClip.java 14 Sep 2005 15:14:31 -0000 1.2
@@ -22,33 +22,33 @@
/**
*/
public class CssClip extends CssProperty {
-
+
CssValue value;
-
+
private static CssIdent auto = new CssIdent("auto");
-
+
/**
* Create a new CssClip
*/
public CssClip() {
value = auto;
- }
-
+ }
+
/**
* Create a new CssClip
*
* @param expression The expression for this property
* @exception InvalidParamException The expression is incorrect
- */
+ */
public CssClip(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)) {
value = inherit;
@@ -58,15 +58,15 @@
expression.next();
} else if (val instanceof CssFunction) {
CssFunction shape = (CssFunction) val;
- if (!shape.getName().equals("rect")) {
- throw new InvalidParamException("shape", expression.getValue(),
+ if (!shape.getName().equals("rect")) {
+ throw new InvalidParamException("shape", expression.getValue(),
getPropertyName(), ac);
}
CssExpression params = shape.getParameters();
int i = 0;
params.starts();
- if (params.getCount() != 4) {
- throw new InvalidParamException("shape", params.getValue(),
+ if (params.getCount() != 4) {
+ throw new InvalidParamException("shape", params.getValue(),
getPropertyName(), ac);
}
@@ -75,8 +75,8 @@
char op = params.getOperator();
if (i != 3) {
if (op != CssOperator.COMMA) {
- throw new InvalidParamException("shape-separator",
- params.getValue(),
+ throw new InvalidParamException("shape-separator",
+ params.getValue(),
getPropertyName(), ac);
}
}
@@ -84,8 +84,8 @@
isValidParameter(v, ac);
params.next();
} else {
- throw new InvalidParamException("shape",
- params.getValue(),
+ throw new InvalidParamException("shape",
+ params.getValue(),
getPropertyName(), ac);
}
i++;
@@ -94,31 +94,31 @@
value = val;
expression.next();
} else {
- throw new InvalidParamException("value", expression.getValue(),
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
-
+
}
-
- public CssClip(ApplContext ac, CssExpression expression)
+
+ public CssClip(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return value;
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "clip";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -126,14 +126,14 @@
public boolean isSoftlyInherited() {
return value == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -145,13 +145,13 @@
style0.addRedefinitionWarning(ac, this);
style0.cssClip = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getClip();
@@ -159,25 +159,25 @@
return ((Css1Style) style).cssClip;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssClip &&
+ return (property instanceof CssClip &&
value.equals(((CssClip) property).value));
}
-
+
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
- */
+ */
public boolean isDefault() {
return value == auto;
}
-
+
private void isValidParameter(CssValue val, ApplContext ac)
throws InvalidParamException {
if (val instanceof CssNumber) {
@@ -187,8 +187,8 @@
|| (val instanceof CssLength)) {
return;
}
- throw new InvalidParamException("shape",
- val,
+ throw new InvalidParamException("shape",
+ val,
getPropertyName(), ac);
}
}
Index: CssMarginBottom.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssMarginBottom.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssMarginBottom.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssMarginBottom.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -38,7 +38,7 @@
public CssMarginBottom() {
super();
}
-
+
/**
* Create a new CssMarginBottom with an another CssMarginSide
*
@@ -47,7 +47,7 @@
public CssMarginBottom(CssMarginSide another) {
super(another);
}
-
+
/**
* Create a new CssMarginBottom
*
@@ -58,15 +58,15 @@
throws InvalidParamException {
super(ac, expression);
}
-
+
public CssMarginBottom(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
super(ac, expression, check);
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "margin-bottom";
}
@@ -78,8 +78,9 @@
*/
public void addToStyle(ApplContext ac, CssStyle style) {
Css1Style style0 = (Css1Style) style;
- if (style0.cssMargin.bottom != null)
+ if (style0.cssMargin.bottom != null) {
style0.addRedefinitionWarning(ac, this);
+ }
style0.cssMargin.bottom = this;
}
@@ -88,7 +89,7 @@
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getMarginBottom();
@@ -101,9 +102,9 @@
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssMarginBottom &&
+ return (property instanceof CssMarginBottom &&
value.equals(((CssMarginBottom) property).value));
}
Index: CssBorderBottomWidth.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderBottomWidth.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderBottomWidth.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorderBottomWidth.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -44,14 +44,14 @@
public class CssBorderBottomWidth extends CssProperty {
CssBorderFaceWidth face;
-
+
/**
* Create a new CssBorderBottomWidth
*/
public CssBorderBottomWidth() {
face = new CssBorderFaceWidth();
}
-
+
/**
* Create a new CssBorderBottomWidth with an another CssBorderFaceWidth
*
@@ -62,7 +62,7 @@
face = another;
}
-
+
/**
* Create a new CssBorderBottomWidth
*
@@ -71,20 +71,20 @@
*/
public CssBorderBottomWidth(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
face = new CssBorderFaceWidth(ac, expression);
}
-
- public CssBorderBottomWidth(ApplContext ac, CssExpression expression)
+
+ public CssBorderBottomWidth(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
@@ -114,7 +114,7 @@
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "border-bottom-width";
}
@@ -149,7 +149,7 @@
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
return (property instanceof CssBorderBottomWidth && face.equals(((CssBorderBottomWidth) property).face));
}
Index: CssBoxOffsetFace.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBoxOffsetFace.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssBoxOffsetFace.java 23 Aug 2005 16:23:12 -0000 1.1
+++ CssBoxOffsetFace.java 14 Sep 2005 15:14:31 -0000 1.2
@@ -21,9 +21,9 @@
* @version $Revision$
*/
public abstract class CssBoxOffsetFace extends CssProperty {
-
+
CssValue value;
-
+
private static CssIdent auto = new CssIdent("auto");
/**
@@ -32,24 +32,24 @@
public CssBoxOffsetFace() {
value = auto;
}
-
+
/**
* Create a new CssBoxOffsetFace
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssBoxOffsetFace(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)) {
value = inherit;
expression.next();
@@ -66,30 +66,30 @@
value = auto;
expression.next();
} else {
- throw new InvalidParamException("value", val.toString(),
+ throw new InvalidParamException("value", val.toString(),
getPropertyName(), ac);
}
}
-
- public CssBoxOffsetFace(ApplContext ac, CssExpression expression)
+
+ public CssBoxOffsetFace(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return value;
}
-
+
/**
* Returns the internal CssValue value.
*/
public CssValue getValue() {
return value;
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -97,7 +97,7 @@
public boolean isSoftlyInherited() {
return value == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -107,27 +107,27 @@
}
return "";
}
-
+
/**
* Compares two sides for equality.
*
* @param side The other side.
- */
+ */
public boolean equals(CssBoxOffsetFace side) {
if(value != null) {
return value.equals(side.value);
}
return side == null;
}
-
+
/**
* Is this property contains a default value.
- */
+ */
public boolean isDefault() {
if (value != null && value != auto)
return ((Float) value.get()).floatValue() == 0;
else
return false;
}
-
+
}
Index: CssBorderStyleCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderStyleCSS2.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderStyleCSS2.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssBorderStyleCSS2.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -84,15 +84,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 CssBorderStyleCSS2 extends CssProperty implements CssOperator {
-
+
CssBorderTopStyleCSS2 top;
CssBorderBottomStyleCSS2 bottom;
CssBorderRightStyleCSS2 right;
CssBorderLeftStyleCSS2 left;
-
+
/**
* Create a new CssBorderStyleCSS2
*/
@@ -104,19 +104,19 @@
this.bottom = bottom;
this.left = left;
this.right = right;
- }
-
+ }
+
/**
* Create a new CssBorderStyleCSS2
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssBorderStyleCSS2(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
setByUser();
-
+
switch (expression.getCount()) {
case 1:
top = new CssBorderTopStyleCSS2(ac, expression);
@@ -126,7 +126,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)) {
@@ -142,7 +142,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)) {
@@ -150,7 +150,7 @@
}
top = new CssBorderTopStyleCSS2(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)) {
@@ -165,7 +165,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)) {
@@ -173,7 +173,7 @@
}
top = new CssBorderTopStyleCSS2(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)) {
@@ -181,7 +181,7 @@
}
right = new CssBorderRightStyleCSS2(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)) {
@@ -199,30 +199,30 @@
}
}
}
-
+
public CssBorderStyleCSS2(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.
*/
- public String toString() {
+ public String toString() {
if (right.face.equals(left.face)) {
if (top.face.equals(bottom.face)) {
if (top.face.equals(right.face)) {
@@ -237,11 +237,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.important = true;
@@ -256,7 +256,7 @@
bottom.important = true;
}
}
-
+
/**
* Returns true if this property is important.
* Overrides this method for a macro
@@ -267,14 +267,14 @@
(left == null || left.important) &&
(bottom == null || bottom.important));
}
-
+
/**
* 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) &&
@@ -294,9 +294,9 @@
if (bottom != null)
bottom.print(printer);
}
-
+
}
-
+
/**
* Set the context.
* Overrides this method for a macro
@@ -319,7 +319,7 @@
left.setSelectors(selector);
}
}
-
+
/**
* Add this property to the CssStyle
*
@@ -339,25 +339,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) {
@@ -373,14 +373,14 @@
bottom.setInfo(line, source);
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
return false; // FIXME
}
-
+
}
Index: CssBorderTopWidthCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderTopWidthCSS1.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderTopWidthCSS1.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssBorderTopWidthCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -44,16 +44,16 @@
* @version $Revision$
*/
public class CssBorderTopWidthCSS1 extends CssProperty {
-
+
CssBorderFaceWidthCSS1 face;
-
+
/**
* Create a new CssBorderTopWidth
*/
public CssBorderTopWidthCSS1() {
face = new CssBorderFaceWidthCSS1();
}
-
+
/**
* Create a new CssBorderTopWidth with an another CssBorderFaceWidth
*
@@ -61,10 +61,10 @@
*/
public CssBorderTopWidthCSS1(CssBorderFaceWidthCSS1 another) {
setByUser();
-
+
face = another;
}
-
+
/**
* Create a new CssBorderTopWidthCSS1
*
@@ -73,27 +73,27 @@
*/
public CssBorderTopWidthCSS1(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
face = new CssBorderFaceWidthCSS1(ac, expression);
}
-
+
public CssBorderTopWidthCSS1(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
*/
@@ -103,7 +103,7 @@
}
return null;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -113,14 +113,14 @@
}
return "";
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "border-top-width";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -134,13 +134,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 ((Css1Style) style).getBorderTopWidthCSS1();
@@ -148,15 +148,15 @@
return ((Css1Style) style).cssBorderCSS1.getTop().width;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
return (property instanceof CssBorderTopWidthCSS1 &&
face.equals(((CssBorderTopWidthCSS1) property).face));
}
-
+
}
Index: CssFont.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssFont.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssFont.java 8 Sep 2005 12:23:34 -0000 1.3
+++ CssFont.java 14 Sep 2005 15:14:31 -0000 1.4
@@ -72,48 +72,48 @@
* @see CssFontFamily
* @see CssPercentage
* @see CssLength
- * @version $Revision$
+ * @version $Revision$
*/
-public class CssFont extends CssProperty
+public class CssFont extends CssProperty
implements CssOperator, CssFontConstant {
-
+
CssValue value;
CssFontStyle fontStyle;
CssFontVariant fontVariant;
CssFontWeight fontWeight;
-
+
CssFontSize fontSize;
CssLineHeight lineHeight;
CssFontFamily fontFamily;
-
+
// internal hack for strings comparaison
private static int[] hash_values;
-
+
static CssIdent normal = new CssIdent("normal");
-
+
/**
* Create a new CssFont
*/
public CssFont() {
- }
-
+ }
+
/**
* Creates a new CssFont
*
* @param expression The expression for this property
* @exception InvalidParamException The expression is incorrect
- */
+ */
public CssFont(ApplContext ac, CssExpression expression,boolean check)
throws InvalidParamException {
-
+
CssValue val = expression.getValue();
char op = SPACE;
boolean find = true;
int max_values = 3;
-
+
int normalNb = 0;
-
+
if (val instanceof CssIdent) {
CssIdent ident = checkIdent((CssIdent) val);
if (ident != null) {
@@ -129,16 +129,16 @@
while (find && max_values-- > 0) {
find = false;
val = expression.getValue();
- op = expression.getOperator();
+ op = expression.getOperator();
if (val == null) {
throw new InvalidParamException("few-value", getPropertyName(), ac);
}
-
+
if(val.equals(inherit)) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
if(val.equals(normal)) {
normalNb++;
expression.next();
@@ -147,11 +147,11 @@
if (!find && fontStyle == null) {
try {
- fontStyle = new CssFontStyle(ac, expression);
+ fontStyle = new CssFontStyle(ac, expression);
find = true;
} catch (InvalidParamException e) {
}
- }
+ }
if (!find && fontVariant == null) {
try {
@@ -173,15 +173,15 @@
}
if (find && op != SPACE) {
- throw new InvalidParamException("operator",
+ throw new InvalidParamException("operator",
((new Character(op)).toString()), ac);
}
}
-
+
// "normal" values
CssExpression normalExpr = new CssExpression();
normalExpr.addValue(normal);
-
+
for(int i = 0; i < normalNb; i++) {
if (fontStyle == null) {
fontStyle = new CssFontStyle(ac, normalExpr);
@@ -198,51 +198,51 @@
}
val = expression.getValue();
- op = expression.getOperator();
-
+ op = expression.getOperator();
+
if (val == null) {
throw new InvalidParamException("few-value", getPropertyName(), ac);
}
-
+
if(val.equals(inherit)) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
fontSize = new CssFontSize(ac, expression);
-
+
if (op == SLASH) {
op = expression.getOperator();
if(expression.getValue().equals(inherit)) {
throw new InvalidParamException("unrecognize", ac);
}
lineHeight = new CssLineHeight(ac, expression);
- }
-
+ }
+
if(expression.getValue().equals(inherit)) {
throw new InvalidParamException("unrecognize", ac);
}
- if (op == SPACE && expression.getValue() != null) {
+ if (op == SPACE && expression.getValue() != null) {
fontFamily = new CssFontFamily(ac, expression, true);
} else {
expression.starts();
throw new InvalidParamException("few-value", expression.toString(), ac);
- }
+ }
setByUser();
}
-
+
public CssFont(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return null;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -272,11 +272,11 @@
return ret.substring(1);
}
}
-
+
/**
* Set this property to be important.
* Overrides this method for a macro
- */
+ */
public void setImportant() {
super.setImportant();
if (value == null) {
@@ -294,7 +294,7 @@
fontFamily.important = true;
}
}
-
+
/**
* Returns true if this property is important.
* Overrides this method for a macro
@@ -311,14 +311,14 @@
(fontFamily == null || fontFamily.important));
}
}
-
+
/**
* Print this property.
*
* @param printer The printer
* @see #toString()
* @see #getPropertyName()
- */
+ */
public void print(CssPrinterStyle printer) {
if (value != null) {
printer.print(this);
@@ -353,9 +353,9 @@
((fontFamily.isSoftlyInherited()) || (fontFamily.size() != 0))) {
fontFamily.print(printer);
}
- }
+ }
}
-
+
/**
* Add this property to the CssStyle
*
@@ -379,14 +379,14 @@
fontFamily.addToStyle(ac, style);
}
}
-
+
/**
* 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 (value == null) {
@@ -404,16 +404,16 @@
fontFamily.setInfo(line, source);
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
return false;
}
-
+
/**
* Set the context.
* Overrides this method for a macro
@@ -442,13 +442,13 @@
fontFamily.setSelectors(selector);
}
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getFont();
@@ -456,7 +456,7 @@
return ((Css1Style) style).cssFont;
}
}
-
+
/**
* Returns the name of this property
*/
@@ -471,7 +471,7 @@
return ident;
}
}
-
+
return null;
}
Index: CssRight.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssRight.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssRight.java 23 Aug 2005 16:23:12 -0000 1.1
+++ CssRight.java 14 Sep 2005 15:14:31 -0000 1.2
@@ -23,7 +23,7 @@
public CssRight() {
super();
}
-
+
/**
* Create a new CssRight
*
@@ -34,15 +34,15 @@
throws InvalidParamException {
super(ac, expression, check);
}
-
- public CssRight(ApplContext ac, CssExpression expression)
+
+ public CssRight(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "right";
}
@@ -64,7 +64,7 @@
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getRight();
@@ -77,9 +77,9 @@
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssRight &&
+ return (property instanceof CssRight &&
value.equals(((CssRight) property).value));
}
Index: CssBorderLeft.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderLeft.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderLeft.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorderLeft.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -77,11 +77,11 @@
if(check &&expression.getCount() > 4) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
boolean manyValues = (expression.getCount() > 1);
-
+
while (find) {
find = false;
val = expression.getValue();
@@ -94,7 +94,7 @@
if(manyValues && val.equals(inherit)) {
throw new InvalidParamException("unrecognize", null, null, ac);
}
-
+
if (op != SPACE)
throw new InvalidParamException("operator",
((new Character(op)).toString()),
@@ -149,11 +149,11 @@
*/
}
- public CssBorderLeft(ApplContext ac, CssExpression expression)
+ public CssBorderLeft(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
@@ -245,7 +245,7 @@
color.important = true;
}
}
-
+
/**
* Returns true if this property is important.
* Overrides this method for a macro
@@ -288,7 +288,7 @@
*
* @param style The CssStyle
*/
- public void addToStyle(ApplContext ac, CssStyle style) {
+ public void addToStyle(ApplContext ac, CssStyle style) {
if(width != null) {
width.addToStyle(ac, style);
}
@@ -322,7 +322,7 @@
* @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);
}
@@ -333,7 +333,7 @@
color.setInfo(line, source);
}
}
-
+
/**
* Set the context.
* Overrides this method for a macro
Index: CssProperties.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssProperties.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssProperties.java 23 Aug 2005 16:23:12 -0000 1.1
+++ CssProperties.java 14 Sep 2005 15:14:31 -0000 1.2
@@ -15,16 +15,16 @@
*/
public class CssProperties {
public static Utf8Properties properties;
-
+
public static String getString(CssProperty property, String prop) {
StringBuffer st = new StringBuffer(property.getPropertyName());
return properties.getProperty(st.append('.').append(prop).toString());
}
-
+
public static boolean getInheritance(CssProperty property) {
return getString(property, "inherited").equals("true");
}
-
+
static {
properties = new Utf8Properties();
try {
Index: CssLetterSpacing.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssLetterSpacing.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssLetterSpacing.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssLetterSpacing.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -48,10 +48,10 @@
* When the resultant space between two letters is not the same as the default
* space, UAs should not use ligatures.
*
- * @version $Revision$
+ * @version $Revision$
*/
public class CssLetterSpacing extends CssProperty {
-
+
CssValue length;
static CssIdent normal = new CssIdent("normal");
@@ -60,23 +60,23 @@
*/
public CssLetterSpacing() {
length = normal;
- }
-
+ }
+
/**
* Create a new CssLetterSpacing
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssLetterSpacing(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 CssLength) {
length = (CssLength) val;
@@ -91,27 +91,27 @@
length = normal;
expression.next();
} else {
- throw new InvalidParamException("value",
- expression.getValue(),
+ throw new InvalidParamException("value",
+ expression.getValue(),
getPropertyName(), ac);
}
}
-
+
public CssLetterSpacing(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return length;
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "letter-spacing";
}
@@ -123,14 +123,14 @@
public boolean isSoftlyInherited() {
return length == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return length.toString();
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -142,13 +142,13 @@
style0.addRedefinitionWarning(ac, this);
style0.cssLetterSpacing = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getLetterSpacing();
@@ -156,15 +156,15 @@
return ((Css1Style) style).cssLetterSpacing;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssLetterSpacing &&
+ return (property instanceof CssLetterSpacing &&
length.equals(((CssLetterSpacing) property).length));
}
-
+
}
Index: CssListStylePosition.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssListStylePosition.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssListStylePosition.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssListStylePosition.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -28,35 +28,35 @@
* drawn with regard to the content. For a formatting example see
* @version $Revision$
*/
-public class CssListStylePosition extends CssProperty
+public class CssListStylePosition extends CssProperty
implements CssListStyleConstants {
-
+
int value;
-
+
/**
* Create a new CssListStylePosition
*/
public CssListStylePosition() {
// nothing to do
- }
-
+ }
+
/**
* Create a new CssListStylePosition
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssListStylePosition(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 < LISTSTYLEPOSITION.length; i++)
@@ -73,22 +73,22 @@
throws InvalidParamException {
this(ac, expression, false);
}
-
-
+
+
/**
* Returns the value of this property
*/
public Object get() {
return LISTSTYLEPOSITION[value];
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "list-style-position";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -96,14 +96,14 @@
public boolean isSoftlyInherited() {
return value == (LISTSTYLEPOSITION.length - 1);
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return LISTSTYLEPOSITION[value];
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -115,13 +115,13 @@
style.addRedefinitionWarning(ac, this);
cssListStyle.listStylePosition = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getListStylePosition();
@@ -129,27 +129,27 @@
return ((Css1Style) style).cssListStyle.listStylePosition;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssListStylePosition &&
+ return (property instanceof CssListStylePosition &&
((CssListStylePosition) property).value == value);
}
-
+
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
- */
+ */
public boolean isDefault() {
return value == 0;
}
-
+
private static int[] hash_values;
-
+
static {
hash_values = new int[LISTSTYLEPOSITION.length];
for (int i = 0; i < LISTSTYLEPOSITION.length; i++)
Index: CssFontStretchCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssFontStretchCSS2.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssFontStretchCSS2.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssFontStretchCSS2.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -15,35 +15,35 @@
/**
*
* @see CssFont
- * @version $Revision$
+ * @version $Revision$
*/
public class CssFontStretchCSS2 extends CssProperty implements CssFontConstantCSS2 {
-
+
int value;
-
+
private static int[] hash_values;
-
+
/**
* Create a new CssFontStretch
*/
public CssFontStretchCSS2() {
// nothing to do
}
-
+
/**
* Creates a new CssFontStretch
*
* @param expression the font stretch
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssFontStretchCSS2(ApplContext ac, CssExpression expression,
- boolean check)
+ boolean check)
throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
if (expression.getValue() instanceof CssIdent) {
int hash = expression.getValue().hashCode();
@@ -54,23 +54,23 @@
return;
}
}
-
- throw new InvalidParamException("value", expression.getValue(),
+
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
-
+
public CssFontStretchCSS2(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value
- */
+ */
public Object get() {
return FONTSTRETCH[value];
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -78,21 +78,21 @@
public boolean isSoftlyInherited() {
return value == FONTSTRETCH.length - 1;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return FONTSTRETCH[value];
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "font-stretch";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -104,13 +104,13 @@
style0.addRedefinitionWarning(ac, this);
style0.cssFontStretchCSS2 = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getFontStretchCSS2();
@@ -118,25 +118,25 @@
return ((Css1Style) style).cssFontStretchCSS2;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssFontStretchCSS2 &&
+ return (property instanceof CssFontStretchCSS2 &&
((CssFontStretchCSS2) property).value == value);
}
-
+
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
- */
+ */
public boolean isDefault() {
return value == 0;
}
-
+
static {
hash_values = new int[FONTSTRETCH.length];
for (int i=0;i<FONTSTRETCH.length;i++)
Index: CssBorderFaceStyleCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderFaceStyleCSS1.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderFaceStyleCSS1.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorderFaceStyleCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -16,22 +16,22 @@
* @version $Revision$
*/
public class CssBorderFaceStyleCSS1 {
-
+
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 CssBorderFaceStyleCSS1
*/
public CssBorderFaceStyleCSS1() {
// nothing to do
- }
-
+ }
+
/**
* Create a new CssBorderFaceStyleCSS1 with an another CssBorderFaceStyle
*
@@ -40,23 +40,23 @@
public CssBorderFaceStyleCSS1(CssBorderFaceStyleCSS1 another) {
value = another.value;
}
-
+
/**
* Create a new CssBorderFaceStyleCSS1
*
* @param expression The expression for this face
* @param check true will test the number of parameters
* @exception InvalidParamException The expression is incorrect
- */
+ */
public CssBorderFaceStyleCSS1(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,21 +66,21 @@
return;
}
}
-
+
throw new InvalidParamException("value", val.toString(), "style", ac);
}
-
+
/**
* Create a new CssBorderFaceStyleCSS1
*
* @param check true will test the number of parameters
* @exception InvalidParamException The expression is incorrect
- */
+ */
public CssBorderFaceStyleCSS1(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -88,34 +88,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(CssBorderFaceStyleCSS1 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: CssVisibility.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssVisibility.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssVisibility.java 23 Aug 2005 16:23:12 -0000 1.1
+++ CssVisibility.java 14 Sep 2005 15:14:31 -0000 1.2
@@ -18,36 +18,36 @@
/**
*/
public class CssVisibility extends CssProperty {
-
+
CssValue value;
-
+
private static CssIdent visible = new CssIdent("visible");
private static CssIdent hidden = new CssIdent("hidden");
private static CssIdent collapse = new CssIdent("collapse");
private static CssIdent auto = new CssIdent("auto");
-
+
/**
* Create a new CssVisibility
*/
public CssVisibility() {
value = visible;
- }
-
+ }
+
/**
* Create a new CssVisibility
*
* @param expression The expression for this property
* @exception InvalidParamException The expression is incorrect
- */
+ */
public CssVisibility(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)) {
value = inherit;
@@ -65,31 +65,31 @@
value = auto;
expression.next();
} else {
- throw new InvalidParamException("value", expression.getValue(),
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
-
+
}
-
+
public CssVisibility(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return value;
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "visibility";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -97,14 +97,14 @@
public boolean isSoftlyInherited() {
return value == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -116,13 +116,13 @@
style0.addRedefinitionWarning(ac, this);
style0.cssVisibility = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getVisibility();
@@ -130,23 +130,23 @@
return ((Css1Style) style).cssVisibility;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssVisibility &&
+ return (property instanceof CssVisibility &&
value.equals(((CssVisibility) property).value));
}
-
+
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
- */
+ */
public boolean isDefault() {
return value == visible;
}
-
+
}
Index: CssBorderRightStyleCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderRightStyleCSS1.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderRightStyleCSS1.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssBorderRightStyleCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -16,18 +16,18 @@
* @version $Revision$
*/
public class CssBorderRightStyleCSS1 extends CssProperty {
-
+
CssBorderFaceStyleCSS1 face;
-
+
/**
* Create a new CssBorderRightStyleCSS1
*/
public CssBorderRightStyleCSS1() {
setByUser();
-
+
face = new CssBorderFaceStyleCSS1();
}
-
+
/**
* Create a new CssBorderRightStyle with an another CssBorderFaceStyle
*
@@ -35,10 +35,10 @@
*/
public CssBorderRightStyleCSS1(CssBorderFaceStyleCSS1 another) {
setByUser();
-
+
face = another;
}
-
+
/**
* Create a new CssBorderRightStyleCSS1
*
@@ -47,28 +47,28 @@
*/
public CssBorderRightStyleCSS1(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
-
+
face = new CssBorderFaceStyleCSS1(ac, expression);
}
-
+
public CssBorderRightStyleCSS1(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression,false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return face;
}
-
+
/**
* Returns the value
*/
@@ -81,7 +81,7 @@
}
return null;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -91,14 +91,14 @@
}
return "";
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "border-right-style";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -110,13 +110,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 ((Css1Style) style).getBorderRightStyleCSS1();
@@ -124,15 +124,15 @@
return ((Css1Style) style).cssBorderCSS1.getRight().style;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssBorderRightStyleCSS1 &&
+ return (property instanceof CssBorderRightStyleCSS1 &&
face.equals(((CssBorderRightStyleCSS1) property).face));
}
-
+
}
Index: CssBackgroundAttachmentMob.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBackgroundAttachmentMob.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBackgroundAttachmentMob.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBackgroundAttachmentMob.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -28,7 +28,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;
@@ -36,37 +36,37 @@
* </PRE>
* @version $Revision$
*/
-public class CssBackgroundAttachmentMob extends CssProperty
+public class CssBackgroundAttachmentMob extends CssProperty
implements CssBackgroundConstants {
-
+
int attachment;
-
+
private static int[] hash_values;
-
+
/**
* Create a new CssBackgroundAttachmentMob
*/
public CssBackgroundAttachmentMob() {
// nothing to do
- }
-
+ }
+
/**
* Creates a new CssBackgroundAttachmentMob
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssBackgroundAttachmentMob(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++)
@@ -76,23 +76,23 @@
return;
}
}
-
- throw new InvalidParamException("value", expression.getValue(),
+
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
-
- public CssBackgroundAttachmentMob(ApplContext ac, CssExpression expression)
+
+ public CssBackgroundAttachmentMob(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
@@ -100,21 +100,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.
*
@@ -126,13 +126,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 ((Css1Style) style).getBackgroundAttachmentMob();
@@ -140,25 +140,25 @@
return ((Css1Style) style).cssBackgroundMob.attachment;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssBackgroundAttachmentMob &&
+ return (property instanceof CssBackgroundAttachmentMob &&
attachment == ((CssBackgroundAttachmentMob) 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: CssBottom.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBottom.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssBottom.java 23 Aug 2005 16:23:12 -0000 1.1
+++ CssBottom.java 14 Sep 2005 15:14:31 -0000 1.2
@@ -16,37 +16,37 @@
/**
*/
public class CssBottom extends CssBoxOffsetFace {
-
+
/**
* Create a new CssBottom
*/
public CssBottom() {
super();
}
-
+
/**
* Create a new CssBottom
*
* @param expression The expression for this property.
* @exception InvalidParamException Values are incorrect
*/
- public CssBottom(ApplContext ac, CssExpression expression)
+ public CssBottom(ApplContext ac, CssExpression expression)
throws InvalidParamException {
super(ac, expression);
}
-
+
public CssBottom(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
super(ac, expression, check);
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "bottom";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -58,13 +58,13 @@
style0.addRedefinitionWarning(ac, this);
style0.cssBottom = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getBottom();
@@ -72,15 +72,15 @@
return ((Css1Style) style).getBottom();
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssBottom &&
+ return (property instanceof CssBottom &&
value.equals(((CssBottom) property).value));
}
-
+
}
Index: CssFontVariantCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssFontVariantCSS2.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssFontVariantCSS2.java 8 Sep 2005 12:23:34 -0000 1.3
+++ CssFontVariantCSS2.java 14 Sep 2005 15:14:31 -0000 1.4
@@ -47,32 +47,32 @@
*
* @see CssFont
* @see TextTransform
- * @version $Revision$
+ * @version $Revision$
*/
public class CssFontVariantCSS2 extends CssProperty implements CssFontConstantCSS2 {
-
+
int value;
-
+
/**
* Create a new CssFontVariantCSS2
*/
public CssFontVariantCSS2() {
// nothing to do
}
-
+
/**
* Creates a new CssFontVariantCSS2
*
* @param expression the font variant
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssFontVariantCSS2(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
if (expression.getValue() instanceof CssIdent) {
int hash = expression.getValue().hashCode();
@@ -83,23 +83,23 @@
return;
}
}
-
- throw new InvalidParamException("value", expression.getValue(),
+
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
-
+
public CssFontVariantCSS2(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value
- */
+ */
public Object get() {
return FONTVARIANT[value];
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -107,39 +107,39 @@
public boolean isSoftlyInherited() {
return value == FONTVARIANT.length - 1;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return FONTVARIANT[value];
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "font-variant";
}
-
+
/**
* Add this property to the CssStyle.
*
* @param style The CssStyle
*/
- public void addToStyle(ApplContext ac, CssStyle style) {
+ public void addToStyle(ApplContext ac, CssStyle style) {
CssFontCSS2 cssFont = ((Css1Style) style).cssFontCSS2;
if (cssFont.fontVariant != null)
style.addRedefinitionWarning(ac, this);
cssFont.fontVariant = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getFontVariantCSS2();
@@ -147,27 +147,27 @@
return ((Css1Style) style).cssFontCSS2.fontVariant;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssFontVariantCSS2 &&
+ return (property instanceof CssFontVariantCSS2 &&
((CssFontVariantCSS2) property).value == value);
}
-
+
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
- */
+ */
public boolean isDefault() {
return value == 0;
}
-
+
private static int[] hash_values;
-
+
static {
hash_values = new int[FONTVARIANT.length];
for (int i=0;i<FONTVARIANT.length;i++)
Index: CssMarkerOffsetATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssMarkerOffsetATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssMarkerOffsetATSC.java 23 Aug 2005 16:23:12 -0000 1.1
+++ CssMarkerOffsetATSC.java 14 Sep 2005 15:14:31 -0000 1.2
@@ -20,31 +20,31 @@
/**
*/
public class CssMarkerOffsetATSC extends CssProperty {
-
+
CssValue value;
-
+
private static CssIdent auto = new CssIdent("auto");
-
+
/**
* Create a new CssMarkerOffsetATSC
*/
public CssMarkerOffsetATSC() {
value = auto;
- }
-
+ }
+
/**
* Create a new CssMarkerOffsetATSC
*
* @param expression The expression for this property
* @exception InvalidParamException The expression is incorrect
- */
+ */
public CssMarkerOffsetATSC(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
setByUser();
@@ -60,32 +60,32 @@
} else if (val instanceof CssNumber) {
value = ((CssNumber) val).getLength();
} else {
- throw new InvalidParamException("value", expression.getValue(),
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
-
+
expression.next();
}
-
+
public CssMarkerOffsetATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return value;
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "marker-offset";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -93,14 +93,14 @@
public boolean isSoftlyInherited() {
return value == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -112,13 +112,13 @@
style0.addRedefinitionWarning(ac, this);
style0.cssMarkerOffsetATSC = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getMarkerOffsetATSC();
@@ -126,23 +126,23 @@
return ((Css1Style) style).cssMarkerOffsetATSC;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssMarkerOffsetATSC &&
+ return (property instanceof CssMarkerOffsetATSC &&
value.equals(((CssMarkerOffsetATSC) property).value));
}
-
+
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
- */
+ */
public boolean isDefault() {
return value == auto;
}
-
+
}
Index: CssBorderFaceColor.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderFaceColor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderFaceColor.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorderFaceColor.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -53,13 +53,13 @@
*/
public CssBorderFaceColor(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.CssColor) {
face = val;
} else if (val.equals(CssProperty.inherit)) {
@@ -74,14 +74,14 @@
throw new InvalidParamException("value", val.toString(),
"border-color", ac);
}
- expression.next();
+ expression.next();
}
- public CssBorderFaceColor(ApplContext ac, CssExpression expression)
+ public CssBorderFaceColor(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the internal color
*/
Index: CssTextShadowATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssTextShadowATSC.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssTextShadowATSC.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssTextShadowATSC.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -19,37 +19,37 @@
/**
* @version $Revision$
*/
-public class CssTextShadowATSC extends CssProperty
+public class CssTextShadowATSC extends CssProperty
implements CssTextPropertiesConstants {
-
+
CssValue value;
Vector faces = new Vector();
private static CssIdent none = new CssIdent("none");
-
+
/**
* Create a new CssTextShadowATSC
*/
public CssTextShadowATSC() {
value = none;
- }
-
+ }
+
/**
* Create a new CssTextShadowATSC
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssTextShadowATSC(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
CssValue val = expression.getValue();
-
+
setByUser();
int count = expression.getCount();
-
+
ac.getFrame().addWarning("atsc", val.toString());
if (val.equals(none)) {
@@ -80,14 +80,14 @@
}
}
val = null;
-
+
}
-
- public CssTextShadowATSC(ApplContext ac, CssExpression expression)
+
+ public CssTextShadowATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
@@ -97,14 +97,14 @@
}
return faces.elementAt(0);
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "text-shadow";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -112,7 +112,7 @@
public boolean isSoftlyInherited() {
return value == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -124,13 +124,13 @@
int l = faces.size();
String ret = "";
while (i != l) {
- ret += new Character(CssOperator.COMMA)
+ ret += new Character(CssOperator.COMMA)
+ " " + faces.elementAt(i++);
}
return ret.substring(2);
}
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -143,13 +143,13 @@
}
style0.cssTextShadowATSC = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getTextShadowATSC();
@@ -157,12 +157,12 @@
return ((Css1Style) style).cssTextShadowATSC;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
// @@ FIXME
return false;
Index: CssFontVariantCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssFontVariantCSS1.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssFontVariantCSS1.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssFontVariantCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -47,33 +47,33 @@
*
* @see CssFont
* @see TextTransform
- * @version $Revision$
+ * @version $Revision$
*/
public class CssFontVariantCSS1 extends CssProperty implements CssFontConstantCSS1 {
-
+
int value;
-
+
/**
* Create a new CssFontVariantCSS1
*/
public CssFontVariantCSS1() {
// nothing to do
}
-
+
/**
* Creates a new CssFontVariantCSS1
*
* @param expression the font variant
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssFontVariantCSS1(ApplContext ac, CssExpression expression,
- boolean check)
+ boolean check)
throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
if (expression.getValue() instanceof CssIdent) {
int hash = expression.getValue().hashCode();
@@ -84,23 +84,23 @@
return;
}
}
-
- throw new InvalidParamException("value", expression.getValue(),
+
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
-
+
public CssFontVariantCSS1(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the current value
- */
+ */
public Object get() {
return FONTVARIANT[value];
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -108,21 +108,21 @@
public boolean isSoftlyInherited() {
return value == FONTVARIANT.length - 1;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return FONTVARIANT[value];
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "font-variant";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -134,13 +134,13 @@
style.addRedefinitionWarning(ac, this);
cssFont.fontVariant = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getFontVariantCSS1();
@@ -148,27 +148,27 @@
return ((Css1Style) style).cssFontCSS1.fontVariant;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssFontVariantCSS1 &&
+ return (property instanceof CssFontVariantCSS1 &&
((CssFontVariantCSS1) property).value == value);
}
-
+
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
- */
+ */
public boolean isDefault() {
return value == 0;
}
-
+
private static int[] hash_values;
-
+
static {
hash_values = new int[FONTVARIANT.length];
for (int i=0;i<FONTVARIANT.length;i++)
Index: CssBorderFaceWidthCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderFaceWidthCSS1.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderFaceWidthCSS1.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorderFaceWidthCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -18,16 +18,16 @@
* @version $Revision$
*/
public class CssBorderFaceWidthCSS1 {
-
+
CssValue value;
-
+
/**
* Create a new CssBorderFaceWidthCSS1
*/
public CssBorderFaceWidthCSS1() {
value = medium;
}
-
+
/**
* Create a new CssBorderFaceWidthCSS1 from an another CssBorderFaceWidthCSS1
*
@@ -36,7 +36,7 @@
public CssBorderFaceWidthCSS1(CssBorderFaceWidthCSS1 another) {
value = another.value;
}
-
+
/**
* Create a new CssBorderFaceWidth
*
@@ -45,16 +45,16 @@
*/
public CssBorderFaceWidthCSS1(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);
@@ -71,45 +71,45 @@
} else {
throw new InvalidParamException("value", val.toString(), "width", ac);
}
-
+
expression.next();
- }
-
- public CssBorderFaceWidthCSS1(ApplContext ac, CssExpression expression)
+ }
+
+ public CssBorderFaceWidthCSS1(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() {
if(value != null) {
return value.toString();
}
return "";
}
-
+
/**
* Compares two sides for equality.
*
* @param value The another side.
- */
+ */
public boolean equals(CssBorderFaceWidthCSS1 another) {
return value.equals(another.value); // FIXME
}
-
+
private static CssIdent thin = new CssIdent("thin");
private static CssIdent medium = new CssIdent("medium");
private static CssIdent thick = new CssIdent("thick");
-
+
}
Index: CssBorderBottomColorCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderBottomColorCSS1.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderBottomColorCSS1.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorderBottomColorCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -20,14 +20,14 @@
public class CssBorderBottomColorCSS1 extends CssProperty {
CssBorderFaceColorCSS1 face;
-
+
/**
* Create a new CssBorderBottomColorCSS1
*/
public CssBorderBottomColorCSS1() {
face = new CssBorderFaceColorCSS1();
}
-
+
/**
* Create a new CssBorderBottomColor with an another CssBorderFaceColor
*
@@ -39,7 +39,7 @@
face = another;
}
-
+
/**
* Create a new CssBorderBottomColor
*
@@ -48,7 +48,7 @@
*/
public CssBorderBottomColorCSS1(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
@@ -56,12 +56,12 @@
setByUser();
face = new CssBorderFaceColorCSS1(ac, expression);
}
-
- public CssBorderBottomColorCSS1(ApplContext ac, CssExpression expression)
+
+ public CssBorderBottomColorCSS1(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
@@ -91,7 +91,7 @@
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "border-bottom-color";
}
@@ -113,7 +113,7 @@
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getBorderBottomColorCSS1();
@@ -126,7 +126,7 @@
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
return (property instanceof CssBorderBottomColorCSS1 && face.equals(((CssBorderBottomColorCSS1) property).face));
}
@@ -137,7 +137,7 @@
* @param printer The printer.
* @see #toString()
* @see #getPropertyName()
- */
+ */
public void print(CssPrinterStyle printer) {
if (face != null && !face.isDefault())
printer.print(this);
Index: CssBorderLeftStyle.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderLeftStyle.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderLeftStyle.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorderLeftStyle.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -16,16 +16,16 @@
* @version $Revision$
*/
public class CssBorderLeftStyle extends CssProperty {
-
+
CssBorderFaceStyle face;
-
+
/**
* Create a new CssBorderLeftStyle
*/
public CssBorderLeftStyle() {
face = new CssBorderFaceStyle();
}
-
+
/**
* Create a new CssBorderLeftStyle with an another CssBorderFaceStyle
*
@@ -33,10 +33,10 @@
*/
public CssBorderLeftStyle(CssBorderFaceStyle another) {
setByUser();
-
+
face = another;
}
-
+
/**
* Create a new CssBorderLeftStyle
*
@@ -45,27 +45,27 @@
*/
public CssBorderLeftStyle(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
face = new CssBorderFaceStyle(ac, expression);
}
-
- public CssBorderLeftStyle(ApplContext ac, CssExpression expression)
+
+ public CssBorderLeftStyle(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return face;
}
-
+
/**
* Returns the value
*/
@@ -75,7 +75,7 @@
}
return null;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -85,14 +85,14 @@
}
return "";
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "border-left-style";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -104,13 +104,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 ((Css1Style) style).getBorderLeftStyle();
@@ -118,14 +118,14 @@
return ((Css1Style) style).cssBorder.getLeft().style;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
return (property instanceof CssBorderLeftStyle && face.equals(((CssBorderLeftStyle) property).face));
}
-
+
}
Index: CssWidthMob.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssWidthMob.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssWidthMob.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssWidthMob.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -43,41 +43,41 @@
* @version $Revision$
*/
public class CssWidthMob extends CssProperty {
-
+
CssValue value;
-
+
private static CssIdent auto = new CssIdent("auto");
-
+
/**
* Create a new CssWidthMob
*/
public CssWidthMob() {
value = auto;
- }
-
+ }
+
/**
* Create a new CssWidthMob
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssWidthMob(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)) {
value = inherit;
} else if (val instanceof CssLength) {
float f = ((Float) val.get()).floatValue();
if (f < 0) {
- throw new InvalidParamException("negative-value",
+ throw new InvalidParamException("negative-value",
val.toString(), ac);
}
value = val;
@@ -86,32 +86,32 @@
} else if (val instanceof CssNumber) {
value = ((CssNumber) val).getLength();
} else {
- throw new InvalidParamException("value", val,
+ throw new InvalidParamException("value", val,
getPropertyName(), ac);
}
-
+
expression.next();
}
-
+
public CssWidthMob(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property.
*/
public Object get() {
return value;
}
-
+
/**
* Returns the name of this property.
- */
+ */
public String getPropertyName() {
return "width";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -119,15 +119,15 @@
public boolean isSoftlyInherited() {
return value == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
-
+
+
/**
* Add this property to the CssStyle.
*
@@ -139,13 +139,13 @@
style0.addRedefinitionWarning(ac, this);
style0.cssWidthMob = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getWidthMob();
@@ -153,22 +153,22 @@
return ((Css1Style) style).cssWidthMob;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
return (property instanceof CssWidthMob && value.equals(((CssWidthMob) property).value));
}
-
+
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
- */
+ */
public boolean isDefault() {
return value == auto;
}
-
+
}
Index: CssBackgroundCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBackgroundCSS2.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- CssBackgroundCSS2.java 8 Sep 2005 12:23:33 -0000 1.5
+++ CssBackgroundCSS2.java 14 Sep 2005 15:14:31 -0000 1.6
@@ -50,11 +50,11 @@
* @see CssBackgroundImage
* @see CssBackgroundRepeat
* @see CssBackgroundAttachment
- * @see CssBackgroundPosition
+ * @see CssBackgroundPosition
*/
-public class CssBackgroundCSS2 extends CssProperty
+public class CssBackgroundCSS2 extends CssProperty
implements CssOperator, CssBackgroundConstants {
-
+
CssBackgroundColorCSS2 color;
CssBackgroundImageCSS2 image;
CssBackgroundRepeatCSS2 repeat;
@@ -67,44 +67,44 @@
* Create a new CssBackgroundCSS2
*/
public CssBackgroundCSS2() {
- }
-
+ }
+
/**
* Set the value of the property
*
* @param expression The expression for this property
* @exception InvalidParamException The expression is incorrect
- */
+ */
public CssBackgroundCSS2(ApplContext ac, CssExpression expression,
- boolean check) throws InvalidParamException {
+ 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();
op = expression.getOperator();
-
+
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 CssBackgroundColorCSS2(ac, expression);
@@ -122,10 +122,10 @@
}
}
if (!find && repeat == null) {
- try {
- repeat = new CssBackgroundRepeatCSS2(ac, expression);
+ try {
+ repeat = new CssBackgroundRepeatCSS2(ac, expression);
find = true;
- } catch (InvalidParamException e) {
+ } catch (InvalidParamException e) {
// nothing to do, attachment will test this value
}
}
@@ -145,11 +145,11 @@
// nothing to do
}
}
- 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);
}
@@ -170,12 +170,12 @@
position = new CssBackgroundPositionCSS2();
*/
}
-
- public CssBackgroundCSS2(ApplContext ac, CssExpression expression)
+
+ public CssBackgroundCSS2(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
- }
-
+ }
+
/**
* @return Returns the attachment.
*/
@@ -238,7 +238,7 @@
public final CssBackgroundColorCSS2 getColor2() {
return color;
}
-
+
/**
* @param color The color to set.
*/
@@ -266,7 +266,7 @@
public Object get() {
return color;
}
-
+
/**
* Returns the color
*/
@@ -277,14 +277,14 @@
return color.getColor();
}
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "background";
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -337,11 +337,11 @@
*/
//}
}
-
+
/**
* Set this property to be important.
* Overrides this method for a macro
- */
+ */
public void setImportant() {
if(color != null) {
color.important = true;
@@ -359,7 +359,7 @@
position.important = true;
}
}
-
+
/**
* Returns true if this property is important.
* Overrides this method for a macro
@@ -371,14 +371,14 @@
(attachment == null || attachment.important) &&
(position == null || position.important));
}
-
+
/**
* 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 &&
@@ -389,7 +389,7 @@
!repeat.important &&
!attachment.important &&
!position.important))) {
- if (color.byUser || image.byUser || repeat.byUser
+ if (color.byUser || image.byUser || repeat.byUser
|| attachment.byUser || position.byUser) {
printer.print(this);
}
@@ -404,9 +404,9 @@
attachment.print(printer);
if (position != null)
position.print(printer);
- }
+ }
}
-
+
/**
* Set the context.
* Overrides this method for a macro
@@ -432,7 +432,7 @@
position.setSelectors(selector);
}
}
-
+
/**
* Add this property to the CssStyle
*
@@ -441,7 +441,7 @@
public void addToStyle(ApplContext ac, CssStyle style) {
((Css1Style) style).cssBackgroundCSS2.same = same;
((Css1Style) style).cssBackgroundCSS2.byUser = byUser;
-
+
if(color != null) {
color.addToStyle(ac, style);
}
@@ -456,15 +456,15 @@
}
if(position != null) {
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 ((Css1Style) style).getBackgroundCSS2();
@@ -472,23 +472,23 @@
return ((Css1Style) style).cssBackgroundCSS2;
}
}
-
+
/**
* 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) {
@@ -507,5 +507,5 @@
position.setInfo(line, source);
}
}
-
+
}
Index: CssFontFamily.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssFontFamily.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssFontFamily.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssFontFamily.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -110,9 +110,9 @@
public CssFontFamily(ApplContext ac, CssExpression expression,
boolean check)
throws InvalidParamException {
-
+
boolean manyValues = expression.getCount() > 1;
-
+
boolean family = true;
CssValue val = expression.getValue();
char op;
@@ -144,7 +144,7 @@
if(manyValues && val != null && val.equals(inherit)) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
if ((op != COMMA) && (op != SPACE)) {
throw new InvalidParamException("operator",
((new Character(op)).toString()),
@@ -154,7 +154,7 @@
if(val != null && val.equals(inherit)) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
if (val instanceof CssString) {
String familyName = null;
if (op == COMMA) { // "helvetica", "roman"
@@ -215,7 +215,7 @@
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns all fonts name
*/
Index: CssBackgroundImageCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBackgroundImageCSS1.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBackgroundImageCSS1.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBackgroundImageCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -35,9 +35,9 @@
* </PRE>
* @version $Revision$ */
public class CssBackgroundImageCSS1 extends CssProperty {
-
+
CssValue url;
-
+
private static CssIdent none = new CssIdent("none");
/**
@@ -45,17 +45,17 @@
*/
public CssBackgroundImageCSS1() {
url = none;
- }
-
+ }
+
/**
* Creates a new CssBackgroundImageCSS1
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssBackgroundImageCSS1(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
@@ -70,23 +70,23 @@
url = none;
expression.next();
} else {
- throw new InvalidParamException("value", expression.getValue(),
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
}
-
- public CssBackgroundImageCSS1(ApplContext ac, CssExpression expression)
+
+ public CssBackgroundImageCSS1(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return url;
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -97,7 +97,7 @@
}
return false;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -107,14 +107,14 @@
}
return "";
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "background-image";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -126,13 +126,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 ((Css1Style) style).getBackgroundImageCSS1();
@@ -140,25 +140,25 @@
return ((Css1Style) style).cssBackgroundCSS1.image;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return ((url == null && property == null) ||
+ return ((url == null && property == null) ||
(property instanceof CssBackgroundImageCSS1 &&
url != null &&
url.equals(((CssBackgroundImageCSS1) property).url)));
}
-
+
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
- */
+ */
public boolean isDefault() {
return url == none;
}
-
+
}
Index: CssTextShadow.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssTextShadow.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssTextShadow.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssTextShadow.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -19,47 +19,47 @@
/**
* @version $Revision$
*/
-public class CssTextShadow extends CssProperty
+public class CssTextShadow extends CssProperty
implements CssTextPropertiesConstants {
-
+
CssValue value;
Vector faces = new Vector();
private static CssIdent none = new CssIdent("none");
-
+
/**
* Create a new CssTextShadow
*/
public CssTextShadow() {
value = none;
- }
-
+ }
+
/**
* Create a new CssTextShadow
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
- public CssTextShadow(ApplContext ac, CssExpression expression)
- throws InvalidParamException {
- this(ac, expression, false);
+ */
+ public CssTextShadow(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
}
-
+
/**
* Create a new CssTextShadow
*
* @param expression The expression for this property
* @param check if true, checks the number of parameters
* @exception InvalidParamException Values are incorrect
- */
- public CssTextShadow(ApplContext ac, CssExpression expression, boolean check)
+ */
+ public CssTextShadow(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
-
+
int count = expression.getCount();
-
+
CssValue val = expression.getValue();
-
+
setByUser();
if (val.equals(none)) {
@@ -79,8 +79,8 @@
} else {
TextShadowFace face;
char op = CssOperator.COMMA;
- while (op == CssOperator.COMMA) {
- face = new TextShadowFace(ac, expression);
+ while (op == CssOperator.COMMA) {
+ face = new TextShadowFace(ac, expression);
value = null;
op = face.op;
faces.addElement(face);
@@ -89,9 +89,9 @@
throw new InvalidParamException("unrecognize", ac);
}
}
- val = null;
+ val = null;
}
-
+
/**
* Returns the value of this property
*/
@@ -101,14 +101,14 @@
}
return faces.elementAt(0);
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "text-shadow";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -116,7 +116,7 @@
public boolean isSoftlyInherited() {
return value == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -128,13 +128,13 @@
int l = faces.size();
String ret = "";
while (i != l) {
- ret += new Character(CssOperator.COMMA)
+ ret += new Character(CssOperator.COMMA)
+ " " + faces.elementAt(i++);
}
return ret.substring(2);
}
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -147,13 +147,13 @@
}
style0.cssTextShadow = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getTextShadow();
@@ -161,12 +161,12 @@
return ((Css1Style) style).cssTextShadow;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
// @@ FIXME
return false;
Index: CssBorder.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorder.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorder.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -54,47 +54,47 @@
if(check && expression.getCount() > 4) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
-
-
+
+
top = new CssBorderTop(ac, expression);
-
+
if (val == expression.getValue()) {
- throw new InvalidParamException("value",
- expression.getValue(),
+ throw new InvalidParamException("value",
+ expression.getValue(),
getPropertyName(), ac);
- }
+ }
right = new CssBorderRight();
bottom = new CssBorderBottom();
left = new CssBorderLeft();
-
+
CssBorderTopWidth w = top.width;
CssBorderTopStyle s = top.style;
- CssBorderTopColor c = top.color;
-
- if(w != null) {
- right.width =
- new CssBorderRightWidth((CssBorderFaceWidth) w.get());
- left.width =
- new CssBorderLeftWidth((CssBorderFaceWidth) w.get());
- bottom.width =
- new CssBorderBottomWidth((CssBorderFaceWidth) w.get());
- }
+ CssBorderTopColor c = top.color;
+
+ if(w != null) {
+ right.width =
+ new CssBorderRightWidth((CssBorderFaceWidth) w.get());
+ left.width =
+ new CssBorderLeftWidth((CssBorderFaceWidth) w.get());
+ bottom.width =
+ new CssBorderBottomWidth((CssBorderFaceWidth) w.get());
+ }
if(s != null) {
- right.style =
+ right.style =
new CssBorderRightStyle((CssBorderFaceStyle) s.get());
- left.style =
+ left.style =
new CssBorderLeftStyle((CssBorderFaceStyle) s.get());
- bottom.style =
+ bottom.style =
new CssBorderBottomStyle((CssBorderFaceStyle) s.get());
- }
+ }
if(c != null) {
- right.color =
+ right.color =
new CssBorderRightColor((CssBorderFaceColor) c.get());
- left.color =
+ left.color =
new CssBorderLeftColor((CssBorderFaceColor) c.get());
- bottom.color =
+ bottom.color =
new CssBorderBottomColor((CssBorderFaceColor) c.get());
}
/*
@@ -105,7 +105,7 @@
setByUser();
boolean manyValues = (expression.getCount() > 1);
-
+
while (find) {
find = false;
val = expression.getValue();
@@ -118,7 +118,7 @@
if(manyValues && val.equals(inherit)) {
throw new InvalidParamException("unrecognize", null, null, ac);
}
-
+
if (op != SPACE)
throw new InvalidParamException("operator",
((new Character(op)).toString()), ac);
@@ -199,11 +199,11 @@
*/
}
- public CssBorder(ApplContext ac, CssExpression expression)
+ public CssBorder(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
@@ -443,7 +443,7 @@
//bottom.setInfo(line, source);
}
- void check() {
+ void check() {
//top.check();
//bottom.check();
//right.check();
Index: CssBackgroundTV.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBackgroundTV.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBackgroundTV.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBackgroundTV.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -78,12 +78,12 @@
CssValue val = expression.getValue();
char op = SPACE;
boolean find = true;
-
+
// too many values
if(check && expression.getCount() > 5) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
if (val.equals(inherit)) {
@@ -156,11 +156,11 @@
*/
}
- public CssBackgroundTV(ApplContext ac, CssExpression expression)
+ public CssBackgroundTV(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
@@ -190,20 +190,29 @@
* Returns a string representation of the object.
*/
public String toString() {
- if (same) {
- return inherit.toString();
- } else {
- String ret = "";
- if (color.byUser)
- ret += " " + color.toString();
- if (image.byUser)
- ret += " " + image.toString();
- if (image.byUser)
- ret += " " + repeat.toString();
- if (position.byUser)
- ret += " " + position.toString();
- return ret.trim();
+ String ret = "";
+ if(color != null) {
+ ret += color;
}
+ if(image != null) {
+ if(ret != null) {
+ ret += " ";
+ }
+ ret += image;
+ }
+ if(repeat != null) {
+ if(ret != null) {
+ ret += " ";
+ }
+ ret += repeat;
+ }
+ if(position != null) {
+ if(ret != null) {
+ ret += " ";
+ }
+ ret += position;
+ }
+ return ret;
}
/**
Index: CssBorderBottomColor.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderBottomColor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderBottomColor.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorderBottomColor.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -20,14 +20,14 @@
public class CssBorderBottomColor extends CssProperty {
CssBorderFaceColor face;
-
+
/**
* Create a new CssBorderBottomColor
*/
public CssBorderBottomColor() {
face = new CssBorderFaceColor();
}
-
+
/**
* Create a new CssBorderBottomColor with an another CssBorderFaceColor
*
@@ -39,7 +39,7 @@
face = another;
}
-
+
/**
* Create a new CssBorderBottomColor
*
@@ -48,7 +48,7 @@
*/
public CssBorderBottomColor(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
@@ -56,12 +56,12 @@
setByUser();
face = new CssBorderFaceColor(ac, expression);
}
-
- public CssBorderBottomColor(ApplContext ac, CssExpression expression)
+
+ public CssBorderBottomColor(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
@@ -91,7 +91,7 @@
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "border-bottom-color";
}
@@ -113,7 +113,7 @@
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getBorderBottomColor();
@@ -126,7 +126,7 @@
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
return (property instanceof CssBorderBottomColor && face.equals(((CssBorderBottomColor) property).face));
}
@@ -137,7 +137,7 @@
* @param printer The printer.
* @see #toString()
* @see #getPropertyName()
- */
+ */
public void print(CssPrinterStyle printer) {
if (face != null && !face.isDefault())
printer.print(this);
Index: CssBorderCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderCSS2.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorderCSS2.java 8 Sep 2005 12:23:33 -0000 1.3
+++ CssBorderCSS2.java 14 Sep 2005 15:14:31 -0000 1.4
@@ -18,12 +18,12 @@
* @version $Revision$
*/
public class CssBorderCSS2 extends CssProperty {
-
+
CssBorderTopCSS2 top;
CssBorderRightCSS2 right;
CssBorderBottomCSS2 bottom;
CssBorderLeftCSS2 left;
-
+
/**
* Create a new CssBorderFaceCSS2
*/
@@ -32,106 +32,106 @@
right = new CssBorderRightCSS2();
bottom = new CssBorderBottomCSS2();
left = new CssBorderLeftCSS2();
- }
-
+ }
+
/**
* Create a new CssBorderFaceCSS2
*
* @param value The value for this property
* @exception InvalidParamException The value is incorrect
- */
+ */
public CssBorderCSS2(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 CssBorderTopCSS2(ac, value);
-
+
if (val == value.getValue()) {
- throw new InvalidParamException("value",
- value.getValue(),
+ throw new InvalidParamException("value",
+ value.getValue(),
getPropertyName(), ac);
- }
+ }
right = new CssBorderRightCSS2();
bottom = new CssBorderBottomCSS2();
left = new CssBorderLeftCSS2();
-
+
CssBorderTopWidthCSS2 w = top.width;
CssBorderTopStyleCSS2 s = top.style;
- CssBorderTopColorCSS2 c = top.color;
-
- if(w != null) {
- right.width =
- new CssBorderRightWidthCSS2((CssBorderFaceWidthCSS2) w.get());
- left.width =
- new CssBorderLeftWidthCSS2((CssBorderFaceWidthCSS2) w.get());
- bottom.width =
- new CssBorderBottomWidthCSS2((CssBorderFaceWidthCSS2) w.get());
- }
+ CssBorderTopColorCSS2 c = top.color;
+
+ if(w != null) {
+ right.width =
+ new CssBorderRightWidthCSS2((CssBorderFaceWidthCSS2) w.get());
+ left.width =
+ new CssBorderLeftWidthCSS2((CssBorderFaceWidthCSS2) w.get());
+ bottom.width =
+ new CssBorderBottomWidthCSS2((CssBorderFaceWidthCSS2) w.get());
+ }
if(s != null) {
- right.style =
+ right.style =
new CssBorderRightStyleCSS2((CssBorderFaceStyleCSS2) s.get());
- left.style =
+ left.style =
new CssBorderLeftStyleCSS2((CssBorderFaceStyleCSS2) s.get());
- bottom.style =
+ bottom.style =
new CssBorderBottomStyleCSS2((CssBorderFaceStyleCSS2) s.get());
- }
+ }
if(c != null) {
- right.color =
+ right.color =
new CssBorderRightColorCSS2((CssBorderFaceColorCSS2) c.get());
- left.color =
+ left.color =
new CssBorderLeftColorCSS2((CssBorderFaceColorCSS2) c.get());
- bottom.color =
+ bottom.color =
new CssBorderBottomColorCSS2((CssBorderFaceColorCSS2) c.get());
- }
+ }
}
-
- public CssBorderCSS2(ApplContext ac, CssExpression expression)
+
+ public CssBorderCSS2(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 CssBorderTopCSS2 getTop() {
return top;
}
-
+
/**
* Returns the right property
*/
public CssBorderRightCSS2 getRight() {
return right;
}
-
+
/**
* Returns the bottom property
*/
public CssBorderBottomCSS2 getBottom() {
return bottom;
}
-
+
/**
* Returns the left property
*/
public CssBorderLeftCSS2 getLeft() {
return left;
}
-
+
/**
* @param bottom The bottom to set.
*/
@@ -169,22 +169,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();
@@ -199,7 +199,7 @@
bottom.setImportant();
}
}
-
+
/**
* Returns true if this property is important.
* Overrides this method for a macro
@@ -210,24 +210,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.important && bottom.width.important &&
+ ((top.width.important && bottom.width.important &&
right.width.important && left.width.important) ||
- (!top.width.important && !bottom.width.important &&
+ (!top.width.important && !bottom.width.important &&
!right.width.important && !left.width.important))) {
- CssBorderWidthCSS2 width = new CssBorderWidthCSS2(top.width, bottom.width,
+ CssBorderWidthCSS2 width = new CssBorderWidthCSS2(top.width, bottom.width,
right.width, left.width);
if (top.important) {
width.setImportant();
@@ -237,11 +237,11 @@
}
if ((top.style != null && bottom.style != null &&
right.style != null && left.style != null) &&
- ((top.style.important && bottom.style.important &&
+ ((top.style.important && bottom.style.important &&
right.style.important && left.style.important) ||
- (!top.style.important && !bottom.style.important &&
+ (!top.style.important && !bottom.style.important &&
!right.style.important && !left.style.important))) {
- CssBorderStyleCSS2 style = new CssBorderStyleCSS2(top.style, bottom.style,
+ CssBorderStyleCSS2 style = new CssBorderStyleCSS2(top.style, bottom.style,
right.style, left.style);
if (top.important) {
style.setImportant();
@@ -251,11 +251,11 @@
}
if ((top.color != null && bottom.color != null &&
right.color != null && left.color != null) &&
- ((top.color.important && bottom.color.important &&
+ ((top.color.important && bottom.color.important &&
right.color.important && left.color.important) ||
- (!top.color.important && !bottom.color.important &&
+ (!top.color.important && !bottom.color.important &&
!right.color.important && !left.color.important))) {
- CssBorderColorCSS2 color = new CssBorderColorCSS2(top.color, bottom.color,
+ CssBorderColorCSS2 color = new CssBorderColorCSS2(top.color, bottom.color,
right.color, left.color);
if (top.important) {
color.setImportant();
@@ -263,7 +263,7 @@
printMacro |= 4;
color.print(printer);
}
-
+
if (printMacro == 0) {
top.print(printer);
right.print(printer);
@@ -275,7 +275,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);
@@ -289,9 +289,9 @@
if (left.color != null) left.color.print(printer);
}
}
-
+
}
-
+
/**
* Set the context.
* Overrides this method for a macro
@@ -314,7 +314,7 @@
left.setSelectors(selector);
}
}
-
+
/**
* Add this property to the CssStyle
*
@@ -334,13 +334,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 ((Css1Style) style).getBorderCSS2();
@@ -348,14 +348,14 @@
return ((Css1Style) style).cssBorderCSS2;
}
}
-
+
/**
* 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) {
@@ -371,7 +371,7 @@
bottom.setInfo(line, source);
}
}
-
+
void check() {
if(top != null) {
top.check();
Index: CssBorderTopColor.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderTopColor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderTopColor.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssBorderTopColor.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -18,26 +18,26 @@
* @version $Revision$
*/
public class CssBorderTopColor extends CssProperty {
-
+
CssBorderFaceColor face;
-
+
/**
* Create a new CssBorderTopColor
*/
public CssBorderTopColor() {
face = new CssBorderFaceColor();
}
-
+
/**
* Create a new CssBorderTopColor with an another CssBorderFaceColor
* @param another The another side.
*/
public CssBorderTopColor(CssBorderFaceColor another) {
setByUser();
-
+
face = another;
}
-
+
/**
* Create a new CssBorderTopColor
*
@@ -46,27 +46,27 @@
*/
public CssBorderTopColor(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
face = new CssBorderFaceColor(ac, expression);
}
-
+
public CssBorderTopColor(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression,false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return face;
}
-
+
/**
* Returns the color
*/
@@ -77,7 +77,7 @@
return null;
}
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -87,14 +87,14 @@
}
return "";
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "border-top-color";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -106,7 +106,7 @@
style.addRedefinitionWarning(ac, this);
top.color = this;
}
-
+
/**
* Get this property in the style.
*
@@ -120,26 +120,26 @@
return ((Css1Style) style).cssBorder.getTop().color;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssBorderTopColor &&
+ return (property instanceof CssBorderTopColor &&
face.equals(((CssBorderTopColor) property).face));
}
-
+
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
*
* @see #print(CssPrinterStyle)
- */
+ */
public void print(CssPrinterStyle printer) {
if (face != null && !face.isDefault())
printer.print(this);
}
-
+
}
Index: CssPaddingBottom.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssPaddingBottom.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssPaddingBottom.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssPaddingBottom.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -38,7 +38,7 @@
public CssPaddingBottom() {
super();
}
-
+
/**
* Create a new CssPaddingBottom with an another CssPaddingSide
*
@@ -47,7 +47,7 @@
public CssPaddingBottom(CssPaddingSide another) {
super(another);
}
-
+
/**
* Create a new CssPaddingBottom
*
@@ -58,15 +58,15 @@
boolean check) throws InvalidParamException {
super(ac, expression, check);
}
-
+
public CssPaddingBottom(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "padding-bottom";
}
@@ -78,7 +78,7 @@
*/
public void addToStyle(ApplContext ac, CssStyle style) {
Css1Style style0 = (Css1Style) style;
-
+
if (style0.cssPadding.bottom != null)
style0.addRedefinitionWarning(ac, this);
style0.cssPadding.bottom = this;
@@ -89,7 +89,7 @@
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getPaddingBottom();
@@ -102,7 +102,7 @@
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
return (property instanceof CssPaddingBottom && value.equals(((CssPaddingBottom) property).value));
}
Index: CssBorderRightWidthCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderRightWidthCSS1.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderRightWidthCSS1.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssBorderRightWidthCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -41,19 +41,19 @@
* <P>
* Border widths cannot be negative.
*
- * @version $Revision$
+ * @version $Revision$
*/
public class CssBorderRightWidthCSS1 extends CssProperty {
-
+
CssBorderFaceWidthCSS1 face;
-
+
/**
* Create a new CssBorderRightWidth
*/
public CssBorderRightWidthCSS1() {
face = new CssBorderFaceWidthCSS1();
}
-
+
/**
* Create a new CssBorderRightWidthCSS1 with an another CssBorderFaceWidthCSS1
*
@@ -61,10 +61,10 @@
*/
public CssBorderRightWidthCSS1(CssBorderFaceWidthCSS1 another) {
setByUser();
-
+
face = another;
}
-
+
/**
* Create a new CssBorderRightWidthCSS1
*
@@ -73,28 +73,28 @@
*/
public CssBorderRightWidthCSS1(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
-
+
face = new CssBorderFaceWidthCSS1(ac, expression);
}
-
+
public CssBorderRightWidthCSS1(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
*/
@@ -104,7 +104,7 @@
}
return null;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -114,14 +114,14 @@
}
return "";
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "border-right-width";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -133,13 +133,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 ((Css1Style) style).getBorderRightWidthCSS1();
@@ -147,15 +147,15 @@
return ((Css1Style) style).cssBorderCSS1.getRight().width;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssBorderRightWidthCSS1 &&
+ return (property instanceof CssBorderRightWidthCSS1 &&
face.equals(((CssBorderRightWidthCSS1) property).face));
}
-
+
}
Index: CssListStyleCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssListStyleCSS2.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssListStyleCSS2.java 8 Sep 2005 12:23:34 -0000 1.3
+++ CssListStyleCSS2.java 14 Sep 2005 15:14:31 -0000 1.4
@@ -70,42 +70,42 @@
* <P> In the example above, the 'disc' will be used when the image is
* unavailable.
*
- * @version $Revision$
+ * @version $Revision$
*/
public class CssListStyleCSS2 extends CssProperty implements CssOperator {
-
+
CssListStyleTypeCSS2 listStyleType;
CssListStyleImageCSS2 listStyleImage;
CssListStylePositionCSS2 listStylePosition;
boolean inheritedValue;
-
+
/**
* Create a new CssListStyleCSS2
*/
public CssListStyleCSS2() {
// nothing to do
- }
-
+ }
+
/**
* Create a new CssListStyleCSS2
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssListStyleCSS2(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
int exprLength = expression.getCount();
-
+
if(check && exprLength > 3) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
char op = SPACE;
boolean find = true;
-
+
setByUser();
if (val.equals(inherit)) {
@@ -116,16 +116,16 @@
expression.next();
return;
}
-
+
while (find) {
find = false;
val = expression.getValue();
op = expression.getOperator();
-
+
if(val != null && val.equals(inherit)) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
if ((listStyleType == null) && (val != null)) {
try {
listStyleType = new CssListStyleTypeCSS2(ac, expression);
@@ -138,17 +138,17 @@
listStyleImage = new CssListStyleImageCSS2(ac, expression);
find = true;
} catch (InvalidParamException e) {
- }
+ }
}
if (!find && (val != null) && (listStylePosition == null)) {
listStylePosition = new CssListStylePositionCSS2(ac, expression);
find = true;
}
- if(val != null && !find) {
+ if(val != null && !find) {
throw new InvalidParamException("unrecognize", ac);
}
if (op != SPACE) {
- throw new InvalidParamException("operator",
+ throw new InvalidParamException("operator",
((new Character(op)).toString()),
ac);
}
@@ -157,22 +157,22 @@
if (listStyleType == null) {
listStyleType = new CssListStyleTypeCSS2();
}
-
+
if (listStyleImage == null) {
listStyleImage = new CssListStyleImageCSS2();
}
-
+
if (listStylePosition == null) {
listStylePosition = new CssListStylePositionCSS2();
}
*/
}
-
+
public CssListStyleCSS2(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* @return Returns the inheritedValue.
*/
@@ -235,14 +235,14 @@
public Object get() {
return listStyleType;
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "list-style";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -250,7 +250,7 @@
public boolean isSoftlyInherited() {
return inheritedValue;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -259,7 +259,7 @@
return inherit.toString();
} else {
String ret = "";
- if(listStyleType != null) {
+ if(listStyleType != null) {
ret = listStyleType.toString();
}
if (listStyleImage != null &&!listStyleImage.isDefault()) {
@@ -271,16 +271,16 @@
return ret.trim();
}
}
-
-
-
+
+
+
/**
* Set this property to be important.
* Overrides this method for a macro
- */
+ */
public void setImportant() {
if (!inheritedValue) {
- if(listStyleType != null)
+ if(listStyleType != null)
listStyleType.important = true;
if(listStyleImage != null)
listStyleImage.important = true;
@@ -288,7 +288,7 @@
listStylePosition.important = true;
}
}
-
+
/**
* Returns true if this property is important.
* Overrides this method for a macro
@@ -298,13 +298,13 @@
(listStyleImage == null || listStyleImage.important) &&
(listStylePosition == null || listStylePosition.important));
}
-
+
/**
* Print this property.
*
* @see #toString()
* @see #getPropertyName()
- */
+ */
public void print(CssPrinterStyle printer) {
if (inheritedValue) {
printer.print(this);
@@ -326,9 +326,9 @@
listStylePosition.print(printer);
}
}
-
+
}
-
+
/**
* Set the context.
* Overrides this method for a macro
@@ -348,7 +348,7 @@
listStylePosition.setSelectors(selector);
}
}
-
+
/**
* Add this property to the CssStyle
*
@@ -366,13 +366,13 @@
((Css1Style) style).cssListStyleCSS2.inheritedValue = true;
}
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getListStyleCSS2();
@@ -380,14 +380,14 @@
return ((Css1Style) style).cssListStyleCSS2;
}
}
-
+
/**
* 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 (!inheritedValue) {
@@ -399,15 +399,15 @@
listStylePosition.setInfo(line, source);
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
// @FIXME
return false;
}
-
+
}
Index: CssBackground.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBackground.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssBackground.java 8 Sep 2005 12:23:33 -0000 1.4
+++ CssBackground.java 14 Sep 2005 15:14:31 -0000 1.5
@@ -93,19 +93,19 @@
*/
public CssBackground(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
CssValue val = expression.getValue();
char op = SPACE;
boolean find = true;
setByUser();
-
+
// if there are too many values -> error
- if(check && expression.getCount() > 6) {
+ if(check && expression.getCount() > 6) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
boolean manyValues = (expression.getCount() > 1);
-
+
while (find) {
find = false;
val = expression.getValue();
@@ -114,12 +114,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 CssBackgroundColor(ac, expression);
@@ -139,8 +139,8 @@
if (!find && repeat == null) {
try {
repeat = new CssBackgroundRepeat(ac, expression);
- find = true;
- } catch (InvalidParamException e) {
+ find = true;
+ } catch (InvalidParamException e) {
// nothing to do, attachment will test this value
}
}
@@ -180,8 +180,8 @@
}
}
}
-
-
+
+
/**
* Returns the value of this property
*/
@@ -239,7 +239,7 @@
}
ret += position;
}
- if(sizedefined) {
+ if(sizedefined) {
ret += "/";
ret += size;
}
@@ -258,7 +258,7 @@
ret += " " + attachment.toString();
if (position.byUser)
ret += " " + position.toString();
-
+
if (sizedefined)
ret += "/" + size.toString();
return ret.trim();
Index: CssMinWidthATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssMinWidthATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssMinWidthATSC.java 23 Aug 2005 16:23:12 -0000 1.1
+++ CssMinWidthATSC.java 14 Sep 2005 15:14:31 -0000 1.2
@@ -20,32 +20,32 @@
/**
*/
public class CssMinWidthATSC extends CssProperty {
-
+
CssValue value;
-
+
/**
* Create a new CssMinWidthATSC
*/
public CssMinWidthATSC() {
- }
-
+ }
+
/**
* Create a new CssMinWidthATSC
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssMinWidthATSC(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
-
+
setByUser();
-
+
ac.getFrame().addWarning("atsc", val.toString());
if (val.equals(inherit)) {
@@ -53,39 +53,39 @@
} else if (val instanceof CssLength || val instanceof CssPercentage) {
float f = ((Float) val.get()).floatValue();
if (f < 0) {
- throw new InvalidParamException("negative-value",
+ throw new InvalidParamException("negative-value",
val.toString(), ac);
}
value = val;
} else if (val instanceof CssNumber) {
value = ((CssNumber) val).getLength();
} else {
- throw new InvalidParamException("value", expression.getValue(),
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
-
+
expression.next();
}
-
+
public CssMinWidthATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property.
*/
public Object get() {
return value;
}
-
+
/**
* Returns the name of this property.
- */
+ */
public String getPropertyName() {
return "min-width";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -93,15 +93,15 @@
public boolean isSoftlyInherited() {
return value == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
-
+
+
/**
* Add this property to the CssStyle.
*
@@ -113,13 +113,13 @@
style0.addRedefinitionWarning(ac, this);
style0.cssMinWidthATSC = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getMinWidthATSC();
@@ -127,15 +127,15 @@
return ((Css1Style) style).cssMinWidthATSC;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssMinWidthATSC
+ return (property instanceof CssMinWidthATSC
&& value.equals(((CssMinWidthATSC) property).value));
}
-
+
}
Index: CssUnicodeBidi.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssUnicodeBidi.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssUnicodeBidi.java 23 Aug 2005 16:23:12 -0000 1.1
+++ CssUnicodeBidi.java 14 Sep 2005 15:14:31 -0000 1.2
@@ -42,11 +42,11 @@
*/
public CssUnicodeBidi(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
setByUser();
@@ -68,12 +68,12 @@
}
}
-
+
public CssUnicodeBidi(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
Index: CssListStyleTV.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssListStyleTV.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssListStyleTV.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssListStyleTV.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -95,11 +95,11 @@
*/
public CssListStyleTV(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 3) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
char op = SPACE;
boolean find = true;
@@ -119,11 +119,11 @@
find = false;
val = expression.getValue();
op = expression.getOperator();
-
+
if(val.equals(inherit)) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
if ((listStyleType == null)
&& (val != null)) {
try {
@@ -170,7 +170,7 @@
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
@@ -222,7 +222,7 @@
*/
public void setImportant() {
if (!inheritedValue) {
- if(listStyleType != null)
+ if(listStyleType != null)
listStyleType.important = true;
if(listStyleImage != null)
listStyleImage.important = true;
Index: CssListStylePositionCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssListStylePositionCSS1.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssListStylePositionCSS1.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssListStylePositionCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -28,35 +28,35 @@
* drawn with regard to the content. For a formatting example see
* @version $Revision$
*/
-public class CssListStylePositionCSS1 extends CssProperty
+public class CssListStylePositionCSS1 extends CssProperty
implements CssListStyleConstants {
-
+
int value;
-
+
/**
* Create a new CssListStylePositionCSS1
*/
public CssListStylePositionCSS1() {
// nothing to do
- }
-
+ }
+
/**
* Create a new CssListStylePositionCSS1
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssListStylePositionCSS1(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 < LISTSTYLEPOSITION.length; i++)
@@ -69,26 +69,26 @@
throw new InvalidParamException("value", val, getPropertyName(), ac);
}
}
-
+
public CssListStylePositionCSS1(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return LISTSTYLEPOSITION[value];
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "list-style-position";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -96,14 +96,14 @@
public boolean isSoftlyInherited() {
return value == (LISTSTYLEPOSITION.length - 1);
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return LISTSTYLEPOSITION[value];
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -115,13 +115,13 @@
style.addRedefinitionWarning(ac, this);
cssListStyle.listStylePosition = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getListStylePositionCSS1();
@@ -129,27 +129,27 @@
return ((Css1Style) style).cssListStyleCSS1.listStylePosition;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssListStylePositionCSS1 &&
+ return (property instanceof CssListStylePositionCSS1 &&
((CssListStylePositionCSS1) property).value == value);
}
-
+
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
- */
+ */
public boolean isDefault() {
return value == 0;
}
-
+
private static int[] hash_values;
-
+
static {
hash_values = new int[LISTSTYLEPOSITION.length];
for (int i = 0; i < LISTSTYLEPOSITION.length; i++)
Index: CssWhiteSpace.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssWhiteSpace.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssWhiteSpace.java 8 Sep 2005 12:23:34 -0000 1.3
+++ CssWhiteSpace.java 14 Sep 2005 15:14:31 -0000 1.4
@@ -38,40 +38,40 @@
* have default values for all HTML elements according to the suggested
* rendering of elements in the HTML specification.
*
- * @version $Revision$
+ * @version $Revision$
*/
public class CssWhiteSpace extends CssProperty {
-
+
int value;
-
+
private static String[] WHITESPACE = {
"normal", "pre", "nowrap", "inherit" };
private static int[] hash_values;
-
+
/**
* Create a new CssWhiteSpace
*/
public CssWhiteSpace() {
// nothing to do
}
-
+
/**
* Create a new CssWhiteSpace
*
* @param expression The expression for this property
* @exception InvalidParamException values are incorrect
- */
+ */
public CssWhiteSpace(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 < WHITESPACE.length; i++)
@@ -81,16 +81,16 @@
return;
}
}
-
- throw new InvalidParamException("value", expression.getValue(),
+
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
-
+
public CssWhiteSpace(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* @return Returns the value.
*/
@@ -111,14 +111,14 @@
public Object get() {
return WHITESPACE[value];
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "white-space";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -126,14 +126,14 @@
public boolean isSoftlyInherited() {
return value == (WHITESPACE.length - 1);
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return WHITESPACE[value];
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -145,13 +145,13 @@
style0.addRedefinitionWarning(ac, this);
style0.cssWhiteSpace = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getWhiteSpace();
@@ -159,17 +159,17 @@
return ((Css1Style) style).cssWhiteSpace;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssWhiteSpace &&
+ return (property instanceof CssWhiteSpace &&
value == ((CssWhiteSpace) property).value);
}
-
+
static {
hash_values = new int[WHITESPACE.length];
for (int i = 0; i < WHITESPACE.length; i++)
Index: CssClear.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssClear.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssClear.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssClear.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -34,35 +34,35 @@
*
* @version $Revision$ */
public class CssClear extends CssProperty {
-
+
int value;
-
- private static String[] CLEAR = {
+
+ private static String[] CLEAR = {
"none", "left", "right", "both", "inherit" };
private static int[] hash_values;
-
+
/**
* Create a new CssClear
*/
public CssClear() {
// nothing to do
- }
-
+ }
+
/**
* Create a new CssClear
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssClear(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();
@@ -73,29 +73,29 @@
return;
}
}
- throw new InvalidParamException("value", expression.getValue(),
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
-
- public CssClear(ApplContext ac, CssExpression expression)
+
+ public CssClear(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return CLEAR[value];
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "clear";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -103,14 +103,14 @@
public boolean isSoftlyInherited() {
return value == CLEAR.length - 1;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return CLEAR[value];
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -122,13 +122,13 @@
style0.addRedefinitionWarning(ac, this);
style0.cssClear = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getClear();
@@ -136,25 +136,25 @@
return ((Css1Style) style).cssClear;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssClear &&
+ return (property instanceof CssClear &&
value == ((CssClear) property).value);
}
-
+
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
- */
+ */
public boolean isDefault() {
return value == 0;
}
-
+
static {
hash_values = new int[CLEAR.length];
for (int i = 0; i < CLEAR.length; i++)
Index: CssBackgroundCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBackgroundCSS1.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CssBackgroundCSS1.java 8 Sep 2005 12:23:33 -0000 1.4
+++ CssBackgroundCSS1.java 14 Sep 2005 15:14:31 -0000 1.5
@@ -50,11 +50,11 @@
* @see CssBackgroundImage
* @see CssBackgroundRepeat
* @see CssBackgroundAttachment
- * @see CssBackgroundPosition
+ * @see CssBackgroundPosition
*/
-public class CssBackgroundCSS1 extends CssProperty
+public class CssBackgroundCSS1 extends CssProperty
implements CssOperator, CssBackgroundConstants {
-
+
CssBackgroundColorCSS1 color;
CssBackgroundImageCSS1 image;
CssBackgroundRepeatCSS1 repeat;
@@ -67,28 +67,28 @@
* Create a new CssBackgroundCSS1
*/
public CssBackgroundCSS1() {
- }
-
+ }
+
/**
* Set the value of the property
*
* @param expression The expression for this property
* @exception InvalidParamException The expression is incorrect
- */
+ */
public CssBackgroundCSS1(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();
-
+
while (find) {
find = false;
val = expression.getValue();
@@ -97,7 +97,7 @@
if (val == null) {
break;
}
-
+
if (color == null) {
try {
color = new CssBackgroundColorCSS1(ac, expression);
@@ -138,7 +138,7 @@
}
}
if (op != SPACE) {
- throw new InvalidParamException("operator",
+ throw new InvalidParamException("operator",
((new Character(op)).toString()),
ac);
}
@@ -159,19 +159,19 @@
position = new CssBackgroundPositionCSS1();
*/
}
-
+
public CssBackgroundCSS1(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.
*/
@@ -241,11 +241,11 @@
return ret.trim();
}*/
}
-
+
/**
* Set this property to be important.
* Overrides this method for a macro
- */
+ */
public void setImportant() {
if(color != null) {
color.important = true;
@@ -263,7 +263,7 @@
position.important = true;
}
}
-
+
/**
* Returns true if this property is important.
* Overrides this method for a macro
@@ -275,14 +275,14 @@
(attachment == null || attachment.important) &&
(position == null || position.important));
}
-
+
/**
* 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 &&
@@ -293,7 +293,7 @@
!repeat.important &&
!attachment.important &&
!position.important))) {
- if (color.byUser || image.byUser || repeat.byUser
+ if (color.byUser || image.byUser || repeat.byUser
|| attachment.byUser || position.byUser) {
printer.print(this);
}
@@ -308,9 +308,9 @@
attachment.print(printer);
if (position != null)
position.print(printer);
- }
+ }
}
-
+
/**
* Set the context.
* Overrides this method for a macro
@@ -336,7 +336,7 @@
position.setSelectors(selector);
}
}
-
+
/**
* Add this property to the CssStyle
*
@@ -362,13 +362,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 ((Css1Style) style).getBackgroundCSS1();
@@ -376,23 +376,23 @@
return ((Css1Style) style).cssBackgroundCSS1;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
- public boolean equals(CssProperty 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) {
@@ -410,5 +410,5 @@
if(position != null) {
position.setInfo(line, source);
}
- }
+ }
}
Index: CssListStyleImageCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssListStyleImageCSS1.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssListStyleImageCSS1.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssListStyleImageCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -34,35 +34,35 @@
* @version $Revision$
*/
public class CssListStyleImageCSS1 extends CssProperty {
-
+
CssValue value;
-
+
private static CssIdent none = new CssIdent("none");
-
+
/**
* Create a new CssListStyleImageCSS1
*/
public CssListStyleImageCSS1() {
value = none;
- }
-
+ }
+
/**
* Create a new CssListStyleImageCSS1
*
* @param value The value for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssListStyleImageCSS1(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 CssURL) {
value = val;
expression.next();
@@ -76,26 +76,26 @@
throw new InvalidParamException("value", val, getPropertyName(), ac);
}
}
-
+
public CssListStyleImageCSS1(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return value;
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "list-style-image";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -103,14 +103,14 @@
public boolean isSoftlyInherited() {
return value == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -122,13 +122,13 @@
style.addRedefinitionWarning(ac, this);
cssListStyle.listStyleImage = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getListStyleImageCSS1();
@@ -136,23 +136,23 @@
return ((Css1Style) style).cssListStyleCSS1.listStyleImage;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssListStyleImageCSS1 &&
+ return (property instanceof CssListStyleImageCSS1 &&
value.equals(((CssListStyleImageCSS1) property).value));
}
-
+
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
- */
+ */
public boolean isDefault() {
return value == none;
}
-
+
}
Index: CssTextAlignTV.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssTextAlignTV.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssTextAlignTV.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssTextAlignTV.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -64,11 +64,11 @@
*/
public CssTextAlignTV(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
int hash = val.hashCode();
@@ -91,11 +91,11 @@
throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
}
- public CssTextAlignTV(ApplContext ac, CssExpression expression)
+ public CssTextAlignTV(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
Index: CssTextIndentMob.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssTextIndentMob.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssTextIndentMob.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssTextIndentMob.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -37,32 +37,32 @@
* @version $Revision$
*/
public class CssTextIndentMob extends CssProperty {
-
+
CssValue value = new CssLength();
-
+
/**
* Create a new CssTextIndent
*/
public CssTextIndentMob() {
}
-
+
/**
* Create a new CssTextIndentMob
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssTextIndentMob(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)) {
value = inherit;
} else if (val instanceof CssLength ) {
@@ -70,32 +70,32 @@
} else if (val instanceof CssNumber) {
value = ((CssNumber) val).getLength();
} else {
- throw new InvalidParamException("value", val.toString(),
+ throw new InvalidParamException("value", val.toString(),
getPropertyName(), ac);
}
-
+
expression.next();
}
-
- public CssTextIndentMob(ApplContext ac, CssExpression expression)
+
+ public CssTextIndentMob(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return value;
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "text-indent";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -103,14 +103,14 @@
public boolean isSoftlyInherited() {
return value == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -122,13 +122,13 @@
style0.addRedefinitionWarning(ac, this);
style0.cssTextIndentMob = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getTextIndentMob();
@@ -136,14 +136,14 @@
return ((Css1Style) style).cssTextIndentMob;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssTextIndentMob &&
+ return (property instanceof CssTextIndentMob &&
value.equals(((CssTextIndentMob) property).value));
}
}
Index: CssMaxWidthATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssMaxWidthATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssMaxWidthATSC.java 23 Aug 2005 16:23:12 -0000 1.1
+++ CssMaxWidthATSC.java 14 Sep 2005 15:14:31 -0000 1.2
@@ -21,35 +21,35 @@
/**
*/
public class CssMaxWidthATSC extends CssProperty {
-
+
CssValue value;
-
+
private static CssIdent none = new CssIdent("none");
-
+
/**
* Create a new CssMaxWidthATSC
*/
public CssMaxWidthATSC() {
value = none;
- }
-
+ }
+
/**
* Create a new CssMaxWidthATSC
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssMaxWidthATSC(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
-
+
setByUser();
-
+
ac.getFrame().addWarning("atsc", val.toString());
if (val.equals(inherit)) {
@@ -57,7 +57,7 @@
} else if (val instanceof CssLength || val instanceof CssPercentage) {
float f = ((Float) val.get()).floatValue();
if (f < 0) {
- throw new InvalidParamException("negative-value",
+ throw new InvalidParamException("negative-value",
val.toString(), ac);
}
value = val;
@@ -66,32 +66,32 @@
} else if (val instanceof CssNumber) {
value = ((CssNumber) val).getLength();
} else {
- throw new InvalidParamException("value", expression.getValue(),
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
}
-
+
expression.next();
}
-
+
public CssMaxWidthATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property.
*/
public Object get() {
return value;
}
-
+
/**
* Returns the name of this property.
- */
+ */
public String getPropertyName() {
return "max-width";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -99,15 +99,15 @@
public boolean isSoftlyInherited() {
return value == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
-
+
+
/**
* Add this property to the CssStyle.
*
@@ -119,13 +119,13 @@
style0.addRedefinitionWarning(ac, this);
style0.cssMaxWidthATSC = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getMaxWidthATSC();
@@ -133,23 +133,23 @@
return ((Css1Style) style).cssMaxWidthATSC;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssMaxWidthATSC
+ return (property instanceof CssMaxWidthATSC
&& value.equals(((CssMaxWidthATSC) property).value));
}
-
+
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
- */
+ */
public boolean isDefault() {
return value == none;
}
-
+
}
Index: CssBackgroundConstants.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBackgroundConstants.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBackgroundConstants.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBackgroundConstants.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -19,31 +19,31 @@
/**
* The top position
- */
+ */
static int POSITION_TOP = 0;
/**
* The center position
- */
+ */
static int POSITION_CENTER = 1;
/**
* The bottom position
- */
+ */
static int POSITION_BOTTOM = 2;
/**
* The left position
- */
+ */
static int POSITION_LEFT = 3;
/**
* The right position
- */
+ */
static int POSITION_RIGHT = 4;
-
+
/**
* Inherit
- */
+ */
static int POSITION_INHERIT = 5;
}
Index: CssBorderLeftStyleCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderLeftStyleCSS2.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderLeftStyleCSS2.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorderLeftStyleCSS2.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -16,16 +16,16 @@
* @version $Revision$
*/
public class CssBorderLeftStyleCSS2 extends CssProperty {
-
+
CssBorderFaceStyleCSS2 face;
-
+
/**
* Create a new CssBorderLeftStyleCSS2
*/
public CssBorderLeftStyleCSS2() {
face = new CssBorderFaceStyleCSS2();
}
-
+
/**
* Create a new CssBorderLeftStyleCSS2 with an another CssBorderFaceStyleCSS2
*
@@ -33,10 +33,10 @@
*/
public CssBorderLeftStyleCSS2(CssBorderFaceStyleCSS2 another) {
setByUser();
-
+
face = another;
}
-
+
/**
* Create a new CssBorderLeftStyleCSS2
*
@@ -45,27 +45,27 @@
*/
public CssBorderLeftStyleCSS2(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
face = new CssBorderFaceStyleCSS2(ac, expression);
}
-
+
public CssBorderLeftStyleCSS2(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression,false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return face;
}
-
+
/**
* Returns the value
*/
@@ -75,7 +75,7 @@
}
return null;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -85,14 +85,14 @@
}
return "";
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "border-left-style";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -104,13 +104,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 ((Css1Style) style).getBorderLeftStyleCSS2();
@@ -118,14 +118,14 @@
return ((Css1Style) style).cssBorderCSS2.getLeft().style;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
return (property instanceof CssBorderLeftStyleCSS2 && face.equals(((CssBorderLeftStyleCSS2) property).face));
}
-
+
}
Index: CssBorderLeftColorCSS1.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderLeftColorCSS1.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderLeftColorCSS1.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorderLeftColorCSS1.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -20,27 +20,27 @@
* @version $Revision$
*/
public class CssBorderLeftColorCSS1 extends CssProperty {
-
+
CssBorderFaceColorCSS1 face;
-
+
/**
* Create a new CssBorderLeftColorCSS1
*/
public CssBorderLeftColorCSS1() {
face = new CssBorderFaceColorCSS1();
}
-
+
/**
* Create a new CssBorderLeftColorCSS1 with an another CssBorderFaceColorCSS1
* @param another The another side.
*/
public CssBorderLeftColorCSS1(CssBorderFaceColorCSS1 another) {
-
+
setByUser();
-
+
face = another;
}
-
+
/**
* Create a new CssBorderLeftColorCSS1
*
@@ -49,27 +49,27 @@
*/
public CssBorderLeftColorCSS1(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
face = new CssBorderFaceColorCSS1(ac, expression);
}
-
- public CssBorderLeftColorCSS1(ApplContext ac, CssExpression expression)
+
+ public CssBorderLeftColorCSS1(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
*/
@@ -79,7 +79,7 @@
}
return null;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -89,14 +89,14 @@
}
return "";
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "border-left-color";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -108,13 +108,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 ((Css1Style) style).getBorderLeftColorCSS1();
@@ -122,21 +122,21 @@
return ((Css1Style) style).cssBorderCSS1.getLeft().color;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
return (property instanceof CssBorderLeftColorCSS1 && face.equals(((CssBorderLeftColorCSS1) property).face));
}
-
+
/**
* Print this property
*
* @param printer The printer.
- */
+ */
public void print(CssPrinterStyle printer) {
if (face != null && !face.isDefault())
printer.print(this);
Index: CssQuotesATSC.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssQuotesATSC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssQuotesATSC.java 23 Aug 2005 16:23:12 -0000 1.1
+++ CssQuotesATSC.java 14 Sep 2005 15:14:31 -0000 1.2
@@ -22,31 +22,31 @@
/**
*/
public class CssQuotesATSC extends CssProperty {
-
+
Vector values = new Vector();
-
+
private static CssIdent none = new CssIdent("none");
-
-
+
+
/**
* Create a new CssQuotesATSC
*/
public CssQuotesATSC() {
- }
-
+ }
+
/**
* Create a new CssQuotesATSC
*
* @param expression The expression for this property
* @exception InvalidParamException The expression is incorrect
- */
+ */
public CssQuotesATSC(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
-
+
CssValue val = expression.getValue();
int counter = 0;
char op = expression.getOperator();
-
+
ac.getFrame().addWarning("atsc", val.toString());
setByUser();
@@ -79,13 +79,13 @@
&& (val instanceof CssString)) {
// nothing
} else {
- throw new InvalidParamException("value",
- expression.getValue(),
+ throw new InvalidParamException("value",
+ expression.getValue(),
getPropertyName(), ac);
}
} else {
- throw new InvalidParamException("value",
- expression.getValue(),
+ throw new InvalidParamException("value",
+ expression.getValue(),
getPropertyName(), ac);
}
values.addElement(val);
@@ -96,26 +96,26 @@
}
}
-
- public CssQuotesATSC(ApplContext ac, CssExpression expression)
+
+ public CssQuotesATSC(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return values;
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "quotes";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -123,7 +123,7 @@
public boolean isSoftlyInherited() {
return values.elementAt(0) == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -136,7 +136,7 @@
}
return ret.substring(1);
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -149,13 +149,13 @@
}
style0.cssQuotesATSC = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getQuotesATSC();
@@ -163,21 +163,21 @@
return ((Css1Style) style).cssQuotesATSC;
}
}
-
+
/**
* 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: CssMarginTop.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssMarginTop.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssMarginTop.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssMarginTop.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -38,7 +38,7 @@
public CssMarginTop() {
super();
}
-
+
/**
* Create a new CssMarginTop with an another CssMarginSide
*
@@ -47,7 +47,7 @@
public CssMarginTop(CssMarginSide another) {
super(another);
}
-
+
/**
* Create a new CssMarginTop
*
@@ -58,15 +58,15 @@
throws InvalidParamException {
super(ac, expression);
}
-
+
public CssMarginTop(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
super(ac, expression, check);
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "margin-top";
}
@@ -88,7 +88,7 @@
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getMarginTop();
@@ -101,7 +101,7 @@
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
return (property instanceof CssMarginTop && value.equals(((CssMarginTop) property).value));
}
Index: CssTextDecorationMob.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssTextDecorationMob.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssTextDecorationMob.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssTextDecorationMob.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -48,41 +48,41 @@
*
* @version $Revision$
*/
-public class CssTextDecorationMob extends CssProperty
+public class CssTextDecorationMob extends CssProperty
implements CssTextPropertiesConstants {
-
+
CssValue value;
private boolean[] values = new boolean[TEXTDECORATIONMOB.length];
-
+
private static int[] hash_values;
-
+
private static CssIdent none = new CssIdent("none");
-
+
private static final int INVALID = -1;
-
+
/**
* Create a new CssTextDecorationMob
*/
public CssTextDecorationMob() {
- }
-
+ }
+
/**
* Create a new CssTextDecorationMob
*
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
- */
+ */
public CssTextDecorationMob(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
CssValue val = expression.getValue();
boolean find = true;
//int computed = 0;
int index = INVALID;
-
+
setByUser();
-
+
if (val.equals(none)) {
if(expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
@@ -99,23 +99,23 @@
return;
}
val = null;
-
+
if(check && expression.getCount() > 4) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
while (find) {
find = false;
val = expression.getValue();
-
+
if(val != null && val.equals(inherit)) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
if (val instanceof CssIdent) {
index = getIndex((CssIdent) val, ac);
if (values[index] == true) {
- throw new InvalidParamException("same-value",
+ throw new InvalidParamException("same-value",
TEXTDECORATIONMOB[index], ac);
} else {
values[index] = true;
@@ -123,17 +123,17 @@
expression.next();
}
} else if (val != null) {
- throw new InvalidParamException("value", val.toString(),
+ throw new InvalidParamException("value", val.toString(),
getPropertyName(), ac);
}
}
}
-
- public CssTextDecorationMob(ApplContext ac, CssExpression expression)
+
+ public CssTextDecorationMob(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
@@ -148,14 +148,14 @@
}
return null;
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "text-decoration";
}
-
+
private int getIndex(CssIdent val, ApplContext ac) throws InvalidParamException {
int hash = val.hashCode();
for (int i = 0; i < TEXTDECORATIONMOB.length; i++) {
@@ -163,10 +163,10 @@
return i;
}
}
- throw new InvalidParamException("value", val.toString(),
+ throw new InvalidParamException("value", val.toString(),
getPropertyName(), ac);
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -174,7 +174,7 @@
public boolean isSoftlyInherited() {
return value == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -191,7 +191,7 @@
return ret.substring(1);
}
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -204,13 +204,13 @@
}
style0.cssTextDecorationMob = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getTextDecorationMob();
@@ -218,21 +218,21 @@
return ((Css1Style) style).cssTextDecorationMob;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
// @@ FIXME
return false;
}
-
+
static {
hash_values = new int[TEXTDECORATIONMOB.length];
for (int i=0; i<TEXTDECORATIONMOB.length; i++) {
hash_values[i] = TEXTDECORATIONMOB[i].hashCode();
}
- }
+ }
}
Index: CssMarginLeft.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssMarginLeft.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssMarginLeft.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssMarginLeft.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -38,7 +38,7 @@
public CssMarginLeft() {
super();
}
-
+
/**
* Create a new CssMarginLeft with an another CssMarginSide
*
@@ -47,26 +47,26 @@
public CssMarginLeft(CssMarginSide another) {
super(another);
}
-
+
/**
* Create a new CssMarginLeft
*
* @param expression The expression foir this property.
* @exception InvalidParamException Values are incorrect
*/
- public CssMarginLeft(ApplContext ac, CssExpression expression)
+ public CssMarginLeft(ApplContext ac, CssExpression expression)
throws InvalidParamException {
super(ac, expression);
}
-
+
public CssMarginLeft(ApplContext ac, CssExpression expression, boolean check)
throws InvalidParamException {
super(ac, expression, check);
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "margin-left";
}
@@ -88,7 +88,7 @@
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getMarginLeft();
@@ -101,9 +101,9 @@
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssMarginLeft &&
+ return (property instanceof CssMarginLeft &&
value.equals(((CssMarginLeft) property).value));
}
Index: CssBorderLeftColorCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderLeftColorCSS2.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CssBorderLeftColorCSS2.java 8 Sep 2005 12:23:33 -0000 1.3
+++ CssBorderLeftColorCSS2.java 14 Sep 2005 15:14:31 -0000 1.4
@@ -20,27 +20,27 @@
* @version $Revision$
*/
public class CssBorderLeftColorCSS2 extends CssProperty {
-
+
CssBorderFaceColorCSS2 face;
-
+
/**
* Create a new CssBorderLeftColorCSS2
*/
public CssBorderLeftColorCSS2() {
face = new CssBorderFaceColorCSS2();
}
-
+
/**
* Create a new CssBorderLeftColorCSS2 with an another CssBorderFaceColorCSS2
* @param another The another side.
*/
public CssBorderLeftColorCSS2(CssBorderFaceColorCSS2 another) {
-
+
setByUser();
-
+
face = another;
}
-
+
/**
* Create a new CssBorderLeftColorCSS2
*
@@ -49,20 +49,20 @@
*/
public CssBorderLeftColorCSS2(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
face = new CssBorderFaceColorCSS2(ac, expression);
}
-
- public CssBorderLeftColorCSS2(ApplContext ac, CssExpression expression)
+
+ public CssBorderLeftColorCSS2(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* @return Returns the face.
*/
@@ -83,7 +83,7 @@
public Object get() {
return face;
}
-
+
/**
* Returns the color of this property
*/
@@ -93,7 +93,7 @@
}
return null;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -103,14 +103,14 @@
}
return "";
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "border-left-color";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -122,13 +122,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 ((Css1Style) style).getBorderLeftColorCSS2();
@@ -136,21 +136,21 @@
return ((Css1Style) style).cssBorderCSS2.getLeft().color;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
return (property instanceof CssBorderLeftColorCSS2 && face.equals(((CssBorderLeftColorCSS2) property).face));
}
-
+
/**
* Print this property
*
* @param printer The printer.
- */
+ */
public void print(CssPrinterStyle printer) {
if (face != null && !face.isDefault())
printer.print(this);
Index: CssOverflow.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssOverflow.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssOverflow.java 23 Aug 2005 16:23:12 -0000 1.1
+++ CssOverflow.java 14 Sep 2005 15:14:31 -0000 1.2
@@ -18,36 +18,36 @@
/**
*/
public class CssOverflow extends CssProperty {
-
+
CssValue value;
-
+
private static CssIdent visible = new CssIdent("visible");
private static CssIdent hidden = new CssIdent("hidden");
private static CssIdent scroll = new CssIdent("scroll");
private static CssIdent auto = new CssIdent("auto");
-
+
/**
* Create a new CssOverflow
*/
public CssOverflow() {
value = visible;
- }
-
+ }
+
/**
* Create a new CssOverflow
*
* @param expression The expression for this property
* @exception InvalidParamException The expression is incorrect
- */
+ */
public CssOverflow(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)) {
value = inherit;
@@ -68,30 +68,30 @@
value = auto;
expression.next();
} else {
- throw new InvalidParamException("value", expression.getValue(),
+ throw new InvalidParamException("value", expression.getValue(),
getPropertyName(), ac);
- }
+ }
}
-
+
public CssOverflow(ApplContext ac, CssExpression expression)
throws InvalidParamException {
this(ac, expression, false);
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return value;
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "overflow";
}
-
+
/**
* Returns true if this property is "softly" inherited
* e.g. his value equals inherit
@@ -99,14 +99,14 @@
public boolean isSoftlyInherited() {
return value == inherit;
}
-
+
/**
* Returns a string representation of the object.
*/
public String toString() {
return value.toString();
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -118,13 +118,13 @@
style0.addRedefinitionWarning(ac, this);
style0.cssOverflow = this;
}
-
+
/**
* Get this property in the style.
*
* @param style The style where the property is
* @param resolve if true, resolve the style to find this property
- */
+ */
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
return ((Css1Style) style).getOverflow();
@@ -132,23 +132,23 @@
return ((Css1Style) style).cssOverflow;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssOverflow &&
+ return (property instanceof CssOverflow &&
value.equals(((CssOverflow) property).value));
}
-
+
/**
* Is the value of this property is a default value.
* It is used by all macro for the function <code>print</code>
- */
+ */
public boolean isDefault() {
return value == visible;
}
-
+
}
Index: CssBorderRightWidthCSS2.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderRightWidthCSS2.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderRightWidthCSS2.java 8 Sep 2005 12:23:34 -0000 1.2
+++ CssBorderRightWidthCSS2.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -41,19 +41,19 @@
* <P>
* Border widths cannot be negative.
*
- * @version $Revision$
+ * @version $Revision$
*/
public class CssBorderRightWidthCSS2 extends CssProperty {
-
+
CssBorderFaceWidthCSS2 face;
-
+
/**
* Create a new CssBorderRightWidth
*/
public CssBorderRightWidthCSS2() {
face = new CssBorderFaceWidthCSS2();
}
-
+
/**
* Create a new CssBorderRightWidthCSS2 with an another CssBorderFaceWidthCSS2
*
@@ -61,10 +61,10 @@
*/
public CssBorderRightWidthCSS2(CssBorderFaceWidthCSS2 another) {
setByUser();
-
+
face = another;
}
-
+
/**
* Create a new CssBorderRightWidthCSS2
*
@@ -73,28 +73,28 @@
*/
public CssBorderRightWidthCSS2(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
setByUser();
-
+
face = new CssBorderFaceWidthCSS2(ac, expression);
}
-
+
public CssBorderRightWidthCSS2(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
*/
@@ -104,7 +104,7 @@
}
return null;
}
-
+
/**
* Returns a string representation of the object.
*/
@@ -114,14 +114,14 @@
}
return "";
}
-
+
/**
* Returns the name of this property
- */
+ */
public String getPropertyName() {
return "border-right-width";
}
-
+
/**
* Add this property to the CssStyle.
*
@@ -133,13 +133,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 ((Css1Style) style).getBorderRightWidthCSS2();
@@ -147,15 +147,15 @@
return ((Css1Style) style).cssBorderCSS2.getRight().width;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
- */
+ */
public boolean equals(CssProperty property) {
- return (property instanceof CssBorderRightWidthCSS2 &&
+ return (property instanceof CssBorderRightWidthCSS2 &&
face.equals(((CssBorderRightWidthCSS2) property).face));
}
-
+
}
Index: CssBorderFaceWidth.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css1/CssBorderFaceWidth.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CssBorderFaceWidth.java 8 Sep 2005 12:23:33 -0000 1.2
+++ CssBorderFaceWidth.java 14 Sep 2005 15:14:31 -0000 1.3
@@ -19,16 +19,16 @@
* @version $Revision$
*/
public class CssBorderFaceWidth {
-
+
CssValue value;
-
+
/**
* Create a new CssBorderFaceWidth
*/
public CssBorderFaceWidth() {
//value = medium;
}
-
+
/**
* Create a new CssBorderFaceWidth from an another CssBorderFaceWidth
*
@@ -37,7 +37,7 @@
public CssBorderFaceWidth(CssBorderFaceWidth another) {
value = another.value;
}
-
+
/**
* Create a new CssBorderFaceWidth
*
@@ -46,14 +46,14 @@
*/
public CssBorderFaceWidth(ApplContext ac, CssExpression expression,
boolean check) throws InvalidParamException {
-
+
if(check && expression.getCount() > 1) {
throw new InvalidParamException("unrecognize", ac);
}
-
+
CssValue val = expression.getValue();
CssIdent initial = new CssIdent("initial");
-
+
if (val instanceof CssLength) {
float f = ((Float) val.get()).floatValue();
if (f >= 0)
@@ -77,34 +77,34 @@
} else {
throw new InvalidParamException("value", val.toString(), "width", ac);
}
-
+
expression.next();
}
-
- public CssBorderFaceWidth(ApplContext ac, CssExpression expression)
+
+ public CssBorderFaceWidth(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() {
-
+
if (value != null) {
return value.toString();
} else {
return "";
}
}
-
+
/**
* Compares two sides for equality.
*
@@ -113,11 +113,11 @@
public boolean equals(CssBorderFaceWidth another) {
return value.equals(another.value); // FIXME
}
-
+
private static CssIdent thin = new CssIdent("thin");
private static CssIdent medium = new CssIdent("medium");
private static CssIdent thick = new CssIdent("thick");
-
+
}
Received on Wednesday, 14 September 2005 15:25:47 UTC