- From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
- Date: Mon, 08 Aug 2005 13:19:36 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/svgproperties
In directory hutz:/tmp/cvs-serv27412/org/w3c/css/svgproperties
Modified Files:
AlignmentBaseline.java AtRuleColorProfile.java ClipPath.java
ClipRule.java ColorInterpolation.java
ColorInterpolationFilters.java ColorProfile.java
ColorProfileName.java ColorProfileSrc.java ColorRendering.java
CssRenderIntent.java DominantBaseLine.java
EnableBackground.java Fill.java FillOpacity.java FillRule.java
Filter.java FloodColor.java FloodOpacity.java
ImageRendering.java Kerning.java LightingColor.java
Marker.java MarkerEnd.java MarkerMid.java MarkerStart.java
Mask.java PointerEvents.java SVGBasicStyle.java SVGStyle.java
SVGTinyStyle.java ShapeRendering.java SolidColor.java
SolidOpacity.java StopColor.java StopOpacity.java Stroke.java
StrokeDashArray.java StrokeDashOffset.java StrokeLineCap.java
StrokeLinejoin.java StrokeMiterLimit.java StrokeOpacity.java
StrokeWidth.java TextAnchor.java TextRendering.java
WritingModeSVG.java
Log Message:
All those changed made by Jean-Guilhem Rouel:
Huge patch, imports fixed (automatic)
Bug fixed: 372, 920, 778, 287, 696, 764, 233
Partial bug fix for 289
Issue with "inherit" in CSS2.
The validator now checks the number of values (extraneous values were previously ignored)
Index: DominantBaseLine.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/svgproperties/DominantBaseLine.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- DominantBaseLine.java 19 Jul 2002 20:58:01 -0000 1.1
+++ DominantBaseLine.java 8 Aug 2005 13:19:34 -0000 1.2
@@ -9,12 +9,12 @@
package org.w3c.css.svgproperties;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssExpression;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
+import org.w3c.css.values.CssValue;
/**
* <P>
@@ -37,36 +37,37 @@
*/
public class DominantBaseLine extends CssProperty {
-
+
CssValue dombaseline;
-
+
static CssIdent auto = new CssIdent("auto");
-
+
private static String[] values = {
"auto", "use-script", "no-change", "reset-size",
"ideographic", "alphabetic", "hanging", "mathematical",
"central", "middle", "text-after-edge", "text-before-edge",
"text-top", "text-bottom", "inherit"
};
-
+
/**
* Create a new DominantBaseLine
*/
public DominantBaseLine() {
dombaseline = auto;
}
-
+
/**
* Create a new DominantBaseLine
*
* @param expression The expression for this property
* @exception InvalidParamException Incorrect value
*/
- public DominantBaseLine(ApplContext ac, CssExpression expression) throws InvalidParamException {
-
+ public DominantBaseLine(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+
setByUser();
CssValue val = expression.getValue();
-
+
int i = 0;
for (; i < values.length; i++) {
if (val.toString().equals(values[i])) {
@@ -77,10 +78,15 @@
}
if (i == values.length) {
throw new InvalidParamException("value", expression.getValue(),
- getPropertyName(), ac);
+ getPropertyName(), ac);
}
}
-
+
+ public DominantBaseLine(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Add this property to the CssStyle
*
@@ -91,7 +97,7 @@
style.addRedefinitionWarning(ac, this);
((SVGStyle) style).dominantBaseLine = this;
}
-
+
/**
* Get this property in the style.
*
@@ -106,7 +112,7 @@
return ((SVGStyle) style).dominantBaseLine;
}
}
-
+
/**
* Compares two properties for equality.
*
@@ -116,35 +122,35 @@
return (property instanceof DominantBaseLine &&
dombaseline.equals(((DominantBaseLine) property).dombaseline));
}
-
+
/**
* Returns the name of this property
*/
public String getPropertyName() {
return "dominant-baseline";
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return dombaseline;
}
-
+
/**
* Returns true if this property is "softly" inherited
*/
public boolean isSoftlyInherited() {
return dombaseline.equals(inherit);
}
-
+
/**
* Returns a string representation of the object
*/
public String toString() {
return dombaseline.toString();
}
-
+
/**
* Is the value of this property a default value
* It is used by alle macro for the function <code>print</code>
@@ -152,7 +158,7 @@
public boolean isDefault() {
return (dombaseline == auto);
}
-
+
}
Index: ImageRendering.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/svgproperties/ImageRendering.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ImageRendering.java 19 Jul 2002 20:58:01 -0000 1.1
+++ ImageRendering.java 8 Aug 2005 13:19:34 -0000 1.2
@@ -9,14 +9,12 @@
package org.w3c.css.svgproperties;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssExpression;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.Util;
-import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.ApplContext;
-import org.w3c.css.values.CssURL;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
+import org.w3c.css.values.CssValue;
/**
* <P>
@@ -29,119 +27,125 @@
*/
public class ImageRendering extends CssProperty {
-
+
CssValue rendering;
ApplContext ac;
-
+
CssIdent auto = new CssIdent("auto");
CssIdent optimizeSpeed = new CssIdent("optimizeSpeed");
CssIdent optimizeQuality = new CssIdent("optimizeQuality");
-
+
/**
* Create a new Rendering
*/
- public ImageRendering() {
- //nothing to do
- }
-
- /**
- * Create a new ImageRendering
- *
- * @param expression The expression for this property
- * @exception InvalidParamException Values are incorrect
- */
- public ImageRendering(ApplContext ac, CssExpression expression) throws InvalidParamException {
- this.ac = ac;
- setByUser(); // tell this property is set by the user
- CssValue val = expression.getValue();
-
- if (val.equals(inherit)) {
- rendering = inherit;
- expression.next();
- } else if (val.equals(optimizeSpeed)) {
- rendering = val;
- expression.next();
- } else if (val.equals(optimizeQuality)) {
- rendering = val;
- expression.next();
- } else if (val.equals(auto)) {
- rendering = auto;
- expression.next();
- }
- else {
- throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
- }
- }
-
+ public ImageRendering() {
+ //nothing to do
+ }
+
+ /**
+ * Create a new ImageRendering
+ *
+ * @param expression The expression for this property
+ * @exception InvalidParamException Values are incorrect
+ */
+ public ImageRendering(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+ this.ac = ac;
+ setByUser(); // tell this property is set by the user
+ CssValue val = expression.getValue();
+
+ if (val.equals(inherit)) {
+ rendering = inherit;
+ expression.next();
+ } else if (val.equals(optimizeSpeed)) {
+ rendering = val;
+ expression.next();
+ } else if (val.equals(optimizeQuality)) {
+ rendering = val;
+ expression.next();
+ } else if (val.equals(auto)) {
+ rendering = auto;
+ expression.next();
+ }
+ else {
+ throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
+ }
+ }
+
+ public ImageRendering(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Add this property to the CssStyle.
*
* @param style The CssStyle
*/
- public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).imageRendering != null)
- style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).imageRendering = this;
- }
+ public void addToStyle(ApplContext ac, CssStyle style) {
+ if (((SVGStyle) style).imageRendering != null)
+ style.addRedefinitionWarning(ac, this);
+ ((SVGStyle) style).imageRendering = 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 ((SVGStyle) style).getImageRendering();
- } else {
- return ((SVGStyle) style).imageRendering;
- }
+ /**
+ * 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 ((SVGStyle) style).getImageRendering();
+ } else {
+ return ((SVGStyle) style).imageRendering;
}
+ }
+
+ /**
+ * Compares two properties for equality.
+ *
+ * @param value The other property.
+ */
+ public boolean equals(CssProperty property) {
+ return (property instanceof ImageRendering &&
+ rendering.equals( ((ImageRendering) property).rendering));
+ }
- /**
- * Compares two properties for equality.
- *
- * @param value The other property.
- */
- public boolean equals(CssProperty property) {
- return (property instanceof ImageRendering &&
- rendering.equals( ((ImageRendering) property).rendering));
- }
-
/**
* Returns the name of this property
*/
- public String getPropertyName() {
- return "image-rendering";
- }
-
+ public String getPropertyName() {
+ return "image-rendering";
+ }
+
/**
* Returns the value of this property
*/
- public Object get() {
- return rendering;
- }
-
+ public Object get() {
+ return rendering;
+ }
+
/**
* Returns true if this property is "softly" inherited
*/
- public boolean isSoftlyInherited() {
- return rendering.equals(inherit);
- }
-
- /**
- * Returns a string representation of the object
- */
- public String toString() {
- return rendering.toString();
- }
-
+ public boolean isSoftlyInherited() {
+ return rendering.equals(inherit);
+ }
+
+ /**
+ * Returns a string representation of the object
+ */
+ public String toString() {
+ return rendering.toString();
+ }
+
/**
* Is the value of this property a default value
* It is used by all macro for the function <code>print</code>
*/
- public boolean isDefault() {
- return (rendering == auto);
- }
-
+ public boolean isDefault() {
+ return (rendering == auto);
+ }
+
}
Index: LightingColor.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/svgproperties/LightingColor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- LightingColor.java 19 Jul 2002 20:58:01 -0000 1.1
+++ LightingColor.java 8 Aug 2005 13:19:34 -0000 1.2
@@ -11,17 +11,16 @@
import java.util.Vector;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssExpression;
+import org.w3c.css.properties.CssColor;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.Util;
-import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.ApplContext;
-import org.w3c.css.properties.CssColor;
-import org.w3c.css.values.CssOperator;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
import org.w3c.css.values.CssFunction;
+import org.w3c.css.values.CssIdent;
import org.w3c.css.values.CssNumber;
+import org.w3c.css.values.CssOperator;
+import org.w3c.css.values.CssValue;
/**
* <P>
@@ -35,197 +34,203 @@
*/
public class LightingColor extends CssProperty implements CssOperator {
-
+
CssValue lightingColor;
ApplContext ac;
Vector values = new Vector();
-
+
CssIdent currentColor = new CssIdent("currentColor");
-
+
/**
* Create a new LightingColor
*/
- public LightingColor() {
- //nothing to do
- }
-
- /**
- * Create a new LightingColor
- *
- * @param expression The expression for this property
- * @exception InvalidParamException Values are incorrect
- */
- public LightingColor(ApplContext ac, CssExpression expression) throws InvalidParamException {
- this.ac = ac;
- setByUser(); // tell this property is set by the user
- CssValue val = expression.getValue();
-
- boolean correct = true;
- String errorval = "";
- char op = expression.getOperator();
- CssColor color;
-
- if (val.equals(inherit)) {
- lightingColor = inherit;
- expression.next();
- } else if (val.equals(currentColor)) {
- lightingColor = currentColor;
- expression.next();
- } else {
- try {
- color = new CssColor(ac, expression);
- values.addElement(val);
- //expression.next();
- } catch (InvalidParamException e) {
- correct = false;
- errorval = val.toString();
- }
-
- op = expression.getOperator();
- val = expression.getValue();
-
- if (val != null) {
- if (val instanceof CssFunction) { // icc-color(<name>[,<icccolorvalue>]*)]
- CssValue function = val;
- if (!((CssFunction) val).getName().equals("icc-color")) {
- correct = false;
- errorval = val.toString();
- } else {
- CssExpression params = ((CssFunction) val).getParameters();
-
- op = params.getOperator();
- val = params.getValue();
-
- if (!(val instanceof CssIdent)) {
- correct = false;
- errorval = val.toString();
- }
-
- params.next();
- op = params.getOperator();
- val = params.getValue();
-
- if (!params.end()) { // there are more parameters left
- int counter = 0;
-
- while ((op == COMMA || op == SPACE)
- && (counter < (params.getCount() - 1) && correct == true)) {
-
- if ((!(val instanceof CssNumber)) || (((CssNumber) val).getValue() < 0)) {
- correct = false;
- errorval = val.toString();
- }
-
- params.next();
- counter++;
- val = params.getValue();
- op = params.getOperator();
- }
- }
-
- if (correct) {
- params.starts();
- values.addElement(function);
- }
- }
- } else {
- correct = false;
- errorval = val.toString();
- }
- } else {
- correct = false;
- errorval = new String("");
- }
-
- expression.next();
-
- }
-
- if (!correct) {
- throw new InvalidParamException("value", errorval, getPropertyName(), ac);
- }
- }
-
+ public LightingColor() {
+ //nothing to do
+ }
+
/**
- * Add this property to the CssStyle.
+ * Create a new LightingColor
*
- * @param style The CssStyle
+ * @param expression The expression for this property
+ * @exception InvalidParamException Values are incorrect
*/
- public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).lightingColor != null)
- style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).lightingColor = 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 ((SVGStyle) style).getLightingColor();
+ public LightingColor(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+ this.ac = ac;
+ setByUser(); // tell this property is set by the user
+ CssValue val = expression.getValue();
+
+ boolean correct = true;
+ String errorval = "";
+ char op = expression.getOperator();
+ CssColor color;
+
+ if (val.equals(inherit)) {
+ lightingColor = inherit;
+ expression.next();
+ } else if (val.equals(currentColor)) {
+ lightingColor = currentColor;
+ expression.next();
+ } else {
+ try {
+ color = new CssColor(ac, expression);
+ values.addElement(val);
+ //expression.next();
+ } catch (InvalidParamException e) {
+ correct = false;
+ errorval = val.toString();
+ }
+
+ op = expression.getOperator();
+ val = expression.getValue();
+
+ if (val != null) {
+ if (val instanceof CssFunction) { // icc-color(<name>[,<icccolorvalue>]*)]
+ CssValue function = val;
+ if (!((CssFunction) val).getName().equals("icc-color")) {
+ correct = false;
+ errorval = val.toString();
+ } else {
+ CssExpression params = ((CssFunction) val).getParameters();
+
+ op = params.getOperator();
+ val = params.getValue();
+
+ if (!(val instanceof CssIdent)) {
+ correct = false;
+ errorval = val.toString();
+ }
+
+ params.next();
+ op = params.getOperator();
+ val = params.getValue();
+
+ if (!params.end()) { // there are more parameters left
+ int counter = 0;
+
+ while ((op == COMMA || op == SPACE)
+ && (counter < (params.getCount() - 1) && correct == true)) {
+
+ if ((!(val instanceof CssNumber)) || (((CssNumber) val).getValue() < 0)) {
+ correct = false;
+ errorval = val.toString();
+ }
+
+ params.next();
+ counter++;
+ val = params.getValue();
+ op = params.getOperator();
+ }
+ }
+
+ if (correct) {
+ params.starts();
+ values.addElement(function);
+ }
+ }
+ } else {
+ correct = false;
+ errorval = val.toString();
+ }
} else {
- return ((SVGStyle) style).lightingColor;
+ correct = false;
+ errorval = new String("");
}
+
+ expression.next();
+
}
-
- /**
- * Compares two properties for equality.
- *
- * @param value The other property.
- */
- public boolean equals(CssProperty property) {
- return (property instanceof LightingColor &&
- lightingColor.equals( ((LightingColor) property).lightingColor));
- }
-
+
+ if (!correct) {
+ throw new InvalidParamException("value", errorval, getPropertyName(), ac);
+ }
+ }
+
+ public LightingColor(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
+ /**
+ * Add this property to the CssStyle.
+ *
+ * @param style The CssStyle
+ */
+ public void addToStyle(ApplContext ac, CssStyle style) {
+ if (((SVGStyle) style).lightingColor != null)
+ style.addRedefinitionWarning(ac, this);
+ ((SVGStyle) style).lightingColor = 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 ((SVGStyle) style).getLightingColor();
+ } else {
+ return ((SVGStyle) style).lightingColor;
+ }
+ }
+
+ /**
+ * Compares two properties for equality.
+ *
+ * @param value The other property.
+ */
+ public boolean equals(CssProperty property) {
+ return (property instanceof LightingColor &&
+ lightingColor.equals( ((LightingColor) property).lightingColor));
+ }
+
/**
* Returns the name of this property
*/
- public String getPropertyName() {
- return "lighting-color";
- }
-
+ public String getPropertyName() {
+ return "lighting-color";
+ }
+
/**
* Returns the value of this property
*/
- public Object get() {
- if (lightingColor != null)
- return lightingColor;
- else
- return values;
- }
-
+ public Object get() {
+ if (lightingColor != null)
+ return lightingColor;
+ else
+ return values;
+ }
+
/**
* Returns true if this property is "softly" inherited
*/
- public boolean isSoftlyInherited() {
- return lightingColor.equals(inherit);
- }
-
- /**
- * Returns a string representation of the object
- */
- public String toString() {
- if (lightingColor != null) {
- return lightingColor.toString();
- } else {
- String ret = "";
- for (int i = 0; i < values.size(); i++) {
- ret += " " + values.elementAt(i).toString();
- }
- return ret;
- }
- }
-
+ public boolean isSoftlyInherited() {
+ return lightingColor.equals(inherit);
+ }
+
+ /**
+ * Returns a string representation of the object
+ */
+ public String toString() {
+ if (lightingColor != null) {
+ return lightingColor.toString();
+ } else {
+ String ret = "";
+ for (int i = 0; i < values.size(); i++) {
+ ret += " " + values.elementAt(i).toString();
+ }
+ return ret;
+ }
+ }
+
/**
* Is the value of this property a default value
* It is used by all macro for the function <code>print</code>
*/
- public boolean isDefault() {
- return false;
- }
-
+ public boolean isDefault() {
+ return false;
+ }
+
}
Index: Filter.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/svgproperties/Filter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Filter.java 19 Jul 2002 20:58:01 -0000 1.1
+++ Filter.java 8 Aug 2005 13:19:34 -0000 1.2
@@ -9,14 +9,13 @@
package org.w3c.css.svgproperties;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssExpression;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.Util;
-import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
import org.w3c.css.values.CssURL;
+import org.w3c.css.values.CssValue;
/**
* <P>
@@ -29,117 +28,123 @@
*/
public class Filter extends CssProperty {
-
- CssValue value;
+
+ CssValue value;
ApplContext ac;
-
+
CssIdent none = new CssIdent("none");
-
+
/**
* Create a new Filter
*/
- public Filter() {
- // nothing to do
- }
-
- /**
- * Create a new Filter
- *
- * @param expression The expression for this property
- * @exception InvalidParamException Values are incorrect
- */
- public Filter(ApplContext ac, CssExpression expression) throws InvalidParamException {
- this.ac = ac;
- setByUser(); // tell this property is set by the user
- CssValue val = expression.getValue();
- if (val instanceof CssURL) {
- value = val;
- expression.next();
- }
- else if (val instanceof CssIdent) {
- if (val.equals(inherit)) {
- value = inherit;
- expression.next();
- } else if (val.equals(none)) {
- value = none;
- expression.next();
- }
- }
- else {
- throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
- }
- }
-
+ public Filter() {
+ // nothing to do
+ }
+
+ /**
+ * Create a new Filter
+ *
+ * @param expression The expression for this property
+ * @exception InvalidParamException Values are incorrect
+ */
+ public Filter(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+ this.ac = ac;
+ setByUser(); // tell this property is set by the user
+ CssValue val = expression.getValue();
+ if (val instanceof CssURL) {
+ value = val;
+ expression.next();
+ }
+ else if (val instanceof CssIdent) {
+ if (val.equals(inherit)) {
+ value = inherit;
+ expression.next();
+ } else if (val.equals(none)) {
+ value = none;
+ expression.next();
+ }
+ }
+ else {
+ throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
+ }
+ }
+
+ public Filter(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Add this property to the CssStyle.
*
* @param style The CssStyle
*/
- public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).filter != null)
- style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).filter = this;
- }
+ public void addToStyle(ApplContext ac, CssStyle style) {
+ if (((SVGStyle) style).filter != null)
+ style.addRedefinitionWarning(ac, this);
+ ((SVGStyle) style).filter = 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 ((SVGStyle) style).getFilter();
- } else {
- return ((SVGStyle) style).filter;
- }
+ /**
+ * 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 ((SVGStyle) style).getFilter();
+ } else {
+ return ((SVGStyle) style).filter;
}
+ }
+
+ /**
+ * Compares two properties for equality.
+ *
+ * @param value The other property.
+ */
+ public boolean equals(CssProperty property) {
+ return (property instanceof Filter &&
+ value.equals( ((Filter) property).value));
+ }
- /**
- * Compares two properties for equality.
- *
- * @param value The other property.
- */
- public boolean equals(CssProperty property) {
- return (property instanceof Filter &&
- value.equals( ((Filter) property).value));
- }
-
/**
* Returns the name of this property
*/
- public String getPropertyName() {
- return "filter";
- }
-
+ public String getPropertyName() {
+ return "filter";
+ }
+
/**
* Returns the value of this property
*/
- public Object get() {
- return value;
- }
-
+ public Object get() {
+ return value;
+ }
+
/**
* Returns true if this property is "softly" inherited
*/
- public boolean isSoftlyInherited() {
- return value.equals(inherit);
- }
-
- /**
- * Returns a string representation of the object
- */
- public String toString() {
- return value.toString();
- }
-
+ public boolean isSoftlyInherited() {
+ return value.equals(inherit);
+ }
+
+ /**
+ * Returns a string representation of the object
+ */
+ public String toString() {
+ return value.toString();
+ }
+
/**
* Is the value of this property a default value
* It is used by all macro for the function <code>print</code>
*/
- public boolean isDefault() {
- return value == none;
- }
-
+ public boolean isDefault() {
+ return value == none;
+ }
+
}
Index: ColorProfileName.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/svgproperties/ColorProfileName.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ColorProfileName.java 19 Jul 2002 20:58:01 -0000 1.1
+++ ColorProfileName.java 8 Aug 2005 13:19:34 -0000 1.2
@@ -8,19 +8,14 @@
package org.w3c.css.svgproperties;
-import java.util.Vector;
-
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssExpression;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.ApplContext;
-import org.w3c.css.values.CssNumber;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
import org.w3c.css.values.CssOperator;
-import org.w3c.css.values.CssFunction;
-import org.w3c.css.values.CssURL;
+import org.w3c.css.values.CssValue;
/**
* This property sets the preferred media for this stylesheet
@@ -29,99 +24,105 @@
public class ColorProfileName extends CssProperty implements CssOperator {
CssValue cpName;
-
+
/**
* Create a new ColorProfileName
*/
public ColorProfileName() {
- // no initial value
+ // no initial value
}
-
+
/**
* Create a new ColorProfileName
*/
- public ColorProfileName(ApplContext ac, CssExpression expression) throws InvalidParamException {
-
- CssValue val = expression.getValue();
-
- if (val instanceof CssIdent) {
- cpName = val;
- expression.next();
- } else {
- throw new InvalidParamException("value",
- val, getPropertyName(), ac);
- }
+ public ColorProfileName(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+
+ CssValue val = expression.getValue();
+
+ if (val instanceof CssIdent) {
+ cpName = val;
+ expression.next();
+ } else {
+ throw new InvalidParamException("value",
+ val, getPropertyName(), ac);
+ }
}
-
+
+ public ColorProfileName(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Add this property to the CssStyle.
*
* @param style The CssStyle
- */
+ */
public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).cpName != null)
- style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).cpName = this;
+ if (((SVGStyle) style).cpName != null)
+ style.addRedefinitionWarning(ac, this);
+ ((SVGStyle) style).cpName = 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 ((SVGStyle) style).getColorProfileName();
- } else {
- return ((SVGStyle) style).cpName;
- }
- }
-
- /**
- * Compares two properties for equality.
- *
- * @param cpName The other property.
- */
- public boolean equals(CssProperty property) {
- return (property instanceof ColorProfileName &&
- cpName.equals( ((ColorProfileName) property).cpName));
- }
-
+ public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
+ if (resolve) {
+ return ((SVGStyle) style).getColorProfileName();
+ } else {
+ return ((SVGStyle) style).cpName;
+ }
+ }
+
+ /**
+ * Compares two properties for equality.
+ *
+ * @param cpName The other property.
+ */
+ public boolean equals(CssProperty property) {
+ return (property instanceof ColorProfileName &&
+ cpName.equals( ((ColorProfileName) property).cpName));
+ }
+
/**
* Returns the name of this property
*/
- public String getPropertyName() {
- return "name";
- }
-
+ public String getPropertyName() {
+ return "name";
+ }
+
/**
* Returns the cpName of this property
*/
- public Object get() {
- return cpName;
- }
-
+ public Object get() {
+ return cpName;
+ }
+
/**
* Returns true if this property is "softly" inherited
*/
- public boolean isSoftlyInherited() {
- return false;
- }
-
- /**
- * Returns a string representation of the object
- */
- public String toString() {
- return cpName.toString();
- }
-
+ public boolean isSoftlyInherited() {
+ return false;
+ }
+
+ /**
+ * Returns a string representation of the object
+ */
+ public String toString() {
+ return cpName.toString();
+ }
+
/**
* Is the cpName of this property a default cpName
* It is used by all macro for the function <code>print</code>
*/
- public boolean isDefault() {
- return false;
- }
-
+ public boolean isDefault() {
+ return false;
+ }
+
}
Index: ClipRule.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/svgproperties/ClipRule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ClipRule.java 19 Jul 2002 20:58:01 -0000 1.1
+++ ClipRule.java 8 Aug 2005 13:19:34 -0000 1.2
@@ -9,14 +9,12 @@
package org.w3c.css.svgproperties;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssExpression;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.Util;
-import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.ApplContext;
-import org.w3c.css.values.CssURL;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
+import org.w3c.css.values.CssValue;
/**
* <P>
@@ -29,115 +27,121 @@
*/
public class ClipRule extends CssProperty {
-
- CssValue cliprule;
+
+ CssValue cliprule;
ApplContext ac;
-
+
CssIdent nonzero = new CssIdent("nonzero");
CssIdent evenodd = new CssIdent("evenodd");
-
+
/**
* Create a new Cliprule
*/
- public ClipRule() {
- //nothing to do
- }
-
- /**
- * Create a new Cliprule
- *
- * @param expression The expression for this property
- * @exception InvalidParamException Values are incorrect
- */
- public ClipRule(ApplContext ac, CssExpression expression) throws InvalidParamException {
- this.ac = ac;
- setByUser(); // tell this property is set by the user
- CssValue val = expression.getValue();
-
- if (val.equals(inherit)) {
- cliprule = inherit;
- expression.next();
- } else if (val.equals(nonzero)) {
- cliprule = nonzero;
- expression.next();
- } else if (val.equals(evenodd)) {
- cliprule = evenodd;
- expression.next();
- }
- else {
- throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
- }
- }
-
+ public ClipRule() {
+ //nothing to do
+ }
+
+ /**
+ * Create a new Cliprule
+ *
+ * @param expression The expression for this property
+ * @exception InvalidParamException Values are incorrect
+ */
+ public ClipRule(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+ this.ac = ac;
+ setByUser(); // tell this property is set by the user
+ CssValue val = expression.getValue();
+
+ if (val.equals(inherit)) {
+ cliprule = inherit;
+ expression.next();
+ } else if (val.equals(nonzero)) {
+ cliprule = nonzero;
+ expression.next();
+ } else if (val.equals(evenodd)) {
+ cliprule = evenodd;
+ expression.next();
+ }
+ else {
+ throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
+ }
+ }
+
+ public ClipRule(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Add this property to the CssStyle.
*
* @param style The CssStyle
*/
- public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).clipRule != null)
- style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).clipRule = this;
- }
+ public void addToStyle(ApplContext ac, CssStyle style) {
+ if (((SVGStyle) style).clipRule != null)
+ style.addRedefinitionWarning(ac, this);
+ ((SVGStyle) style).clipRule = 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 ((SVGStyle) style).getClipRule();
- } else {
- return ((SVGStyle) style).clipRule;
- }
+ /**
+ * 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 ((SVGStyle) style).getClipRule();
+ } else {
+ return ((SVGStyle) style).clipRule;
}
+ }
+
+ /**
+ * Compares two properties for equality.
+ *
+ * @param value The other property.
+ */
+ public boolean equals(CssProperty property) {
+ return (property instanceof ClipRule &&
+ cliprule.equals( ((ClipRule) property).cliprule));
+ }
- /**
- * Compares two properties for equality.
- *
- * @param value The other property.
- */
- public boolean equals(CssProperty property) {
- return (property instanceof ClipRule &&
- cliprule.equals( ((ClipRule) property).cliprule));
- }
-
/**
* Returns the name of this property
*/
- public String getPropertyName() {
- return "clip-rule";
- }
-
+ public String getPropertyName() {
+ return "clip-rule";
+ }
+
/**
* Returns the value of this property
*/
- public Object get() {
- return cliprule;
- }
-
+ public Object get() {
+ return cliprule;
+ }
+
/**
* Returns true if this property is "softly" inherited
*/
- public boolean isSoftlyInherited() {
- return cliprule.equals(inherit);
- }
-
- /**
- * Returns a string representation of the object
- */
- public String toString() {
- return cliprule.toString();
- }
-
+ public boolean isSoftlyInherited() {
+ return cliprule.equals(inherit);
+ }
+
+ /**
+ * Returns a string representation of the object
+ */
+ public String toString() {
+ return cliprule.toString();
+ }
+
/**
* Is the value of this property a default value
* It is used by all macro for the function <code>print</code>
*/
- public boolean isDefault() {
- return (cliprule == nonzero);
- }
-
+ public boolean isDefault() {
+ return (cliprule == nonzero);
+ }
+
}
Index: StrokeOpacity.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/svgproperties/StrokeOpacity.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- StrokeOpacity.java 19 Jul 2002 20:58:01 -0000 1.1
+++ StrokeOpacity.java 8 Aug 2005 13:19:34 -0000 1.2
@@ -9,15 +9,13 @@
package org.w3c.css.svgproperties;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssExpression;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.Util;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
import org.w3c.css.properties3.CssOpacity;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
import org.w3c.css.values.CssNumber;
+import org.w3c.css.values.CssValue;
/**
* <P>
@@ -30,117 +28,123 @@
*/
public class StrokeOpacity extends CssProperty {
-
+
CssValue value;
ApplContext ac;
-
+
/**
* Create a new Value
*/
- public StrokeOpacity() {
- //nothing to do
- }
-
- /**
- * Create a new Value
- *
- * @param expression The expression for this property
- * @exception InvalidParamException Values are incorrect
- */
- public StrokeOpacity(ApplContext ac, CssExpression expression) throws InvalidParamException {
- this.ac = ac;
- setByUser(); // tell this property is set by the user
- CssValue val = expression.getValue();
- boolean correct = false;
-
- if (val.equals(inherit)) {
- value = inherit;
- expression.next();
- correct = true;
- } else {
- try {
- CssOpacity opac = new CssOpacity(ac, expression);
- value = val;
- expression.next();
- correct = true;
- } catch (InvalidParamException e) {
- correct = false;
- }
- }
- if (!correct) {
- throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
- }
- }
-
+ public StrokeOpacity() {
+ //nothing to do
+ }
+
+ /**
+ * Create a new Value
+ *
+ * @param expression The expression for this property
+ * @exception InvalidParamException Values are incorrect
+ */
+ public StrokeOpacity(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+ this.ac = ac;
+ setByUser(); // tell this property is set by the user
+ CssValue val = expression.getValue();
+ boolean correct = false;
+
+ if (val.equals(inherit)) {
+ value = inherit;
+ expression.next();
+ correct = true;
+ } else {
+ try {
+ CssOpacity opac = new CssOpacity(ac, expression);
+ value = val;
+ expression.next();
+ correct = true;
+ } catch (InvalidParamException e) {
+ correct = false;
+ }
+ }
+ if (!correct) {
+ throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
+ }
+ }
+
+ public StrokeOpacity(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Add this property to the CssStyle.
*
* @param style The CssStyle
*/
- public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).strokeOpacity != null)
- style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).strokeOpacity = this;
- }
+ public void addToStyle(ApplContext ac, CssStyle style) {
+ if (((SVGStyle) style).strokeOpacity != null)
+ style.addRedefinitionWarning(ac, this);
+ ((SVGStyle) style).strokeOpacity = 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 ((SVGStyle) style).getStrokeOpacity();
- } else {
- return ((SVGStyle) style).strokeOpacity;
- }
+ /**
+ * 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 ((SVGStyle) style).getStrokeOpacity();
+ } else {
+ return ((SVGStyle) style).strokeOpacity;
}
+ }
+
+ /**
+ * Compares two properties for equality.
+ *
+ * @param value The other property.
+ */
+ public boolean equals(CssProperty property) {
+ return (property instanceof StrokeOpacity &&
+ value.equals( ((StrokeOpacity) property).value));
+ }
- /**
- * Compares two properties for equality.
- *
- * @param value The other property.
- */
- public boolean equals(CssProperty property) {
- return (property instanceof StrokeOpacity &&
- value.equals( ((StrokeOpacity) property).value));
- }
-
/**
* Returns the name of this property
*/
- public String getPropertyName() {
- return "stroke-opacity";
- }
-
+ public String getPropertyName() {
+ return "stroke-opacity";
+ }
+
/**
* Returns the value of this property
*/
- public Object get() {
- return value;
- }
-
+ public Object get() {
+ return value;
+ }
+
/**
* Returns true if this property is "softly" inherited
*/
- public boolean isSoftlyInherited() {
- return value.equals(inherit);
- }
-
- /**
- * Returns a string representation of the object
- */
- public String toString() {
- return value.toString();
- }
-
+ public boolean isSoftlyInherited() {
+ return value.equals(inherit);
+ }
+
+ /**
+ * Returns a string representation of the object
+ */
+ public String toString() {
+ return value.toString();
+ }
+
/**
* Is the value of this property a default value
* It is used by all macro for the function <code>print</code>
*/
- public boolean isDefault() {
- CssNumber cssnum = new CssNumber(ac, (float) 1.0);
- return value == cssnum;
- }
+ public boolean isDefault() {
+ CssNumber cssnum = new CssNumber(ac, (float) 1.0);
+ return value == cssnum;
+ }
}
Index: Kerning.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/svgproperties/Kerning.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Kerning.java 19 Jul 2002 20:58:01 -0000 1.1
+++ Kerning.java 8 Aug 2005 13:19:34 -0000 1.2
@@ -9,14 +9,13 @@
package org.w3c.css.svgproperties;
import org.w3c.css.parser.CssStyle;
+import org.w3c.css.properties.CssProperty;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssValue;
import org.w3c.css.values.CssIdent;
import org.w3c.css.values.CssLength;
-import org.w3c.css.values.CssNumber;
-import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
+import org.w3c.css.values.CssValue;
/**
* <H4>
@@ -47,7 +46,8 @@
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
*/
- public Kerning(ApplContext ac, CssExpression expression)
+ public Kerning(ApplContext ac, CssExpression expression,
+ boolean check)
throws InvalidParamException {
setByUser();
@@ -69,6 +69,11 @@
}
}
+ public Kerning(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Index: SVGBasicStyle.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/svgproperties/SVGBasicStyle.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- SVGBasicStyle.java 19 Jul 2002 20:58:01 -0000 1.1
+++ SVGBasicStyle.java 8 Aug 2005 13:19:34 -0000 1.2
@@ -8,11 +8,7 @@
package org.w3c.css.svgproperties;
-import org.w3c.css.util.Warnings;
-import org.w3c.css.util.Warning;
-import org.w3c.css.util.ApplContext;
import org.w3c.css.parser.CssPrinterStyle;
-import org.w3c.css.values.CssValue;
public class SVGBasicStyle extends org.w3c.css.properties3.Css3Style {
Index: MarkerMid.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/svgproperties/MarkerMid.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- MarkerMid.java 19 Jul 2002 20:58:01 -0000 1.1
+++ MarkerMid.java 8 Aug 2005 13:19:34 -0000 1.2
@@ -9,14 +9,13 @@
package org.w3c.css.svgproperties;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssExpression;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.Util;
-import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
import org.w3c.css.values.CssURL;
+import org.w3c.css.values.CssValue;
/**
* <P>
@@ -29,116 +28,122 @@
*/
public class MarkerMid extends CssProperty {
-
- CssValue markerMid;
+
+ CssValue markerMid;
ApplContext ac;
-
+
CssIdent none = new CssIdent("none");
-
+
/**
* Create a new MarkerMid
*/
- public MarkerMid() {
- //nothing to do
- }
-
- /**
- * Create a new MarkerMid
- *
- * @param expression The expression for this property
- * @exception InvalidParamException Values are incorrect
- */
- public MarkerMid(ApplContext ac, CssExpression expression) throws InvalidParamException {
- this.ac = ac;
- setByUser(); // tell this property is set by the user
- CssValue val = expression.getValue();
- if (val instanceof CssURL) {
- markerMid = val;
- expression.next();
- }
- else if (val instanceof CssIdent) {
- if (val.equals(inherit)) {
- markerMid = inherit;
- expression.next();
- } else if (val.equals(none)) {
- markerMid = none;
- expression.next();
- }
- }
- else {
- throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
- }
- }
-
+ public MarkerMid() {
+ //nothing to do
+ }
+
+ /**
+ * Create a new MarkerMid
+ *
+ * @param expression The expression for this property
+ * @exception InvalidParamException Values are incorrect
+ */
+ public MarkerMid(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+ this.ac = ac;
+ setByUser(); // tell this property is set by the user
+ CssValue val = expression.getValue();
+ if (val instanceof CssURL) {
+ markerMid = val;
+ expression.next();
+ }
+ else if (val instanceof CssIdent) {
+ if (val.equals(inherit)) {
+ markerMid = inherit;
+ expression.next();
+ } else if (val.equals(none)) {
+ markerMid = none;
+ expression.next();
+ }
+ }
+ else {
+ throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
+ }
+ }
+
+ public MarkerMid(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Add this property to the CssStyle.
*
* @param style The CssStyle
*/
- public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).markerMid != null)
- style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).markerMid = this;
- }
+ public void addToStyle(ApplContext ac, CssStyle style) {
+ if (((SVGStyle) style).markerMid != null)
+ style.addRedefinitionWarning(ac, this);
+ ((SVGStyle) style).markerMid = 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 ((SVGStyle) style).getMarkerMid();
- } else {
- return ((SVGStyle) style).markerMid;
- }
+ /**
+ * 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 ((SVGStyle) style).getMarkerMid();
+ } else {
+ return ((SVGStyle) style).markerMid;
}
+ }
+
+ /**
+ * Compares two properties for equality.
+ *
+ * @param value The other property.
+ */
+ public boolean equals(CssProperty property) {
+ return (property instanceof MarkerMid &&
+ markerMid.equals( ((MarkerMid) property).markerMid));
+ }
- /**
- * Compares two properties for equality.
- *
- * @param value The other property.
- */
- public boolean equals(CssProperty property) {
- return (property instanceof MarkerMid &&
- markerMid.equals( ((MarkerMid) property).markerMid));
- }
-
/**
* Returns the name of this property
*/
- public String getPropertyName() {
- return "marker-mid";
- }
-
+ public String getPropertyName() {
+ return "marker-mid";
+ }
+
/**
* Returns the value of this property
*/
- public Object get() {
- return markerMid;
- }
-
+ public Object get() {
+ return markerMid;
+ }
+
/**
* Returns true if this property is "softly" inherited
*/
- public boolean isSoftlyInherited() {
- return markerMid.equals(inherit);
- }
-
- /**
- * Returns a string representation of the object
- */
- public String toString() {
- return markerMid.toString();
- }
-
+ public boolean isSoftlyInherited() {
+ return markerMid.equals(inherit);
+ }
+
+ /**
+ * Returns a string representation of the object
+ */
+ public String toString() {
+ return markerMid.toString();
+ }
+
/**
* Is the value of this property a default value
* It is used by all macro for the function <code>print</code>
*/
- public boolean isDefault() {
- return (markerMid == none);
- }
-
+ public boolean isDefault() {
+ return (markerMid == none);
+ }
+
}
Index: Fill.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/svgproperties/Fill.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Fill.java 19 Jul 2002 20:58:01 -0000 1.1
+++ Fill.java 8 Aug 2005 13:19:34 -0000 1.2
@@ -11,18 +11,17 @@
import java.util.Vector;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssExpression;
+import org.w3c.css.properties.CssColor;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.Util;
-import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.ApplContext;
-import org.w3c.css.properties.CssColor;
-import org.w3c.css.values.CssOperator;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
import org.w3c.css.values.CssFunction;
+import org.w3c.css.values.CssIdent;
import org.w3c.css.values.CssNumber;
+import org.w3c.css.values.CssOperator;
import org.w3c.css.values.CssURL;
+import org.w3c.css.values.CssValue;
/**
* <P>
@@ -35,280 +34,286 @@
*/
public class Fill extends CssProperty implements CssOperator {
-
+
CssValue fill;
ApplContext ac;
Vector values = new Vector();
-
+
CssIdent currentColor = new CssIdent("currentColor");
CssIdent none = new CssIdent("none");
-
+
/**
* Create a new Fill
*/
- public Fill() {
- //nothing to do
- }
-
- /**
- * Create a new Fill
- *
- * @param expression The expression for this property
- * @exception InvalidParamException Values are incorrect
- */
- public Fill(ApplContext ac, CssExpression expression) throws InvalidParamException {
- this.ac = ac;
- setByUser(); // tell this property is set by the user
- CssValue val = expression.getValue();
- boolean correct = true;
- String errorval = "";
- char op = expression.getOperator();
-
- if (val.equals(inherit)) {
- fill = inherit;
- expression.next();
- } else if (val.equals(currentColor)) {
- fill = currentColor;
- expression.next();
- } else if (val.equals(none)) {
- fill = none;
- expression.next();
- } else {
- try {
- CssColor color = new CssColor(ac, expression);
- values.addElement(val);
- //expression.next();
-
- op = expression.getOperator();
- val = expression.getValue();
-
-
- if (val instanceof CssFunction) { // icc-color(<name>[,<icccolorvalue>]*)]
- CssValue function = val;
- if (!((CssFunction) val).getName().equals("icc-color")) {
- correct = false;
- errorval = val.toString();
- } else {
- CssExpression params = ((CssFunction) val).getParameters();
-
- op = params.getOperator();
- val = params.getValue();
-
- if (!(val instanceof CssIdent)) {
- correct = false;
- errorval = val.toString();
- }
-
- params.next();
- op = params.getOperator();
- val = params.getValue();
-
- if (!params.end()) { // there are more parameters left
- int counter = 0;
-
- while ((op == COMMA || op == SPACE)
- && (counter < (params.getCount() - 1) && correct == true)) {
-
- if ((!(val instanceof CssNumber)) || (((CssNumber) val).getValue() < 0)) {
- correct = false;
- errorval = val.toString();
- }
-
- params.next();
- counter++;
- val = params.getValue();
- op = params.getOperator();
- }
- }
-
- if (correct) {
- params.starts();
- values.addElement(function);
- }
- else {
- correct = false;
- errorval = val.toString();
- }
- }
- }
- } catch (InvalidParamException e) {
- correct = false;
- errorval = val.toString();
- }
-
- if (val instanceof CssURL) {
- values.addElement(val);
- correct = true;
- errorval = null;
-
- expression.next();
- op = expression.getOperator();
- val = expression.getValue();
-
- if (val.equals(none) || val.equals(currentColor)) {
- values.addElement(val);
- expression.next();
- } else {
- //-------------
-
- try {
- CssColor color = new CssColor(ac, expression);
- values.addElement(val);
- //expression.next();
-
- op = expression.getOperator();
- val = expression.getValue();
-
-
- if (val instanceof CssFunction) { // icc-color(<name>[,<icccolorvalue>]*)]
- CssValue function = val;
- if (!((CssFunction) val).getName().equals("icc-color")) {
- correct = false;
- errorval = val.toString();
- } else {
- CssExpression params = ((CssFunction) val).getParameters();
-
- op = params.getOperator();
- val = params.getValue();
-
- if (!(val instanceof CssIdent)) {
- correct = false;
- errorval = val.toString();
- }
-
- params.next();
- op = params.getOperator();
- val = params.getValue();
-
- if (!params.end()) { // there are more parameters left
- int counter = 0;
-
- while ((op == COMMA || op == SPACE)
- && (counter < (params.getCount() - 1) && correct == true)) {
-
- if ((!(val instanceof CssNumber)) || (((CssNumber) val).getValue() < 0)) {
- correct = false;
- errorval = val.toString();
- }
-
- params.next();
- counter++;
- val = params.getValue();
- op = params.getOperator();
- }
- }
-
- if (correct) {
- params.starts();
- values.addElement(function);
- }
- else {
- correct = false;
- errorval = val.toString();
- }
- }
- }
- } catch (InvalidParamException e) {
- correct = false;
- errorval = val.toString();
- }
-
- //-----------------
- }
- } else {
- correct = false;
- errorval = val.toString();
- }
-
- }
-
- expression.next();
-
- if (!correct) {
- throw new InvalidParamException("value", errorval, getPropertyName(), ac);
- }
- }
-
+ public Fill() {
+ //nothing to do
+ }
+
/**
- * Add this property to the CssStyle.
+ * Create a new Fill
*
- * @param style The CssStyle
+ * @param expression The expression for this property
+ * @exception InvalidParamException Values are incorrect
*/
- public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).fill != null)
- style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).fill = 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 ((SVGStyle) style).getFill();
+ public Fill(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+ this.ac = ac;
+ setByUser(); // tell this property is set by the user
+ CssValue val = expression.getValue();
+ boolean correct = true;
+ String errorval = "";
+ char op = expression.getOperator();
+
+ if (val.equals(inherit)) {
+ fill = inherit;
+ expression.next();
+ } else if (val.equals(currentColor)) {
+ fill = currentColor;
+ expression.next();
+ } else if (val.equals(none)) {
+ fill = none;
+ expression.next();
+ } else {
+ try {
+ CssColor color = new CssColor(ac, expression);
+ values.addElement(val);
+ //expression.next();
+
+ op = expression.getOperator();
+ val = expression.getValue();
+
+
+ if (val instanceof CssFunction) { // icc-color(<name>[,<icccolorvalue>]*)]
+ CssValue function = val;
+ if (!((CssFunction) val).getName().equals("icc-color")) {
+ correct = false;
+ errorval = val.toString();
+ } else {
+ CssExpression params = ((CssFunction) val).getParameters();
+
+ op = params.getOperator();
+ val = params.getValue();
+
+ if (!(val instanceof CssIdent)) {
+ correct = false;
+ errorval = val.toString();
+ }
+
+ params.next();
+ op = params.getOperator();
+ val = params.getValue();
+
+ if (!params.end()) { // there are more parameters left
+ int counter = 0;
+
+ while ((op == COMMA || op == SPACE)
+ && (counter < (params.getCount() - 1) && correct == true)) {
+
+ if ((!(val instanceof CssNumber)) || (((CssNumber) val).getValue() < 0)) {
+ correct = false;
+ errorval = val.toString();
+ }
+
+ params.next();
+ counter++;
+ val = params.getValue();
+ op = params.getOperator();
+ }
+ }
+
+ if (correct) {
+ params.starts();
+ values.addElement(function);
+ }
+ else {
+ correct = false;
+ errorval = val.toString();
+ }
+ }
+ }
+ } catch (InvalidParamException e) {
+ correct = false;
+ errorval = val.toString();
+ }
+
+ if (val instanceof CssURL) {
+ values.addElement(val);
+ correct = true;
+ errorval = null;
+
+ expression.next();
+ op = expression.getOperator();
+ val = expression.getValue();
+
+ if (val.equals(none) || val.equals(currentColor)) {
+ values.addElement(val);
+ expression.next();
+ } else {
+ //-------------
+
+ try {
+ CssColor color = new CssColor(ac, expression);
+ values.addElement(val);
+ //expression.next();
+
+ op = expression.getOperator();
+ val = expression.getValue();
+
+
+ if (val instanceof CssFunction) { // icc-color(<name>[,<icccolorvalue>]*)]
+ CssValue function = val;
+ if (!((CssFunction) val).getName().equals("icc-color")) {
+ correct = false;
+ errorval = val.toString();
+ } else {
+ CssExpression params = ((CssFunction) val).getParameters();
+
+ op = params.getOperator();
+ val = params.getValue();
+
+ if (!(val instanceof CssIdent)) {
+ correct = false;
+ errorval = val.toString();
+ }
+
+ params.next();
+ op = params.getOperator();
+ val = params.getValue();
+
+ if (!params.end()) { // there are more parameters left
+ int counter = 0;
+
+ while ((op == COMMA || op == SPACE)
+ && (counter < (params.getCount() - 1) && correct == true)) {
+
+ if ((!(val instanceof CssNumber)) || (((CssNumber) val).getValue() < 0)) {
+ correct = false;
+ errorval = val.toString();
+ }
+
+ params.next();
+ counter++;
+ val = params.getValue();
+ op = params.getOperator();
+ }
+ }
+
+ if (correct) {
+ params.starts();
+ values.addElement(function);
+ }
+ else {
+ correct = false;
+ errorval = val.toString();
+ }
+ }
+ }
+ } catch (InvalidParamException e) {
+ correct = false;
+ errorval = val.toString();
+ }
+
+ //-----------------
+ }
} else {
- return ((SVGStyle) style).fill;
+ correct = false;
+ errorval = val.toString();
}
+
}
-
- /**
- * Compares two properties for equality.
- *
- * @param value The other property.
- */
- public boolean equals(CssProperty property) {
- return (property instanceof Fill &&
- fill.equals( ((Fill) property).fill));
- }
-
+
+ expression.next();
+
+ if (!correct) {
+ throw new InvalidParamException("value", errorval, getPropertyName(), ac);
+ }
+ }
+
+ public Fill(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
+ /**
+ * Add this property to the CssStyle.
+ *
+ * @param style The CssStyle
+ */
+ public void addToStyle(ApplContext ac, CssStyle style) {
+ if (((SVGStyle) style).fill != null)
+ style.addRedefinitionWarning(ac, this);
+ ((SVGStyle) style).fill = 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 ((SVGStyle) style).getFill();
+ } else {
+ return ((SVGStyle) style).fill;
+ }
+ }
+
+ /**
+ * Compares two properties for equality.
+ *
+ * @param value The other property.
+ */
+ public boolean equals(CssProperty property) {
+ return (property instanceof Fill &&
+ fill.equals( ((Fill) property).fill));
+ }
+
/**
* Returns the name of this property
*/
- public String getPropertyName() {
- return "fill";
- }
-
+ public String getPropertyName() {
+ return "fill";
+ }
+
/**
* Returns the value of this property
*/
- public Object get() {
- if (fill != null)
- return fill;
- else
- return values;
- }
-
+ public Object get() {
+ if (fill != null)
+ return fill;
+ else
+ return values;
+ }
+
/**
* Returns true if this property is "softly" inherited
*/
- public boolean isSoftlyInherited() {
- return fill.equals(inherit);
- }
-
- /**
- * Returns a string representation of the object
- */
- public String toString() {
- if (fill != null) {
- return fill.toString();
- } else {
- String ret = "";
- for (int i = 0; i < values.size(); i++) {
- ret += " " + values.elementAt(i).toString();
- }
- return ret;
- }
- }
-
+ public boolean isSoftlyInherited() {
+ return fill.equals(inherit);
+ }
+
+ /**
+ * Returns a string representation of the object
+ */
+ public String toString() {
+ if (fill != null) {
+ return fill.toString();
+ } else {
+ String ret = "";
+ for (int i = 0; i < values.size(); i++) {
+ ret += " " + values.elementAt(i).toString();
+ }
+ return ret;
+ }
+ }
+
/**
* Is the value of this property a default value
* It is used by all macro for the function <code>print</code>
*/
- public boolean isDefault() {
- return fill == none;
- }
-
+ public boolean isDefault() {
+ return fill == none;
+ }
+
}
Index: SolidColor.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/svgproperties/SolidColor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- SolidColor.java 19 Jul 2002 20:58:01 -0000 1.1
+++ SolidColor.java 8 Aug 2005 13:19:34 -0000 1.2
@@ -11,17 +11,16 @@
import java.util.Vector;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssExpression;
+import org.w3c.css.properties.CssColor;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.Util;
-import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.ApplContext;
-import org.w3c.css.properties.CssColor;
-import org.w3c.css.values.CssOperator;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
import org.w3c.css.values.CssFunction;
+import org.w3c.css.values.CssIdent;
import org.w3c.css.values.CssNumber;
+import org.w3c.css.values.CssOperator;
+import org.w3c.css.values.CssValue;
/**
* <P>
@@ -35,197 +34,203 @@
*/
public class SolidColor extends CssProperty implements CssOperator {
-
+
CssValue solidColor;
ApplContext ac;
Vector values = new Vector();
-
+
CssIdent currentColor = new CssIdent("currentColor");
-
+
/**
* Create a new SolidColor
*/
- public SolidColor() {
- //nothing to do
- }
-
- /**
- * Create a new SolidColor
- *
- * @param expression The expression for this property
- * @exception InvalidParamException Values are incorrect
- */
- public SolidColor(ApplContext ac, CssExpression expression) throws InvalidParamException {
- this.ac = ac;
- setByUser(); // tell this property is set by the user
- CssValue val = expression.getValue();
- boolean correct = true;
- String errorval = "";
- char op = expression.getOperator();
-
- if (val.equals(inherit)) {
- solidColor = inherit;
- expression.next();
- } else if (val.equals(currentColor)) {
- solidColor = currentColor;
- expression.next();
- } else {
- try {
- CssColor color = new CssColor(ac, expression);
- values.addElement(val);
- //expression.next();
- } catch (InvalidParamException e) {
- correct = false;
- errorval = val.toString();
- }
-
- op = expression.getOperator();
- val = expression.getValue();
-
- if (val != null) {
-
- if (val instanceof CssFunction) { // icc-color(<name>[,<icccolorvalue>]*)]
- CssValue function = val;
- if (!((CssFunction) val).getName().equals("icc-color")) {
- correct = false;
- errorval = val.toString();
- } else {
- CssExpression params = ((CssFunction) val).getParameters();
-
- op = params.getOperator();
- val = params.getValue();
-
- if (!(val instanceof CssIdent)) {
- correct = false;
- errorval = val.toString();
- }
-
- params.next();
- op = params.getOperator();
- val = params.getValue();
-
- if (!params.end()) { // there are more parameters left
- int counter = 0;
-
- while ((op == COMMA || op == SPACE)
- && (counter < (params.getCount() - 1) && correct == true)) {
-
- if ((!(val instanceof CssNumber)) || (((CssNumber) val).getValue() < 0)) {
- correct = false;
- errorval = val.toString();
- }
-
- params.next();
- counter++;
- val = params.getValue();
- op = params.getOperator();
- }
- }
-
- if (correct) {
- params.starts();
- values.addElement(function);
- }
- }
- } else {
- correct = false;
- errorval = val.toString();
- }
- } else {
- correct = false;
- errorval = new String("");
- }
-
-
- expression.next();
-
- }
-
- if (!correct) {
- throw new InvalidParamException("value", errorval, getPropertyName(), ac);
- }
- }
-
+ public SolidColor() {
+ //nothing to do
+ }
+
/**
- * Add this property to the CssStyle.
+ * Create a new SolidColor
*
- * @param style The CssStyle
+ * @param expression The expression for this property
+ * @exception InvalidParamException Values are incorrect
*/
- public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).solidColor != null)
- style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).solidColor = 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 ((SVGStyle) style).getSolidColor();
+ public SolidColor(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+ this.ac = ac;
+ setByUser(); // tell this property is set by the user
+ CssValue val = expression.getValue();
+ boolean correct = true;
+ String errorval = "";
+ char op = expression.getOperator();
+
+ if (val.equals(inherit)) {
+ solidColor = inherit;
+ expression.next();
+ } else if (val.equals(currentColor)) {
+ solidColor = currentColor;
+ expression.next();
+ } else {
+ try {
+ CssColor color = new CssColor(ac, expression);
+ values.addElement(val);
+ //expression.next();
+ } catch (InvalidParamException e) {
+ correct = false;
+ errorval = val.toString();
+ }
+
+ op = expression.getOperator();
+ val = expression.getValue();
+
+ if (val != null) {
+
+ if (val instanceof CssFunction) { // icc-color(<name>[,<icccolorvalue>]*)]
+ CssValue function = val;
+ if (!((CssFunction) val).getName().equals("icc-color")) {
+ correct = false;
+ errorval = val.toString();
+ } else {
+ CssExpression params = ((CssFunction) val).getParameters();
+
+ op = params.getOperator();
+ val = params.getValue();
+
+ if (!(val instanceof CssIdent)) {
+ correct = false;
+ errorval = val.toString();
+ }
+
+ params.next();
+ op = params.getOperator();
+ val = params.getValue();
+
+ if (!params.end()) { // there are more parameters left
+ int counter = 0;
+
+ while ((op == COMMA || op == SPACE)
+ && (counter < (params.getCount() - 1) && correct == true)) {
+
+ if ((!(val instanceof CssNumber)) || (((CssNumber) val).getValue() < 0)) {
+ correct = false;
+ errorval = val.toString();
+ }
+
+ params.next();
+ counter++;
+ val = params.getValue();
+ op = params.getOperator();
+ }
+ }
+
+ if (correct) {
+ params.starts();
+ values.addElement(function);
+ }
+ }
+ } else {
+ correct = false;
+ errorval = val.toString();
+ }
} else {
- return ((SVGStyle) style).solidColor;
+ correct = false;
+ errorval = new String("");
}
+
+
+ expression.next();
+
}
-
- /**
- * Compares two properties for equality.
- *
- * @param value The other property.
- */
- public boolean equals(CssProperty property) {
- return (property instanceof SolidColor &&
- solidColor.equals( ((SolidColor) property).solidColor));
- }
-
+
+ if (!correct) {
+ throw new InvalidParamException("value", errorval, getPropertyName(), ac);
+ }
+ }
+
+ public SolidColor(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
+ /**
+ * Add this property to the CssStyle.
+ *
+ * @param style The CssStyle
+ */
+ public void addToStyle(ApplContext ac, CssStyle style) {
+ if (((SVGStyle) style).solidColor != null)
+ style.addRedefinitionWarning(ac, this);
+ ((SVGStyle) style).solidColor = 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 ((SVGStyle) style).getSolidColor();
+ } else {
+ return ((SVGStyle) style).solidColor;
+ }
+ }
+
+ /**
+ * Compares two properties for equality.
+ *
+ * @param value The other property.
+ */
+ public boolean equals(CssProperty property) {
+ return (property instanceof SolidColor &&
+ solidColor.equals( ((SolidColor) property).solidColor));
+ }
+
/**
* Returns the name of this property
*/
- public String getPropertyName() {
- return "solid-color";
- }
-
+ public String getPropertyName() {
+ return "solid-color";
+ }
+
/**
* Returns the value of this property
*/
- public Object get() {
- if (solidColor != null)
- return solidColor;
- else
- return values;
- }
-
+ public Object get() {
+ if (solidColor != null)
+ return solidColor;
+ else
+ return values;
+ }
+
/**
* Returns true if this property is "softly" inherited
*/
- public boolean isSoftlyInherited() {
- return solidColor.equals(inherit);
- }
-
- /**
- * Returns a string representation of the object
- */
- public String toString() {
- if (solidColor != null) {
- return solidColor.toString();
- } else {
- String ret = "";
- for (int i = 0; i < values.size(); i++) {
- ret += " " + values.elementAt(i).toString();
- }
- return ret;
- }
- }
-
+ public boolean isSoftlyInherited() {
+ return solidColor.equals(inherit);
+ }
+
+ /**
+ * Returns a string representation of the object
+ */
+ public String toString() {
+ if (solidColor != null) {
+ return solidColor.toString();
+ } else {
+ String ret = "";
+ for (int i = 0; i < values.size(); i++) {
+ ret += " " + values.elementAt(i).toString();
+ }
+ return ret;
+ }
+ }
+
/**
* Is the value of this property a default value
* It is used by all macro for the function <code>print</code>
*/
- public boolean isDefault() {
- return false;
- }
-
+ public boolean isDefault() {
+ return false;
+ }
+
}
Index: EnableBackground.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/svgproperties/EnableBackground.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- EnableBackground.java 19 Jul 2002 20:58:01 -0000 1.1
+++ EnableBackground.java 8 Aug 2005 13:19:34 -0000 1.2
@@ -11,17 +11,15 @@
import java.util.Vector;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssExpression;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.Util;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
-import org.w3c.css.values.CssOperator;
import org.w3c.css.properties.CssWidth;
-import org.w3c.css.properties.CssHeight;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
import org.w3c.css.values.CssNumber;
+import org.w3c.css.values.CssOperator;
+import org.w3c.css.values.CssValue;
/**
* <P>
@@ -35,179 +33,185 @@
*/
public class EnableBackground extends CssProperty implements CssOperator {
-
+
CssValue value;
Vector values = new Vector();
ApplContext ac;
-
+
CssIdent accumulate = new CssIdent("accumulate");
-
+
/**
* Create a new Value
*/
- public EnableBackground() {
- //nothing to do
- }
-
- /**
- * Create a new Value
- *
- * @param expression The expression for this property
- * @exception InvalidParamException Values are incorrect
- */
- public EnableBackground(ApplContext ac, CssExpression expression) throws InvalidParamException {
-
- this.ac = ac;
- setByUser(); // tell this property is set by the user
- CssValue val = expression.getValue();
- char op = SPACE;
-
- if (val instanceof CssIdent) {
- if (val.equals(inherit)) {
- value = inherit;
- expression.next();
- } else if (val.equals(accumulate)) {
- value = accumulate;
- expression.next();
- } else {
- throw new InvalidParamException("value", val.toString(),
- getPropertyName(), ac);
- }
- }
- else if (val instanceof CssNumber) {
- // first value
- values.addElement(val);
- expression.next();
- val = expression.getValue();
- op = expression.getOperator();
-
- // second value
- if (val instanceof CssNumber) {
- values.addElement(val);
- expression.next();
- } else {
- throw new InvalidParamException("value", val.toString(),
- getPropertyName(), ac);
- }
- val = expression.getValue();
- op = expression.getOperator();
-
- // third value
- try {
- CssWidth width = new CssWidth(ac, expression);
- values.addElement(width);
- //expression.next();
- } catch (InvalidParamException e) {
- throw new InvalidParamException("value", val.toString(),
- getPropertyName(), ac);
- }
-
- val = expression.getValue();
- op = expression.getOperator();
-
- // fourth value
- try {
- CssWidth width = new CssWidth(ac, expression);
- values.addElement(width);
- expression.next();
- } catch (InvalidParamException e) {
- throw new InvalidParamException("value", val.toString(),
- getPropertyName(), ac);
- }
-
- }
- else {
- throw new InvalidParamException("value", val.toString(),
- getPropertyName(), ac);
- }
- }
-
+ public EnableBackground() {
+ //nothing to do
+ }
+
+ /**
+ * Create a new Value
+ *
+ * @param expression The expression for this property
+ * @exception InvalidParamException Values are incorrect
+ */
+ public EnableBackground(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+
+ this.ac = ac;
+ setByUser(); // tell this property is set by the user
+ CssValue val = expression.getValue();
+ char op = SPACE;
+
+ if (val instanceof CssIdent) {
+ if (val.equals(inherit)) {
+ value = inherit;
+ expression.next();
+ } else if (val.equals(accumulate)) {
+ value = accumulate;
+ expression.next();
+ } else {
+ throw new InvalidParamException("value", val.toString(),
+ getPropertyName(), ac);
+ }
+ }
+ else if (val instanceof CssNumber) {
+ // first value
+ values.addElement(val);
+ expression.next();
+ val = expression.getValue();
+ op = expression.getOperator();
+
+ // second value
+ if (val instanceof CssNumber) {
+ values.addElement(val);
+ expression.next();
+ } else {
+ throw new InvalidParamException("value", val.toString(),
+ getPropertyName(), ac);
+ }
+ val = expression.getValue();
+ op = expression.getOperator();
+
+ // third value
+ try {
+ CssWidth width = new CssWidth(ac, expression);
+ values.addElement(width);
+ //expression.next();
+ } catch (InvalidParamException e) {
+ throw new InvalidParamException("value", val.toString(),
+ getPropertyName(), ac);
+ }
+
+ val = expression.getValue();
+ op = expression.getOperator();
+
+ // fourth value
+ try {
+ CssWidth width = new CssWidth(ac, expression);
+ values.addElement(width);
+ expression.next();
+ } catch (InvalidParamException e) {
+ throw new InvalidParamException("value", val.toString(),
+ getPropertyName(), ac);
+ }
+
+ }
+ else {
+ throw new InvalidParamException("value", val.toString(),
+ getPropertyName(), ac);
+ }
+ }
+
+ public EnableBackground(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Add this property to the CssStyle.
*
* @param style The CssStyle
*/
- public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).enableBackground != null)
- style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).enableBackground = this;
- }
+ public void addToStyle(ApplContext ac, CssStyle style) {
+ if (((SVGStyle) style).enableBackground != null)
+ style.addRedefinitionWarning(ac, this);
+ ((SVGStyle) style).enableBackground = 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 ((SVGStyle) style).getEnableBackground();
- } else {
- return ((SVGStyle) style).enableBackground;
- }
+ /**
+ * 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 ((SVGStyle) style).getEnableBackground();
+ } else {
+ return ((SVGStyle) style).enableBackground;
}
+ }
+
+ /**
+ * Compares two properties for equality.
+ *
+ * @param value The other property.
+ */
+ public boolean equals(CssProperty property) {
+ return (property instanceof EnableBackground &&
+ value.equals( ((EnableBackground) property).value));
+ }
- /**
- * Compares two properties for equality.
- *
- * @param value The other property.
- */
- public boolean equals(CssProperty property) {
- return (property instanceof EnableBackground &&
- value.equals( ((EnableBackground) property).value));
- }
-
/**
* Returns the name of this property
*/
- public String getPropertyName() {
- return "enable-background";
- }
-
+ public String getPropertyName() {
+ return "enable-background";
+ }
+
/**
* Returns the value of this property
*/
- public Object get() {
- if (value != null) {
- return value;
- } else {
- return values;
- }
- }
-
+ public Object get() {
+ if (value != null) {
+ return value;
+ } else {
+ return values;
+ }
+ }
+
/**
* Returns true if this property is "softly" inherited
*/
- public boolean isSoftlyInherited() {
- if (value != null) {
- return value.equals(inherit);
- } else {
- return false;
- }
- }
-
- /**
- * Returns a string representation of the object
- */
- public String toString() {
- if (value != null) {
- return value.toString();
- } else {
- String ret = "";
- for (int i = 0; i < values.size(); i++) {
- ret += " " + values.elementAt(i).toString();
- }
- return ret;
- }
-
- }
-
+ public boolean isSoftlyInherited() {
+ if (value != null) {
+ return value.equals(inherit);
+ } else {
+ return false;
+ }
+ }
+
+ /**
+ * Returns a string representation of the object
+ */
+ public String toString() {
+ if (value != null) {
+ return value.toString();
+ } else {
+ String ret = "";
+ for (int i = 0; i < values.size(); i++) {
+ ret += " " + values.elementAt(i).toString();
+ }
+ return ret;
+ }
+
+ }
+
/**
* Is the value of this property a default value
* It is used by all macro for the function <code>print</code>
*/
- public boolean isDefault() {
- return (value == accumulate);
- }
-
+ public boolean isDefault() {
+ return (value == accumulate);
+ }
+
}
Index: ColorProfile.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/svgproperties/ColorProfile.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ColorProfile.java 19 Jul 2002 20:58:01 -0000 1.1
+++ ColorProfile.java 8 Aug 2005 13:19:34 -0000 1.2
@@ -11,15 +11,15 @@
import java.util.Vector;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssExpression;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssFunction;
+import org.w3c.css.values.CssIdent;
import org.w3c.css.values.CssOperator;
import org.w3c.css.values.CssURL;
-import org.w3c.css.values.CssFunction;
+import org.w3c.css.values.CssValue;
/**
* <PRE>
@@ -51,8 +51,9 @@
/**
* Create a new ColorProfile
*/
- public ColorProfile(ApplContext ac, CssExpression expression) throws InvalidParamException {
-
+ public ColorProfile(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+
//setByUser();
char op = SPACE;
CssValue val = expression.getValue();
@@ -71,15 +72,15 @@
expression.next();
} else {
while ((op == SPACE)
- && (counter < expression.getCount() && correct == true)) {
-
+ && (counter < expression.getCount() && correct == true)) {
+
if (val instanceof CssURL) {
values.addElement(val);
}
else if (val instanceof CssFunction) {
if (((CssFunction) val).getName().equals("local")) {
if ((((CssFunction) val).getParameters().getCount() == 1) &&
- (((CssFunction) val).getParameters().getValue() instanceof CssURL)) {
+ (((CssFunction) val).getParameters().getValue() instanceof CssURL)) {
values.addElement(val);
} else {
correct = false;
@@ -102,11 +103,16 @@
if (!correct) {
throw new InvalidParamException("value", val.toString(),
- getPropertyName(), ac);
+ getPropertyName(), ac);
}
}
}
-
+
+ public ColorProfile(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Add this property to the CssStyle.
*
Index: FillOpacity.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/svgproperties/FillOpacity.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FillOpacity.java 19 Jul 2002 20:58:01 -0000 1.1
+++ FillOpacity.java 8 Aug 2005 13:19:34 -0000 1.2
@@ -9,15 +9,13 @@
package org.w3c.css.svgproperties;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssExpression;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.Util;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
import org.w3c.css.properties3.CssOpacity;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
import org.w3c.css.values.CssNumber;
+import org.w3c.css.values.CssValue;
/**
* <P>
@@ -30,117 +28,123 @@
*/
public class FillOpacity extends CssProperty {
-
+
CssValue value;
ApplContext ac;
-
+
/**
* Create a new Value
*/
- public FillOpacity() {
- //nothing to do
- }
-
- /**
- * Create a new Value
- *
- * @param expression The expression for this property
- * @exception InvalidParamException Values are incorrect
- */
- public FillOpacity(ApplContext ac, CssExpression expression) throws InvalidParamException {
- this.ac = ac;
- setByUser(); // tell this property is set by the user
- CssValue val = expression.getValue();
- boolean correct = false;
-
- if (val.equals(inherit)) {
- value = inherit;
- expression.next();
- correct = true;
- } else {
- try {
- CssOpacity opac = new CssOpacity(ac, expression);
- value = val;
- expression.next();
- correct = true;
- } catch (InvalidParamException e) {
- correct = false;
- }
- }
- if (!correct) {
- throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
- }
- }
-
+ public FillOpacity() {
+ //nothing to do
+ }
+
+ /**
+ * Create a new Value
+ *
+ * @param expression The expression for this property
+ * @exception InvalidParamException Values are incorrect
+ */
+ public FillOpacity(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+ this.ac = ac;
+ setByUser(); // tell this property is set by the user
+ CssValue val = expression.getValue();
+ boolean correct = false;
+
+ if (val.equals(inherit)) {
+ value = inherit;
+ expression.next();
+ correct = true;
+ } else {
+ try {
+ CssOpacity opac = new CssOpacity(ac, expression);
+ value = val;
+ expression.next();
+ correct = true;
+ } catch (InvalidParamException e) {
+ correct = false;
+ }
+ }
+ if (!correct) {
+ throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
+ }
+ }
+
+ public FillOpacity(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Add this property to the CssStyle.
*
* @param style The CssStyle
*/
- public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).fillOpacity != null)
- style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).fillOpacity = this;
- }
+ public void addToStyle(ApplContext ac, CssStyle style) {
+ if (((SVGStyle) style).fillOpacity != null)
+ style.addRedefinitionWarning(ac, this);
+ ((SVGStyle) style).fillOpacity = 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 ((SVGStyle) style).getFillOpacity();
- } else {
- return ((SVGStyle) style).fillOpacity;
- }
+ /**
+ * 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 ((SVGStyle) style).getFillOpacity();
+ } else {
+ return ((SVGStyle) style).fillOpacity;
}
+ }
+
+ /**
+ * Compares two properties for equality.
+ *
+ * @param value The other property.
+ */
+ public boolean equals(CssProperty property) {
+ return (property instanceof FillOpacity &&
+ value.equals( ((FillOpacity) property).value));
+ }
- /**
- * Compares two properties for equality.
- *
- * @param value The other property.
- */
- public boolean equals(CssProperty property) {
- return (property instanceof FillOpacity &&
- value.equals( ((FillOpacity) property).value));
- }
-
/**
* Returns the name of this property
*/
- public String getPropertyName() {
- return "fill-opacity";
- }
-
+ public String getPropertyName() {
+ return "fill-opacity";
+ }
+
/**
* Returns the value of this property
*/
- public Object get() {
- return value;
- }
-
+ public Object get() {
+ return value;
+ }
+
/**
* Returns true if this property is "softly" inherited
*/
- public boolean isSoftlyInherited() {
- return value.equals(inherit);
- }
-
- /**
- * Returns a string representation of the object
- */
- public String toString() {
- return value.toString();
- }
-
+ public boolean isSoftlyInherited() {
+ return value.equals(inherit);
+ }
+
+ /**
+ * Returns a string representation of the object
+ */
+ public String toString() {
+ return value.toString();
+ }
+
/**
* Is the value of this property a default value
* It is used by all macro for the function <code>print</code>
*/
- public boolean isDefault() {
- CssNumber cssnum = new CssNumber(ac, (float) 1.0);
- return value == cssnum;
- }
+ public boolean isDefault() {
+ CssNumber cssnum = new CssNumber(ac, (float) 1.0);
+ return value == cssnum;
+ }
}
Index: AlignmentBaseline.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/svgproperties/AlignmentBaseline.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- AlignmentBaseline.java 19 Jul 2002 20:58:00 -0000 1.1
+++ AlignmentBaseline.java 8 Aug 2005 13:19:34 -0000 1.2
@@ -9,12 +9,11 @@
package org.w3c.css.svgproperties;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssExpression;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssValue;
/**
* <P>
@@ -28,36 +27,36 @@
* <EM>Percentages:</EM>no<BR>
* <EM>Media:</EM>:visual
*/
-
public class AlignmentBaseline extends CssProperty {
-
+
CssValue albaseline;
-
+
private static String[] values = {
"auto", "baseline", "before-edge",
"text-before-edge", "middle", "after-edge",
"text-after-edge", "ideographic", "alphabetic", "hanging", "mathematical",
"inherit"
};
-
+
/**
* Create a new CssAlignmentBaseline
*/
public AlignmentBaseline() {
//nothing to do
}
-
+
/**
* Create a new CssAlignmentBaseline
*
* @param expression The expression for this property
* @exception InvalidParamException Incorrect value
*/
- public AlignmentBaseline(ApplContext ac, CssExpression expression) throws InvalidParamException {
-
+ public AlignmentBaseline(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+
setByUser();
CssValue val = expression.getValue();
-
+
int i = 0;
for (; i < values.length; i++) {
if (val.toString().equals(values[i])) {
@@ -68,10 +67,15 @@
}
if (i == values.length) {
throw new InvalidParamException("value", expression.getValue(),
- getPropertyName(), ac);
+ getPropertyName(), ac);
}
}
-
+
+ public AlignmentBaseline(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Add this property to the CssStyle
*
@@ -82,7 +86,7 @@
style.addRedefinitionWarning(ac, this);
((SVGStyle) style).alignmentBaseline = this;
}
-
+
/**
* Get this property in the style.
*
@@ -97,7 +101,7 @@
return ((SVGStyle) style).alignmentBaseline;
}
}
-
+
/**
* Compares two properties for equality.
*
@@ -107,35 +111,35 @@
return (property instanceof AlignmentBaseline &&
albaseline.equals(((AlignmentBaseline) property).albaseline));
}
-
+
/**
* Returns the name of this property
*/
public String getPropertyName() {
return "alignment-baseline";
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return albaseline;
}
-
+
/**
* Returns true if this property is "softly" inherited
*/
public boolean isSoftlyInherited() {
return albaseline.equals(inherit);
}
-
+
/**
* Returns a string representation of the object
*/
public String toString() {
return albaseline.toString();
}
-
+
/**
* Is the value of this property a default value
* It is used by alle macro for the function <code>print</code>
@@ -143,5 +147,5 @@
public boolean isDefault() {
return false;
}
-
+
}
Index: ColorInterpolationFilters.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/svgproperties/ColorInterpolationFilters.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ColorInterpolationFilters.java 19 Jul 2002 20:58:01 -0000 1.1
+++ ColorInterpolationFilters.java 8 Aug 2005 13:19:34 -0000 1.2
@@ -9,14 +9,12 @@
package org.w3c.css.svgproperties;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssExpression;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.Util;
-import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.ApplContext;
-import org.w3c.css.values.CssURL;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
+import org.w3c.css.values.CssValue;
/**
* <P>
@@ -29,119 +27,126 @@
*/
public class ColorInterpolationFilters extends CssProperty {
-
- CssValue interp;
+
+ CssValue interp;
ApplContext ac;
-
+
CssIdent auto = new CssIdent("auto");
CssIdent sRGB = new CssIdent("sRGB");
CssIdent linearRGB = new CssIdent("linearRGB");
-
+
/**
* Create a new InterpolationFilters
*/
- public ColorInterpolationFilters() {
- //nothing to do
- }
-
- /**
- * Create a new ColorInterpolationFilters
- *
- * @param expression The expression for this property
- * @exception InvalidParamException Values are incorrect
- */
- public ColorInterpolationFilters(ApplContext ac, CssExpression expression) throws InvalidParamException {
- this.ac = ac;
- setByUser(); // tell this property is set by the user
- CssValue val = expression.getValue();
-
- if (val.equals(inherit)) {
- interp = inherit;
- expression.next();
- } else if (val.equals(sRGB)) {
- interp = sRGB;
- expression.next();
- } else if (val.equals(linearRGB)) {
- interp = linearRGB;
- expression.next();
- } else if (val.equals(auto)) {
- interp = auto;
- expression.next();
- }
- else {
- throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
- }
- }
-
+ public ColorInterpolationFilters() {
+ //nothing to do
+ }
+
+ /**
+ * Create a new ColorInterpolationFilters
+ *
+ * @param expression The expression for this property
+ * @exception InvalidParamException Values are incorrect
+ */
+ public ColorInterpolationFilters(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+ this.ac = ac;
+ setByUser(); // tell this property is set by the user
+ CssValue val = expression.getValue();
+
+ if (val.equals(inherit)) {
+ interp = inherit;
+ expression.next();
+ } else if (val.equals(sRGB)) {
+ interp = sRGB;
+ expression.next();
+ } else if (val.equals(linearRGB)) {
+ interp = linearRGB;
+ expression.next();
+ } else if (val.equals(auto)) {
+ interp = auto;
+ expression.next();
+ }
+ else {
+ throw new InvalidParamException("value", val.toString(),
+ getPropertyName(), ac);
+ }
+ }
+
+ public ColorInterpolationFilters(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Add this property to the CssStyle.
*
* @param style The CssStyle
*/
- public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).colorInterpolationFilters != null)
- style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).colorInterpolationFilters = 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 ((SVGStyle) style).getColorInterpolationFilters();
- } else {
- return ((SVGStyle) style).colorInterpolationFilters;
- }
+ public void addToStyle(ApplContext ac, CssStyle style) {
+ if (((SVGStyle) style).colorInterpolationFilters != null)
+ style.addRedefinitionWarning(ac, this);
+ ((SVGStyle) style).colorInterpolationFilters = 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 ((SVGStyle) style).getColorInterpolationFilters();
+ } else {
+ return ((SVGStyle) style).colorInterpolationFilters;
}
-
- /**
- * Compares two properties for equality.
- *
- * @param value The other property.
- */
- public boolean equals(CssProperty property) {
- return (property instanceof ColorInterpolationFilters &&
- interp.equals( ((ColorInterpolationFilters) property).interp));
- }
-
+ }
+
+ /**
+ * Compares two properties for equality.
+ *
+ * @param value The other property.
+ */
+ public boolean equals(CssProperty property) {
+ return (property instanceof ColorInterpolationFilters &&
+ interp.equals( ((ColorInterpolationFilters) property).interp));
+ }
+
/**
* Returns the name of this property
*/
- public String getPropertyName() {
- return "color-interpolation-filters";
- }
-
+ public String getPropertyName() {
+ return "color-interpolation-filters";
+ }
+
/**
* Returns the value of this property
*/
- public Object get() {
- return interp;
- }
-
+ public Object get() {
+ return interp;
+ }
+
/**
* Returns true if this property is "softly" inherited
*/
- public boolean isSoftlyInherited() {
- return interp.equals(inherit);
- }
-
- /**
- * Returns a string representation of the object
- */
- public String toString() {
- return interp.toString();
- }
-
+ public boolean isSoftlyInherited() {
+ return interp.equals(inherit);
+ }
+
+ /**
+ * Returns a string representation of the object
+ */
+ public String toString() {
+ return interp.toString();
+ }
+
/**
* Is the value of this property a default value
* It is used by all macro for the function <code>print</code>
*/
- public boolean isDefault() {
- return (interp == linearRGB);
- }
-
+ public boolean isDefault() {
+ return (interp == linearRGB);
+ }
+
}
Index: AtRuleColorProfile.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/svgproperties/AtRuleColorProfile.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- AtRuleColorProfile.java 19 Jul 2002 20:58:01 -0000 1.1
+++ AtRuleColorProfile.java 8 Aug 2005 13:19:34 -0000 1.2
@@ -7,7 +7,6 @@
// http://www.w3.org/Consortium/Legal/copyright-software-19980720
package org.w3c.css.svgproperties;
-import org.w3c.css.util.InvalidParamException;
import org.w3c.css.parser.AtRule;
@@ -20,46 +19,46 @@
* Create a new AtRuleColorProfile
*/
public AtRuleColorProfile() {
- hash = ++internal;
+ hash = ++internal;
}
/**
* Returns the at rule keyword
*/
public String keyword() {
- return "color-profile";
+ return "color-profile";
}
/**
* The second must be exactly the same as this one
*/
public boolean canApply(AtRule atRule) {
- return (atRule instanceof AtRuleColorProfile);
+ return (atRule instanceof AtRuleColorProfile);
}
/**
* Return true if other is an instance of AtRuleColorProfile
*/
public boolean equals(Object other) {
- return (other instanceof AtRuleColorProfile);
+ return (other instanceof AtRuleColorProfile);
}
/**
* The second must only match this one
*/
public boolean canMatched(AtRule atRule) {
- return (atRule instanceof AtRuleColorProfile);
+ return (atRule instanceof AtRuleColorProfile);
}
/**
* Returns a string representation of the object
*/
- public String toString() {
- return "@" + keyword();
- }
+ public String toString() {
+ return "@" + keyword();
+ }
public int hashCode() {
- return hash;
+ return hash;
}
}
Index: SVGTinyStyle.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/svgproperties/SVGTinyStyle.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- SVGTinyStyle.java 19 Jul 2002 20:58:01 -0000 1.1
+++ SVGTinyStyle.java 8 Aug 2005 13:19:34 -0000 1.2
@@ -8,14 +8,10 @@
package org.w3c.css.svgproperties;
-import org.w3c.css.util.Warnings;
-import org.w3c.css.util.Warning;
-import org.w3c.css.util.ApplContext;
import org.w3c.css.parser.CssPrinterStyle;
-import org.w3c.css.values.CssValue;
public class SVGTinyStyle extends org.w3c.css.properties3.Css3Style {
-
+
FillRule fillRule;
StrokeLinejoin strokeLinejoin;
StrokeLineCap strokeLineCap;
@@ -24,126 +20,126 @@
StrokeDashOffset strokeDashOffset;
StrokeDashArray strokeDashArray;
Stroke stroke;
- Fill fill;
-
+ Fill fill;
+
public FillRule getFillRule() {
- if (fillRule == null) {
- fillRule =
- (FillRule) style.CascadingOrder (
- new FillRule(), style, selector);
- }
- return fillRule;
+ if (fillRule == null) {
+ fillRule =
+ (FillRule) style.CascadingOrder (
+ new FillRule(), style, selector);
+ }
+ return fillRule;
}
-
+
public StrokeLinejoin getStrokeLinejoin() {
- if (strokeLinejoin == null) {
- strokeLinejoin =
- (StrokeLinejoin) style.CascadingOrder (
- new StrokeLinejoin(), style, selector);
- }
- return strokeLinejoin;
+ if (strokeLinejoin == null) {
+ strokeLinejoin =
+ (StrokeLinejoin) style.CascadingOrder (
+ new StrokeLinejoin(), style, selector);
+ }
+ return strokeLinejoin;
}
-
+
public StrokeLineCap getStrokeLineCap() {
- if (strokeLineCap == null) {
- strokeLineCap =
- (StrokeLineCap) style.CascadingOrder (
- new StrokeLineCap(), style, selector);
- }
- return strokeLineCap;
+ if (strokeLineCap == null) {
+ strokeLineCap =
+ (StrokeLineCap) style.CascadingOrder (
+ new StrokeLineCap(), style, selector);
+ }
+ return strokeLineCap;
}
-
+
public StrokeMiterLimit getStrokeMiterLimit() {
- if (strokeMiterLimit == null) {
- strokeMiterLimit =
- (StrokeMiterLimit) style.CascadingOrder (
- new StrokeMiterLimit(), style, selector);
- }
- return strokeMiterLimit;
+ if (strokeMiterLimit == null) {
+ strokeMiterLimit =
+ (StrokeMiterLimit) style.CascadingOrder (
+ new StrokeMiterLimit(), style, selector);
+ }
+ return strokeMiterLimit;
}
-
+
public StrokeWidth getStrokeWidth() {
- if (strokeWidth == null) {
- strokeWidth =
- (StrokeWidth) style.CascadingOrder (
- new StrokeWidth(), style, selector);
- }
- return strokeWidth;
+ if (strokeWidth == null) {
+ strokeWidth =
+ (StrokeWidth) style.CascadingOrder (
+ new StrokeWidth(), style, selector);
+ }
+ return strokeWidth;
}
-
+
public StrokeDashOffset getStrokeDashOffset() {
- if (strokeDashOffset == null) {
- strokeDashOffset =
- (StrokeDashOffset) style.CascadingOrder (
- new StrokeDashOffset(), style, selector);
- }
- return strokeDashOffset;
+ if (strokeDashOffset == null) {
+ strokeDashOffset =
+ (StrokeDashOffset) style.CascadingOrder (
+ new StrokeDashOffset(), style, selector);
+ }
+ return strokeDashOffset;
}
-
+
public StrokeDashArray getStrokeDashArray() {
- if (strokeDashArray == null) {
- strokeDashArray =
- (StrokeDashArray) style.CascadingOrder (
- new StrokeDashArray(), style, selector);
- }
- return strokeDashArray;
+ if (strokeDashArray == null) {
+ strokeDashArray =
+ (StrokeDashArray) style.CascadingOrder (
+ new StrokeDashArray(), style, selector);
+ }
+ return strokeDashArray;
}
-
+
public Stroke getStroke() {
- if (stroke == null) {
- stroke =
- (Stroke) style.CascadingOrder (
- new Stroke(), style, selector);
- }
- return stroke;
+ if (stroke == null) {
+ stroke =
+ (Stroke) style.CascadingOrder (
+ new Stroke(), style, selector);
+ }
+ return stroke;
}
-
- public Fill getFill() {
- if (fill == null) {
- fill =
- (Fill) style.CascadingOrder (
- new Fill(), style, selector);
- }
- return fill;
+
+ public Fill getFill() {
+ if (fill == null) {
+ fill =
+ (Fill) style.CascadingOrder (
+ new Fill(), style, selector);
}
-
+ return fill;
+ }
+
/**
* Print this style
*
* @param printer The printer interface
*/
public void print(CssPrinterStyle printer) {
- super.print(printer);
-
- if (fillRule != null) {
- fillRule.print(printer);
- }
- if (strokeLinejoin != null) {
- strokeLinejoin.print(printer);
- }
- if (strokeLineCap != null) {
- strokeLineCap.print(printer);
- }
- if (strokeMiterLimit != null) {
- strokeMiterLimit.print(printer);
- }
- if (strokeWidth != null) {
- strokeWidth.print(printer);
- }
- if (strokeDashOffset != null) {
- strokeDashOffset.print(printer);
- }
- if (strokeDashArray != null) {
- strokeDashArray.print(printer);
- }
- if (stroke != null) {
- stroke.print(printer);
- }
- if (fill != null) {
- fill.print(printer);
- }
+ super.print(printer);
+
+ if (fillRule != null) {
+ fillRule.print(printer);
+ }
+ if (strokeLinejoin != null) {
+ strokeLinejoin.print(printer);
+ }
+ if (strokeLineCap != null) {
+ strokeLineCap.print(printer);
+ }
+ if (strokeMiterLimit != null) {
+ strokeMiterLimit.print(printer);
+ }
+ if (strokeWidth != null) {
+ strokeWidth.print(printer);
+ }
+ if (strokeDashOffset != null) {
+ strokeDashOffset.print(printer);
+ }
+ if (strokeDashArray != null) {
+ strokeDashArray.print(printer);
+ }
+ if (stroke != null) {
+ stroke.print(printer);
+ }
+ if (fill != null) {
+ fill.print(printer);
+ }
}
-
+
/**
* Returns the name of the actual selector
*/
Index: FloodColor.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/svgproperties/FloodColor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FloodColor.java 19 Jul 2002 20:58:01 -0000 1.1
+++ FloodColor.java 8 Aug 2005 13:19:34 -0000 1.2
@@ -11,17 +11,16 @@
import java.util.Vector;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssExpression;
+import org.w3c.css.properties.CssColor;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.Util;
-import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.ApplContext;
-import org.w3c.css.properties.CssColor;
-import org.w3c.css.values.CssOperator;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
import org.w3c.css.values.CssFunction;
+import org.w3c.css.values.CssIdent;
import org.w3c.css.values.CssNumber;
+import org.w3c.css.values.CssOperator;
+import org.w3c.css.values.CssValue;
/**
* <P>
@@ -35,196 +34,202 @@
*/
public class FloodColor extends CssProperty implements CssOperator {
-
+
CssValue floodColor;
ApplContext ac;
Vector values = new Vector();
-
+
CssIdent currentColor = new CssIdent("currentColor");
-
+
/**
* Create a new FloodColor
*/
- public FloodColor() {
- //nothing to do
- }
-
- /**
- * Create a new FloodColor
- *
- * @param expression The expression for this property
- * @exception InvalidParamException Values are incorrect
- */
- public FloodColor(ApplContext ac, CssExpression expression) throws InvalidParamException {
- this.ac = ac;
- setByUser(); // tell this property is set by the user
- CssValue val = expression.getValue();
- boolean correct = true;
- String errorval = "";
- char op = expression.getOperator();
-
- if (val.equals(inherit)) {
- floodColor = inherit;
- expression.next();
- } else if (val.equals(currentColor)) {
- floodColor = currentColor;
- expression.next();
- } else {
- try {
- CssColor color = new CssColor(ac, expression);
- values.addElement(val);
- //expression.next();
- } catch (InvalidParamException e) {
- correct = false;
- errorval = val.toString();
- }
-
- op = expression.getOperator();
- val = expression.getValue();
-
- if (val != null) {
-
- if (val instanceof CssFunction) { // icc-color(<name>[,<icccolorvalue>]*)]
- CssValue function = val;
- if (!((CssFunction) val).getName().equals("icc-color")) {
- correct = false;
- errorval = val.toString();
- } else {
- CssExpression params = ((CssFunction) val).getParameters();
-
- op = params.getOperator();
- val = params.getValue();
-
- if (!(val instanceof CssIdent)) {
- correct = false;
- errorval = val.toString();
- }
-
- params.next();
- op = params.getOperator();
- val = params.getValue();
-
- if (!params.end()) { // there are more parameters left
- int counter = 0;
-
- while ((op == COMMA || op == SPACE)
- && (counter < (params.getCount() - 1) && correct == true)) {
-
- if ((!(val instanceof CssNumber)) || (((CssNumber) val).getValue() < 0)) {
- correct = false;
- errorval = val.toString();
- }
-
- params.next();
- counter++;
- val = params.getValue();
- op = params.getOperator();
- }
- }
-
- if (correct) {
- params.starts();
- values.addElement(function);
- }
- }
- } else {
- correct = false;
- errorval = val.toString();
- }
- } else {
- correct = false;
- errorval = new String("");
- }
-
- expression.next();
-
- }
-
- if (!correct) {
- throw new InvalidParamException("value", errorval, getPropertyName(), ac);
- }
- }
-
+ public FloodColor() {
+ //nothing to do
+ }
+
/**
- * Add this property to the CssStyle.
+ * Create a new FloodColor
*
- * @param style The CssStyle
+ * @param expression The expression for this property
+ * @exception InvalidParamException Values are incorrect
*/
- public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).floodColor != null)
- style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).floodColor = 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 ((SVGStyle) style).getFloodColor();
+ public FloodColor(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+ this.ac = ac;
+ setByUser(); // tell this property is set by the user
+ CssValue val = expression.getValue();
+ boolean correct = true;
+ String errorval = "";
+ char op = expression.getOperator();
+
+ if (val.equals(inherit)) {
+ floodColor = inherit;
+ expression.next();
+ } else if (val.equals(currentColor)) {
+ floodColor = currentColor;
+ expression.next();
+ } else {
+ try {
+ CssColor color = new CssColor(ac, expression);
+ values.addElement(val);
+ //expression.next();
+ } catch (InvalidParamException e) {
+ correct = false;
+ errorval = val.toString();
+ }
+
+ op = expression.getOperator();
+ val = expression.getValue();
+
+ if (val != null) {
+
+ if (val instanceof CssFunction) { // icc-color(<name>[,<icccolorvalue>]*)]
+ CssValue function = val;
+ if (!((CssFunction) val).getName().equals("icc-color")) {
+ correct = false;
+ errorval = val.toString();
+ } else {
+ CssExpression params = ((CssFunction) val).getParameters();
+
+ op = params.getOperator();
+ val = params.getValue();
+
+ if (!(val instanceof CssIdent)) {
+ correct = false;
+ errorval = val.toString();
+ }
+
+ params.next();
+ op = params.getOperator();
+ val = params.getValue();
+
+ if (!params.end()) { // there are more parameters left
+ int counter = 0;
+
+ while ((op == COMMA || op == SPACE)
+ && (counter < (params.getCount() - 1) && correct == true)) {
+
+ if ((!(val instanceof CssNumber)) || (((CssNumber) val).getValue() < 0)) {
+ correct = false;
+ errorval = val.toString();
+ }
+
+ params.next();
+ counter++;
+ val = params.getValue();
+ op = params.getOperator();
+ }
+ }
+
+ if (correct) {
+ params.starts();
+ values.addElement(function);
+ }
+ }
+ } else {
+ correct = false;
+ errorval = val.toString();
+ }
} else {
- return ((SVGStyle) style).floodColor;
+ correct = false;
+ errorval = new String("");
}
+
+ expression.next();
+
}
-
- /**
- * Compares two properties for equality.
- *
- * @param value The other property.
- */
- public boolean equals(CssProperty property) {
- return (property instanceof FloodColor &&
- floodColor.equals( ((FloodColor) property).floodColor));
- }
-
+
+ if (!correct) {
+ throw new InvalidParamException("value", errorval, getPropertyName(), ac);
+ }
+ }
+
+ public FloodColor(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
+ /**
+ * Add this property to the CssStyle.
+ *
+ * @param style The CssStyle
+ */
+ public void addToStyle(ApplContext ac, CssStyle style) {
+ if (((SVGStyle) style).floodColor != null)
+ style.addRedefinitionWarning(ac, this);
+ ((SVGStyle) style).floodColor = 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 ((SVGStyle) style).getFloodColor();
+ } else {
+ return ((SVGStyle) style).floodColor;
+ }
+ }
+
+ /**
+ * Compares two properties for equality.
+ *
+ * @param value The other property.
+ */
+ public boolean equals(CssProperty property) {
+ return (property instanceof FloodColor &&
+ floodColor.equals( ((FloodColor) property).floodColor));
+ }
+
/**
* Returns the name of this property
*/
- public String getPropertyName() {
- return "flood-color";
- }
-
+ public String getPropertyName() {
+ return "flood-color";
+ }
+
/**
* Returns the value of this property
*/
- public Object get() {
- if (floodColor != null)
- return floodColor;
- else
- return values;
- }
-
+ public Object get() {
+ if (floodColor != null)
+ return floodColor;
+ else
+ return values;
+ }
+
/**
* Returns true if this property is "softly" inherited
*/
- public boolean isSoftlyInherited() {
- return floodColor.equals(inherit);
- }
-
- /**
- * Returns a string representation of the object
- */
- public String toString() {
- if (floodColor != null) {
- return floodColor.toString();
- } else {
- String ret = "";
- for (int i = 0; i < values.size(); i++) {
- ret += " " + values.elementAt(i).toString();
- }
- return ret;
- }
- }
-
+ public boolean isSoftlyInherited() {
+ return floodColor.equals(inherit);
+ }
+
+ /**
+ * Returns a string representation of the object
+ */
+ public String toString() {
+ if (floodColor != null) {
+ return floodColor.toString();
+ } else {
+ String ret = "";
+ for (int i = 0; i < values.size(); i++) {
+ ret += " " + values.elementAt(i).toString();
+ }
+ return ret;
+ }
+ }
+
/**
* Is the value of this property a default value
* It is used by all macro for the function <code>print</code>
*/
- public boolean isDefault() {
- return false;
- }
-
+ public boolean isDefault() {
+ return false;
+ }
+
}
Index: SolidOpacity.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/svgproperties/SolidOpacity.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- SolidOpacity.java 19 Jul 2002 20:58:01 -0000 1.1
+++ SolidOpacity.java 8 Aug 2005 13:19:34 -0000 1.2
@@ -9,14 +9,14 @@
package org.w3c.css.svgproperties;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssExpression;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.Util;
-import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.util.Util;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
import org.w3c.css.values.CssNumber;
+import org.w3c.css.values.CssValue;
/**
* <P>
@@ -34,128 +34,137 @@
*/
public class SolidOpacity extends CssProperty {
-
- CssValue opaclevel;
+
+ CssValue opaclevel;
ApplContext ac;
-
+
/**
* Create a new SolidOpacity
*/
- public SolidOpacity() {
- CssNumber cssnum = new CssNumber((float) 1.0);
- opaclevel = cssnum;
- }
-
- /**
- * Create a new SolidOpacity
- *
- * @param expression The expression for this property
- * @exception InvalidParamException Values are incorrect
- */
- public SolidOpacity(ApplContext ac, CssExpression expression) throws InvalidParamException {
- this.ac = ac;
- setByUser(); // tell this property is set by the user
- CssValue val = expression.getValue();
- if (val instanceof CssNumber) {
-
- CssNumber cssnum = new CssNumber(clampedValue(ac, ((CssNumber) val).getValue()));
- opaclevel = cssnum;
- expression.next();
- }
- else if (val instanceof CssIdent) {
- if (val.equals(inherit)) {
- opaclevel = inherit;
- expression.next();
- }
- }
- else {
- throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
- }
- }
+ public SolidOpacity() {
+ CssNumber cssnum = new CssNumber((float) 1.0);
+ opaclevel = cssnum;
+ }
+
+ /**
+ * Create a new SolidOpacity
+ *
+ * @param expression The expression for this property
+ * @exception InvalidParamException Values are incorrect
+ */
+ public SolidOpacity(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+ this.ac = ac;
+ setByUser(); // tell this property is set by the user
+ CssValue val = expression.getValue();
+ if (val instanceof CssNumber) {
+
+ CssNumber cssnum = new CssNumber(clampedValue(ac,
+ ((CssNumber) val).getValue()));
+ opaclevel = cssnum;
+ expression.next();
+ }
+ else if (val instanceof CssIdent) {
+ if (val.equals(inherit)) {
+ opaclevel = inherit;
+ expression.next();
+ }
+ }
+ else {
+ throw new InvalidParamException("value", val.toString(),
+ getPropertyName(), ac);
+ }
+ }
+
+ public SolidOpacity(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Brings all values back between 0 and 1
*
* @param opac The value to be modified if necessary
*/
- private float clampedValue(ApplContext ac, float opac) {
- if (opac < 0 || opac > 1) {
- ac.getFrame().addWarning("out-of-range", Util.displayFloat(opac));
- return ((opac<0)?0:1);
- }
- else return(opac);
- }
-
+ private float clampedValue(ApplContext ac, float opac) {
+ if (opac < 0 || opac > 1) {
+ ac.getFrame().addWarning("out-of-range", Util.displayFloat(opac));
+ return ((opac<0)?0:1);
+ }
+ else return(opac);
+ }
+
/**
* Add this property to the CssStyle.
*
* @param style The CssStyle
*/
- public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).solidOpacity != null)
- style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).solidOpacity = 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 ((SVGStyle) style).getSolidOpacity();
- } else {
- return ((SVGStyle) style).solidOpacity;
- }
+ public void addToStyle(ApplContext ac, CssStyle style) {
+ if (((SVGStyle) style).solidOpacity != null)
+ style.addRedefinitionWarning(ac, this);
+ ((SVGStyle) style).solidOpacity = 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 ((SVGStyle) style).getSolidOpacity();
+ } else {
+ return ((SVGStyle) style).solidOpacity;
}
-
- /**
- * Compares two properties for equality.
- *
- * @param value The other property.
- */
- public boolean equals(CssProperty property) {
- return (property instanceof SolidOpacity &&
- opaclevel.equals( ((SolidOpacity) property).opaclevel));
- }
-
+ }
+
+ /**
+ * Compares two properties for equality.
+ *
+ * @param value The other property.
+ */
+ public boolean equals(CssProperty property) {
+ return (property instanceof SolidOpacity &&
+ opaclevel.equals( ((SolidOpacity) property).opaclevel));
+ }
+
/**
* Returns the name of this property
*/
- public String getPropertyName() {
- return "solid-opacity";
- }
-
+ public String getPropertyName() {
+ return "solid-opacity";
+ }
+
/**
* Returns the value of this property
*/
- public Object get() {
- return opaclevel;
- }
-
+ public Object get() {
+ return opaclevel;
+ }
+
/**
* Returns true if this property is "softly" inherited
*/
- public boolean isSoftlyInherited() {
- return opaclevel.equals(inherit);
- }
-
- /**
- * Returns a string representation of the object
- */
- public String toString() {
- return opaclevel.toString();
- }
-
+ public boolean isSoftlyInherited() {
+ return opaclevel.equals(inherit);
+ }
+
+ /**
+ * Returns a string representation of the object
+ */
+ public String toString() {
+ return opaclevel.toString();
+ }
+
/**
* Is the value of this property a default value
* It is used by all macro for the function <code>print</code>
*/
- public boolean isDefault() {
- CssNumber cssnum = new CssNumber(ac, (float) 1.0);
- return opaclevel == cssnum;
- }
-
+ public boolean isDefault() {
+ CssNumber cssnum = new CssNumber(ac, (float) 1.0);
+ return opaclevel == cssnum;
+ }
+
}
Index: ColorProfileSrc.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/svgproperties/ColorProfileSrc.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ColorProfileSrc.java 30 May 2004 05:06:52 -0000 1.3
+++ ColorProfileSrc.java 8 Aug 2005 13:19:34 -0000 1.4
@@ -11,170 +11,175 @@
import java.util.Vector;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssExpression;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.ApplContext;
-import org.w3c.css.values.CssNumber;
-import org.w3c.css.values.CssOperator;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
import org.w3c.css.values.CssFunction;
+import org.w3c.css.values.CssIdent;
+import org.w3c.css.values.CssOperator;
import org.w3c.css.values.CssURL;
+import org.w3c.css.values.CssValue;
/**
* This property sets the preferred media for this stylesheet
*/
public class ColorProfileSrc extends CssProperty implements CssOperator {
-
+
CssValue cpSrc;
Vector cpSrcs = new Vector();
-
+
CssIdent sRGB = new CssIdent("sRGB");
-
+
/**
* Create a new ColorProfileSrc
*/
public ColorProfileSrc() {
- cpSrc = sRGB;
+ cpSrc = sRGB;
}
-
+
/**
* Create a new ColorProfileSrc
*/
- public ColorProfileSrc(ApplContext ac, CssExpression expression) throws InvalidParamException {
-
- //setByUser();
- char op = expression.getOperator();
- CssValue val = expression.getValue();
-
- if ((val.toString().toLowerCase()).equals("srgb")) {
- cpSrc = sRGB;
- expression.next();
- } else if (val instanceof CssFunction) {
- CssFunction fun = (CssFunction) val;
- CssExpression params = fun.getParameters();
- if (fun.getName().equals("local")) {
- if ((params.getCount() == 1)) {
- cpSrc = val;
- expression.next();
- } else {
- throw new InvalidParamException("value",
- params.getValue(), getPropertyName(), ac);
- }
- } else {
- throw new InvalidParamException("value",
- val, getPropertyName(), ac);
- }
-
- val = expression.getValue();
-
- if (val != null) {
-
- if (op != SPACE) {
- throw new InvalidParamException("operator",
- new Character(op), getPropertyName(), ac);
- }
-
- if (val instanceof CssURL) {
- cpSrcs.addElement(cpSrc);
- cpSrcs.addElement(val);
- cpSrc = null;
- expression.next();
- }
- }
-
- } else if (val instanceof CssURL) {
- cpSrc = val;
- expression.next();
+ public ColorProfileSrc(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+
+ //setByUser();
+ char op = expression.getOperator();
+ CssValue val = expression.getValue();
+
+ if ((val.toString().toLowerCase()).equals("srgb")) {
+ cpSrc = sRGB;
+ expression.next();
+ } else if (val instanceof CssFunction) {
+ CssFunction fun = (CssFunction) val;
+ CssExpression params = fun.getParameters();
+ if (fun.getName().equals("local")) {
+ if ((params.getCount() == 1)) {
+ cpSrc = val;
+ expression.next();
} else {
- throw new InvalidParamException("cpSrc",expression.getValue(),
- getPropertyName(), ac);
+ throw new InvalidParamException("value",
+ params.getValue(), getPropertyName(), ac);
}
-
+ } else {
+ throw new InvalidParamException("value",
+ val, getPropertyName(), ac);
+ }
+
+ val = expression.getValue();
+
+ if (val != null) {
+
+ if (op != SPACE) {
+ throw new InvalidParamException("operator",
+ new Character(op), getPropertyName(), ac);
+ }
+
+ if (val instanceof CssURL) {
+ cpSrcs.addElement(cpSrc);
+ cpSrcs.addElement(val);
+ cpSrc = null;
+ expression.next();
+ }
+ }
+
+ } else if (val instanceof CssURL) {
+ cpSrc = val;
+ expression.next();
+ } else {
+ throw new InvalidParamException("cpSrc",expression.getValue(),
+ getPropertyName(), ac);
+ }
+
}
-
+
+ public ColorProfileSrc(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Add this property to the CssStyle.
*
* @param style The CssStyle
- */
+ */
public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).cpSrc != null)
- style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).cpSrc = this;
+ if (((SVGStyle) style).cpSrc != null)
+ style.addRedefinitionWarning(ac, this);
+ ((SVGStyle) style).cpSrc = 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 ((SVGStyle) style).getColorProfileSrc();
- } else {
- return ((SVGStyle) style).cpSrc;
- }
- }
-
- /**
- * Compares two properties for equality.
- *
- * @param cpSrc The other property.
- */
- public boolean equals(CssProperty property) {
- return (property instanceof ColorProfileSrc &&
- cpSrc.equals( ((ColorProfileSrc) property).cpSrc));
- }
-
+ public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
+ if (resolve) {
+ return ((SVGStyle) style).getColorProfileSrc();
+ } else {
+ return ((SVGStyle) style).cpSrc;
+ }
+ }
+
+ /**
+ * Compares two properties for equality.
+ *
+ * @param cpSrc The other property.
+ */
+ public boolean equals(CssProperty property) {
+ return (property instanceof ColorProfileSrc &&
+ cpSrc.equals( ((ColorProfileSrc) property).cpSrc));
+ }
+
/**
* Returns the name of this property
*/
- public String getPropertyName() {
- return "src";
- }
-
+ public String getPropertyName() {
+ return "src";
+ }
+
/**
* Returns the cpSrc of this property
*/
- public Object get() {
- if (cpSrc != null)
- return cpSrc;
- else
- return cpSrcs;
- }
-
+ public Object get() {
+ if (cpSrc != null)
+ return cpSrc;
+ else
+ return cpSrcs;
+ }
+
/**
* Returns true if this property is "softly" inherited
*/
- public boolean isSoftlyInherited() {
- return cpSrc.equals(inherit);
- }
-
- /**
- * Returns a string representation of the object
- */
- public String toString() {
- if (cpSrc != null) {
- return cpSrc.toString();
- } else {
- String ret = "";
- for (int i = 0; i < cpSrcs.size(); i++) {
- ret += " " + cpSrcs.elementAt(i).toString();
- }
- return ret;
- }
- }
-
+ public boolean isSoftlyInherited() {
+ return cpSrc.equals(inherit);
+ }
+
+ /**
+ * Returns a string representation of the object
+ */
+ public String toString() {
+ if (cpSrc != null) {
+ return cpSrc.toString();
+ } else {
+ String ret = "";
+ for (int i = 0; i < cpSrcs.size(); i++) {
+ ret += " " + cpSrcs.elementAt(i).toString();
+ }
+ return ret;
+ }
+ }
+
/**
* Is the cpSrc of this property a default cpSrc
* It is used by all macro for the function <code>print</code>
*/
- public boolean isDefault() {
- return cpSrc == sRGB;
- }
-
+ public boolean isDefault() {
+ return cpSrc == sRGB;
+ }
+
}
Index: StopColor.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/svgproperties/StopColor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- StopColor.java 19 Jul 2002 20:58:01 -0000 1.1
+++ StopColor.java 8 Aug 2005 13:19:34 -0000 1.2
@@ -11,17 +11,16 @@
import java.util.Vector;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssExpression;
+import org.w3c.css.properties.CssColor;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.Util;
-import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.ApplContext;
-import org.w3c.css.properties.CssColor;
-import org.w3c.css.values.CssOperator;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
import org.w3c.css.values.CssFunction;
+import org.w3c.css.values.CssIdent;
import org.w3c.css.values.CssNumber;
+import org.w3c.css.values.CssOperator;
+import org.w3c.css.values.CssValue;
/**
* <P>
@@ -35,196 +34,202 @@
*/
public class StopColor extends CssProperty implements CssOperator {
-
+
CssValue stopColor;
ApplContext ac;
Vector values = new Vector();
-
+
CssIdent currentColor = new CssIdent("currentColor");
-
+
/**
* Create a new StopColor
*/
- public StopColor() {
- //nothing to do
- }
-
- /**
- * Create a new StopColor
- *
- * @param expression The expression for this property
- * @exception InvalidParamException Values are incorrect
- */
- public StopColor(ApplContext ac, CssExpression expression) throws InvalidParamException {
- this.ac = ac;
- setByUser(); // tell this property is set by the user
- CssValue val = expression.getValue();
- boolean correct = true;
- String errorval = "";
- char op = expression.getOperator();
-
- if (val.equals(inherit)) {
- stopColor = inherit;
- expression.next();
- } else if (val.equals(currentColor)) {
- stopColor = currentColor;
- expression.next();
- } else {
- try {
- CssColor color = new CssColor(ac, expression);
- values.addElement(val);
- //expression.next();
- } catch (InvalidParamException e) {
- correct = false;
- errorval = val.toString();
- }
-
- op = expression.getOperator();
- val = expression.getValue();
-
- if (val != null) {
-
- if (val instanceof CssFunction) { // icc-color(<name>[,<icccolorvalue>]*)]
- CssValue function = val;
- if (!((CssFunction) val).getName().equals("icc-color")) {
- correct = false;
- errorval = val.toString();
- } else {
- CssExpression params = ((CssFunction) val).getParameters();
-
- op = params.getOperator();
- val = params.getValue();
-
- if (!(val instanceof CssIdent)) {
- correct = false;
- errorval = val.toString();
- }
-
- params.next();
- op = params.getOperator();
- val = params.getValue();
-
- if (!params.end()) { // there are more parameters left
- int counter = 0;
-
- while ((op == COMMA || op == SPACE)
- && (counter < (params.getCount() - 1) && correct == true)) {
-
- if ((!(val instanceof CssNumber)) || (((CssNumber) val).getValue() < 0)) {
- correct = false;
- errorval = val.toString();
- }
-
- params.next();
- counter++;
- val = params.getValue();
- op = params.getOperator();
- }
- }
-
- if (correct) {
- params.starts();
- values.addElement(function);
- }
- }
- } else {
- correct = false;
- errorval = val.toString();
- }
- } else {
+ public StopColor() {
+ //nothing to do
+ }
+
+ /**
+ * Create a new StopColor
+ *
+ * @param expression The expression for this property
+ * @exception InvalidParamException Values are incorrect
+ */
+ public StopColor(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+ this.ac = ac;
+ setByUser(); // tell this property is set by the user
+ CssValue val = expression.getValue();
+ boolean correct = true;
+ String errorval = "";
+ char op = expression.getOperator();
+
+ if (val.equals(inherit)) {
+ stopColor = inherit;
+ expression.next();
+ } else if (val.equals(currentColor)) {
+ stopColor = currentColor;
+ expression.next();
+ } else {
+ try {
+ CssColor color = new CssColor(ac, expression);
+ values.addElement(val);
+ //expression.next();
+ } catch (InvalidParamException e) {
+ correct = false;
+ errorval = val.toString();
+ }
+
+ op = expression.getOperator();
+ val = expression.getValue();
+
+ if (val != null) {
+
+ if (val instanceof CssFunction) { // icc-color(<name>[,<icccolorvalue>]*)]
+ CssValue function = val;
+ if (!((CssFunction) val).getName().equals("icc-color")) {
correct = false;
- errorval = new String("");
+ errorval = val.toString();
+ } else {
+ CssExpression params = ((CssFunction) val).getParameters();
+
+ op = params.getOperator();
+ val = params.getValue();
+
+ if (!(val instanceof CssIdent)) {
+ correct = false;
+ errorval = val.toString();
+ }
+
+ params.next();
+ op = params.getOperator();
+ val = params.getValue();
+
+ if (!params.end()) { // there are more parameters left
+ int counter = 0;
+
+ while ((op == COMMA || op == SPACE)
+ && (counter < (params.getCount() - 1) && correct == true)) {
+
+ if ((!(val instanceof CssNumber)) || (((CssNumber) val).getValue() < 0)) {
+ correct = false;
+ errorval = val.toString();
+ }
+
+ params.next();
+ counter++;
+ val = params.getValue();
+ op = params.getOperator();
+ }
+ }
+
+ if (correct) {
+ params.starts();
+ values.addElement(function);
+ }
+ }
+ } else {
+ correct = false;
+ errorval = val.toString();
}
-
- expression.next();
-
- }
-
- if (!correct) {
- throw new InvalidParamException("value", errorval, getPropertyName(), ac);
- }
- }
-
+ } else {
+ correct = false;
+ errorval = new String("");
+ }
+
+ expression.next();
+
+ }
+
+ if (!correct) {
+ throw new InvalidParamException("value", errorval, getPropertyName(), ac);
+ }
+ }
+
+ public StopColor(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Add this property to the CssStyle.
*
* @param style The CssStyle
*/
- public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).stopColor != null)
- style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).stopColor = 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 ((SVGStyle) style).getStopColor();
- } else {
- return ((SVGStyle) style).stopColor;
- }
+ public void addToStyle(ApplContext ac, CssStyle style) {
+ if (((SVGStyle) style).stopColor != null)
+ style.addRedefinitionWarning(ac, this);
+ ((SVGStyle) style).stopColor = 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 ((SVGStyle) style).getStopColor();
+ } else {
+ return ((SVGStyle) style).stopColor;
}
-
- /**
- * Compares two properties for equality.
- *
- * @param value The other property.
- */
- public boolean equals(CssProperty property) {
- return (property instanceof StopColor &&
- stopColor.equals( ((StopColor) property).stopColor));
- }
-
+ }
+
+ /**
+ * Compares two properties for equality.
+ *
+ * @param value The other property.
+ */
+ public boolean equals(CssProperty property) {
+ return (property instanceof StopColor &&
+ stopColor.equals( ((StopColor) property).stopColor));
+ }
+
/**
* Returns the name of this property
*/
- public String getPropertyName() {
- return "stop-color";
- }
-
+ public String getPropertyName() {
+ return "stop-color";
+ }
+
/**
* Returns the value of this property
*/
- public Object get() {
- if (stopColor != null)
- return stopColor;
- else
- return values;
- }
-
+ public Object get() {
+ if (stopColor != null)
+ return stopColor;
+ else
+ return values;
+ }
+
/**
* Returns true if this property is "softly" inherited
*/
- public boolean isSoftlyInherited() {
- return stopColor.equals(inherit);
- }
-
- /**
- * Returns a string representation of the object
- */
- public String toString() {
- if (stopColor != null) {
- return stopColor.toString();
- } else {
- String ret = "";
- for (int i = 0; i < values.size(); i++) {
- ret += " " + values.elementAt(i).toString();
- }
- return ret;
- }
- }
-
+ public boolean isSoftlyInherited() {
+ return stopColor.equals(inherit);
+ }
+
+ /**
+ * Returns a string representation of the object
+ */
+ public String toString() {
+ if (stopColor != null) {
+ return stopColor.toString();
+ } else {
+ String ret = "";
+ for (int i = 0; i < values.size(); i++) {
+ ret += " " + values.elementAt(i).toString();
+ }
+ return ret;
+ }
+ }
+
/**
* Is the value of this property a default value
* It is used by all macro for the function <code>print</code>
*/
- public boolean isDefault() {
- return false;
- }
-
+ public boolean isDefault() {
+ return false;
+ }
+
}
Index: MarkerEnd.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/svgproperties/MarkerEnd.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- MarkerEnd.java 19 Jul 2002 20:58:01 -0000 1.1
+++ MarkerEnd.java 8 Aug 2005 13:19:34 -0000 1.2
@@ -9,14 +9,13 @@
package org.w3c.css.svgproperties;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssExpression;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.Util;
-import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
import org.w3c.css.values.CssURL;
+import org.w3c.css.values.CssValue;
/**
* <P>
@@ -29,116 +28,122 @@
*/
public class MarkerEnd extends CssProperty {
-
- CssValue markerEnd;
+
+ CssValue markerEnd;
ApplContext ac;
-
+
CssIdent none = new CssIdent("none");
-
+
/**
* Create a new MarkerEnd
*/
- public MarkerEnd() {
- //nothing to do
- }
-
- /**
- * Create a new MarkerEnd
- *
- * @param expression The expression for this property
- * @exception InvalidParamException Values are incorrect
- */
- public MarkerEnd(ApplContext ac, CssExpression expression) throws InvalidParamException {
- this.ac = ac;
- setByUser(); // tell this property is set by the user
- CssValue val = expression.getValue();
- if (val instanceof CssURL) {
- markerEnd = val;
- expression.next();
- }
- else if (val instanceof CssIdent) {
- if (val.equals(inherit)) {
- markerEnd = inherit;
- expression.next();
- } else if (val.equals(none)) {
- markerEnd = none;
- expression.next();
- }
- }
- else {
- throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
- }
- }
-
+ public MarkerEnd() {
+ //nothing to do
+ }
+
+ /**
+ * Create a new MarkerEnd
+ *
+ * @param expression The expression for this property
+ * @exception InvalidParamException Values are incorrect
+ */
+ public MarkerEnd(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+ this.ac = ac;
+ setByUser(); // tell this property is set by the user
+ CssValue val = expression.getValue();
+ if (val instanceof CssURL) {
+ markerEnd = val;
+ expression.next();
+ }
+ else if (val instanceof CssIdent) {
+ if (val.equals(inherit)) {
+ markerEnd = inherit;
+ expression.next();
+ } else if (val.equals(none)) {
+ markerEnd = none;
+ expression.next();
+ }
+ }
+ else {
+ throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
+ }
+ }
+
+ public MarkerEnd(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Add this property to the CssStyle.
*
* @param style The CssStyle
*/
- public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).markerEnd != null)
- style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).markerEnd = this;
- }
+ public void addToStyle(ApplContext ac, CssStyle style) {
+ if (((SVGStyle) style).markerEnd != null)
+ style.addRedefinitionWarning(ac, this);
+ ((SVGStyle) style).markerEnd = 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 ((SVGStyle) style).getMarkerEnd();
- } else {
- return ((SVGStyle) style).markerEnd;
- }
+ /**
+ * 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 ((SVGStyle) style).getMarkerEnd();
+ } else {
+ return ((SVGStyle) style).markerEnd;
}
+ }
+
+ /**
+ * Compares two properties for equality.
+ *
+ * @param value The other property.
+ */
+ public boolean equals(CssProperty property) {
+ return (property instanceof MarkerEnd &&
+ markerEnd.equals( ((MarkerEnd) property).markerEnd));
+ }
- /**
- * Compares two properties for equality.
- *
- * @param value The other property.
- */
- public boolean equals(CssProperty property) {
- return (property instanceof MarkerEnd &&
- markerEnd.equals( ((MarkerEnd) property).markerEnd));
- }
-
/**
* Returns the name of this property
*/
- public String getPropertyName() {
- return "marker-end";
- }
-
+ public String getPropertyName() {
+ return "marker-end";
+ }
+
/**
* Returns the value of this property
*/
- public Object get() {
- return markerEnd;
- }
-
+ public Object get() {
+ return markerEnd;
+ }
+
/**
* Returns true if this property is "softly" inherited
*/
- public boolean isSoftlyInherited() {
- return markerEnd.equals(inherit);
- }
-
- /**
- * Returns a string representation of the object
- */
- public String toString() {
- return markerEnd.toString();
- }
-
+ public boolean isSoftlyInherited() {
+ return markerEnd.equals(inherit);
+ }
+
+ /**
+ * Returns a string representation of the object
+ */
+ public String toString() {
+ return markerEnd.toString();
+ }
+
/**
* Is the value of this property a default value
* It is used by all macro for the function <code>print</code>
*/
- public boolean isDefault() {
- return (markerEnd == none);
- }
-
+ public boolean isDefault() {
+ return (markerEnd == none);
+ }
+
}
Index: Mask.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/svgproperties/Mask.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Mask.java 19 Jul 2002 20:58:01 -0000 1.1
+++ Mask.java 8 Aug 2005 13:19:34 -0000 1.2
@@ -9,14 +9,13 @@
package org.w3c.css.svgproperties;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssExpression;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.Util;
-import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
import org.w3c.css.values.CssURL;
+import org.w3c.css.values.CssValue;
/**
* <P>
@@ -29,116 +28,122 @@
*/
public class Mask extends CssProperty {
-
- CssValue mask;
+
+ CssValue mask;
ApplContext ac;
-
+
CssIdent none = new CssIdent("none");
-
+
/**
* Create a new Mask
*/
- public Mask() {
- //nothing to do
- }
-
- /**
- * Create a new Mask
- *
- * @param expression The expression for this property
- * @exception InvalidParamException Values are incorrect
- */
- public Mask(ApplContext ac, CssExpression expression) throws InvalidParamException {
- this.ac = ac;
- setByUser(); // tell this property is set by the user
- CssValue val = expression.getValue();
- if (val instanceof CssURL) {
- mask = val;
- expression.next();
- }
- else if (val instanceof CssIdent) {
- if (val.equals(inherit)) {
- mask = inherit;
- expression.next();
- } else if (val.equals(none)) {
- mask = none;
- expression.next();
- }
- }
- else {
- throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
- }
- }
-
+ public Mask() {
+ //nothing to do
+ }
+
+ /**
+ * Create a new Mask
+ *
+ * @param expression The expression for this property
+ * @exception InvalidParamException Values are incorrect
+ */
+ public Mask(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+ this.ac = ac;
+ setByUser(); // tell this property is set by the user
+ CssValue val = expression.getValue();
+ if (val instanceof CssURL) {
+ mask = val;
+ expression.next();
+ }
+ else if (val instanceof CssIdent) {
+ if (val.equals(inherit)) {
+ mask = inherit;
+ expression.next();
+ } else if (val.equals(none)) {
+ mask = none;
+ expression.next();
+ }
+ }
+ else {
+ throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
+ }
+ }
+
+ public Mask(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Add this property to the CssStyle.
*
* @param style The CssStyle
*/
- public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).mask != null)
- style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).mask = this;
- }
+ public void addToStyle(ApplContext ac, CssStyle style) {
+ if (((SVGStyle) style).mask != null)
+ style.addRedefinitionWarning(ac, this);
+ ((SVGStyle) style).mask = 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 ((SVGStyle) style).getMask();
- } else {
- return ((SVGStyle) style).mask;
- }
+ /**
+ * 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 ((SVGStyle) style).getMask();
+ } else {
+ return ((SVGStyle) style).mask;
}
+ }
+
+ /**
+ * Compares two properties for equality.
+ *
+ * @param value The other property.
+ */
+ public boolean equals(CssProperty property) {
+ return (property instanceof Mask &&
+ mask.equals( ((Mask) property).mask));
+ }
- /**
- * Compares two properties for equality.
- *
- * @param value The other property.
- */
- public boolean equals(CssProperty property) {
- return (property instanceof Mask &&
- mask.equals( ((Mask) property).mask));
- }
-
/**
* Returns the name of this property
*/
- public String getPropertyName() {
- return "mask";
- }
-
+ public String getPropertyName() {
+ return "mask";
+ }
+
/**
* Returns the value of this property
*/
- public Object get() {
- return mask;
- }
-
+ public Object get() {
+ return mask;
+ }
+
/**
* Returns true if this property is "softly" inherited
*/
- public boolean isSoftlyInherited() {
- return mask.equals(inherit);
- }
-
- /**
- * Returns a string representation of the object
- */
- public String toString() {
- return mask.toString();
- }
-
+ public boolean isSoftlyInherited() {
+ return mask.equals(inherit);
+ }
+
+ /**
+ * Returns a string representation of the object
+ */
+ public String toString() {
+ return mask.toString();
+ }
+
/**
* Is the value of this property a default value
* It is used by all macro for the function <code>print</code>
*/
- public boolean isDefault() {
- return (mask == none);
- }
-
+ public boolean isDefault() {
+ return (mask == none);
+ }
+
}
Index: SVGStyle.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/svgproperties/SVGStyle.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- SVGStyle.java 19 Jul 2002 20:58:01 -0000 1.1
+++ SVGStyle.java 8 Aug 2005 13:19:34 -0000 1.2
@@ -8,14 +8,10 @@
package org.w3c.css.svgproperties;
-import org.w3c.css.util.Warnings;
-import org.w3c.css.util.Warning;
-import org.w3c.css.util.ApplContext;
import org.w3c.css.parser.CssPrinterStyle;
-import org.w3c.css.values.CssValue;
public class SVGStyle extends org.w3c.css.properties3.Css3Style {
-
+
AlignmentBaseline alignmentBaseline;
ClipPath clipPath;
ClipRule clipRule;
@@ -53,400 +49,400 @@
FloodColor floodColor;
Stroke stroke;
ColorProfile colorProfile;
- DominantBaseLine dominantBaseLine;
- SolidOpacity solidOpacity;
- Fill fill;
- ColorProfileSrc cpSrc;
- ColorProfileName cpName;
- CssRenderIntent cssRenderIntent;
-
+ DominantBaseLine dominantBaseLine;
+ SolidOpacity solidOpacity;
+ Fill fill;
+ ColorProfileSrc cpSrc;
+ ColorProfileName cpName;
+ CssRenderIntent cssRenderIntent;
+
public AlignmentBaseline getAlignmentBaseline() {
if (alignmentBaseline == null) {
alignmentBaseline =
(AlignmentBaseline) style.CascadingOrder (
- new AlignmentBaseline(), style, selector);
+ new AlignmentBaseline(), style, selector);
}
return alignmentBaseline;
}
-
+
public DominantBaseLine getDominantBaseLineSVG() {
if (dominantBaseLine == null) {
dominantBaseLine =
(DominantBaseLine) style.CascadingOrder (
- new DominantBaseLine(), style, selector);
+ new DominantBaseLine(), style, selector);
}
return dominantBaseLine;
}
-
+
public ClipPath getClipPath() {
if (clipPath == null) {
clipPath =
(ClipPath) style.CascadingOrder (
- new ClipPath(), style, selector);
+ new ClipPath(), style, selector);
}
return clipPath;
}
-
+
public ClipRule getClipRule() {
if (clipRule == null) {
clipRule =
(ClipRule) style.CascadingOrder (
- new ClipRule(), style, selector);
+ new ClipRule(), style, selector);
}
return clipRule;
}
-
+
public ColorInterpolation getColorInterpolation() {
if (colorInterpolation == null) {
colorInterpolation =
(ColorInterpolation) style.CascadingOrder (
- new ColorInterpolation(), style, selector);
+ new ColorInterpolation(), style, selector);
}
return colorInterpolation;
}
-
+
public ColorInterpolationFilters getColorInterpolationFilters() {
if (colorInterpolationFilters == null) {
colorInterpolationFilters =
(ColorInterpolationFilters) style.CascadingOrder (
- new ColorInterpolationFilters(), style, selector);
+ new ColorInterpolationFilters(), style, selector);
}
return colorInterpolationFilters;
}
-
+
public ColorRendering getColorRendering() {
if (colorRendering == null) {
colorRendering =
(ColorRendering) style.CascadingOrder (
- new ColorRendering(), style, selector);
+ new ColorRendering(), style, selector);
}
return colorRendering;
}
-
+
public EnableBackground getEnableBackground() {
if (enableBackground == null) {
enableBackground =
(EnableBackground) style.CascadingOrder (
- new EnableBackground(), style, selector);
+ new EnableBackground(), style, selector);
}
return enableBackground;
}
-
+
public WritingModeSVG getWritingModeSVG() {
if (writingModeSVG == null) {
writingModeSVG =
(WritingModeSVG) style.CascadingOrder (
- new WritingModeSVG(), style, selector);
+ new WritingModeSVG(), style, selector);
}
return writingModeSVG;
}
-
+
public FloodOpacity getFloodOpacity() {
if (floodOpacity == null) {
floodOpacity =
(FloodOpacity) style.CascadingOrder (
- new FloodOpacity(), style, selector);
+ new FloodOpacity(), style, selector);
}
return floodOpacity;
}
-
+
public Filter getFilter() {
if (filter == null) {
filter =
(Filter) style.CascadingOrder (
- new Filter(), style, selector);
+ new Filter(), style, selector);
}
return filter;
}
-
+
public FillRule getFillRule() {
if (fillRule == null) {
fillRule =
(FillRule) style.CascadingOrder (
- new FillRule(), style, selector);
+ new FillRule(), style, selector);
}
return fillRule;
}
-
+
public FillOpacity getFillOpacity() {
if (fillOpacity == null) {
fillOpacity =
(FillOpacity) style.CascadingOrder (
- new FillOpacity(), style, selector);
+ new FillOpacity(), style, selector);
}
return fillOpacity;
}
-
+
public ImageRendering getImageRendering() {
if (imageRendering == null) {
imageRendering =
(ImageRendering) style.CascadingOrder (
- new ImageRendering(), style, selector);
+ new ImageRendering(), style, selector);
}
return imageRendering;
}
-
+
public Mask getMask() {
if (mask == null) {
mask =
(Mask) style.CascadingOrder (
- new ImageRendering(), style, selector);
+ new ImageRendering(), style, selector);
}
return mask;
}
-
+
public StopOpacity getStopOpacity() {
if (stopOpacity == null) {
stopOpacity =
(StopOpacity) style.CascadingOrder (
- new StopOpacity(), style, selector);
+ new StopOpacity(), style, selector);
}
return stopOpacity;
}
-
+
public Kerning getKerning() {
if (kerning == null) {
kerning =
(Kerning) style.CascadingOrder (
- new Kerning(), style, selector);
+ new Kerning(), style, selector);
}
return kerning;
}
-
+
public Marker getMarker() {
if (marker == null) {
marker =
(Marker) style.CascadingOrder (
- new Marker(), style, selector);
+ new Marker(), style, selector);
}
return marker;
}
-
+
public MarkerStart getMarkerStart() {
if (markerStart == null) {
markerStart =
(MarkerStart) style.CascadingOrder (
- new MarkerStart(), style, selector);
+ new MarkerStart(), style, selector);
}
return markerStart;
}
-
+
public MarkerEnd getMarkerEnd() {
if (markerEnd == null) {
markerEnd =
(MarkerEnd) style.CascadingOrder (
- new MarkerEnd(), style, selector);
+ new MarkerEnd(), style, selector);
}
return markerEnd;
}
-
+
public MarkerMid getMarkerMid() {
if (markerMid == null) {
markerMid =
(MarkerMid) style.CascadingOrder (
- new MarkerMid(), style, selector);
+ new MarkerMid(), style, selector);
}
return markerMid;
}
-
+
public PointerEvents getPointerEvents() {
if (pointerEvents == null) {
pointerEvents =
(PointerEvents) style.CascadingOrder (
- new PointerEvents(), style, selector);
+ new PointerEvents(), style, selector);
}
return pointerEvents;
}
-
+
public ShapeRendering getShapeRendering() {
if (shapeRendering == null) {
shapeRendering =
(ShapeRendering) style.CascadingOrder (
- new ShapeRendering(), style, selector);
+ new ShapeRendering(), style, selector);
}
return shapeRendering;
}
-
+
public TextRendering getTextRendering() {
if (textRendering == null) {
textRendering =
(TextRendering) style.CascadingOrder (
- new TextRendering(), style, selector);
+ new TextRendering(), style, selector);
}
return textRendering;
}
-
+
public TextAnchor getTextAnchor() {
if (textAnchor == null) {
textAnchor =
(TextAnchor) style.CascadingOrder (
- new TextAnchor(), style, selector);
+ new TextAnchor(), style, selector);
}
return textAnchor;
}
-
+
public StrokeLinejoin getStrokeLinejoin() {
if (strokeLinejoin == null) {
strokeLinejoin =
(StrokeLinejoin) style.CascadingOrder (
- new StrokeLinejoin(), style, selector);
+ new StrokeLinejoin(), style, selector);
}
return strokeLinejoin;
}
-
+
public StrokeLineCap getStrokeLineCap() {
if (strokeLineCap == null) {
strokeLineCap =
(StrokeLineCap) style.CascadingOrder (
- new StrokeLineCap(), style, selector);
+ new StrokeLineCap(), style, selector);
}
return strokeLineCap;
}
-
+
public StrokeMiterLimit getStrokeMiterLimit() {
if (strokeMiterLimit == null) {
strokeMiterLimit =
(StrokeMiterLimit) style.CascadingOrder (
- new StrokeMiterLimit(), style, selector);
+ new StrokeMiterLimit(), style, selector);
}
return strokeMiterLimit;
}
-
+
public StrokeOpacity getStrokeOpacity() {
if (strokeOpacity == null) {
strokeOpacity =
(StrokeOpacity) style.CascadingOrder (
- new StrokeOpacity(), style, selector);
+ new StrokeOpacity(), style, selector);
}
return strokeOpacity;
}
-
+
public StrokeWidth getStrokeWidth() {
if (strokeWidth == null) {
strokeWidth =
(StrokeWidth) style.CascadingOrder (
- new StrokeWidth(), style, selector);
+ new StrokeWidth(), style, selector);
}
return strokeWidth;
}
-
+
public StrokeDashOffset getStrokeDashOffset() {
if (strokeDashOffset == null) {
strokeDashOffset =
(StrokeDashOffset) style.CascadingOrder (
- new StrokeDashOffset(), style, selector);
+ new StrokeDashOffset(), style, selector);
}
return strokeDashOffset;
}
-
+
public StrokeDashArray getStrokeDashArray() {
if (strokeDashArray == null) {
strokeDashArray =
(StrokeDashArray) style.CascadingOrder (
- new StrokeDashArray(), style, selector);
+ new StrokeDashArray(), style, selector);
}
return strokeDashArray;
}
-
+
public StopColor getStopColor() {
if (stopColor == null) {
stopColor =
(StopColor) style.CascadingOrder (
- new StopColor(), style, selector);
+ new StopColor(), style, selector);
}
return stopColor;
}
-
+
public SolidColor getSolidColor() {
if (solidColor == null) {
solidColor =
(SolidColor) style.CascadingOrder (
- new SolidColor(), style, selector);
+ new SolidColor(), style, selector);
}
return solidColor;
}
-
+
public LightingColor getLightingColor() {
if (lightingColor == null) {
lightingColor =
(LightingColor) style.CascadingOrder(
- new LightingColor(), style, selector);
+ new LightingColor(), style, selector);
}
return lightingColor;
}
-
+
public FloodColor getFloodColor() {
if (floodColor == null) {
floodColor =
(FloodColor) style.CascadingOrder (
- new FloodColor(), style, selector);
+ new FloodColor(), style, selector);
}
return floodColor;
}
-
+
public ColorProfile getColorProfileSVG() {
if (colorProfile == null) {
colorProfile =
(ColorProfile) style.CascadingOrder (
- new ColorProfile(), style, selector);
+ new ColorProfile(), style, selector);
}
return colorProfile;
}
-
+
public Stroke getStroke() {
if (stroke == null) {
stroke =
(Stroke) style.CascadingOrder (
- new Stroke(), style, selector);
+ new Stroke(), style, selector);
}
return stroke;
}
-
- public SolidOpacity getSolidOpacity() {
- if (solidOpacity == null) {
- solidOpacity =
- (SolidOpacity) style.CascadingOrder (
- new SolidOpacity(), style, selector);
- }
- return solidOpacity;
+
+ public SolidOpacity getSolidOpacity() {
+ if (solidOpacity == null) {
+ solidOpacity =
+ (SolidOpacity) style.CascadingOrder (
+ new SolidOpacity(), style, selector);
}
-
- public Fill getFill() {
- if (fill == null) {
- fill =
- (Fill) style.CascadingOrder (
- new Fill(), style, selector);
- }
- return fill;
+ return solidOpacity;
+ }
+
+ public Fill getFill() {
+ if (fill == null) {
+ fill =
+ (Fill) style.CascadingOrder (
+ new Fill(), style, selector);
}
-
- public ColorProfileSrc getColorProfileSrc() {
- if (cpSrc == null) {
- cpSrc =
- (ColorProfileSrc) style.CascadingOrder (
- new ColorProfileSrc(), style, selector);
- }
- return cpSrc;
+ return fill;
+ }
+
+ public ColorProfileSrc getColorProfileSrc() {
+ if (cpSrc == null) {
+ cpSrc =
+ (ColorProfileSrc) style.CascadingOrder (
+ new ColorProfileSrc(), style, selector);
}
-
- public ColorProfileName getColorProfileName() {
- if (cpName == null) {
- cpName =
- (ColorProfileName) style.CascadingOrder (
- new ColorProfileName(), style, selector);
- }
- return cpName;
+ return cpSrc;
+ }
+
+ public ColorProfileName getColorProfileName() {
+ if (cpName == null) {
+ cpName =
+ (ColorProfileName) style.CascadingOrder (
+ new ColorProfileName(), style, selector);
}
-
- public CssRenderIntent getCssRenderIntent() {
- if (cssRenderIntent == null) {
- cssRenderIntent =
- (CssRenderIntent) style.CascadingOrder (
- new CssRenderIntent(), style, selector);
- }
- return cssRenderIntent;
+ return cpName;
+ }
+
+ public CssRenderIntent getCssRenderIntent() {
+ if (cssRenderIntent == null) {
+ cssRenderIntent =
+ (CssRenderIntent) style.CascadingOrder (
+ new CssRenderIntent(), style, selector);
}
-
+ return cssRenderIntent;
+ }
+
/**
* Print this style
*
@@ -454,12 +450,12 @@
*/
public void print(CssPrinterStyle printer) {
super.print(printer);
-
+
if (alignmentBaseline != null) {
alignmentBaseline.print(printer);
}
if (dominantBaseLine != null) {
- dominantBaseLine.print(printer);
+ dominantBaseLine.print(printer);
}
if (clipPath != null) {
clipPath.print(printer);
@@ -552,7 +548,7 @@
stopColor.print(printer);
}
if (solidColor != null) {
- solidColor.print(printer);
+ solidColor.print(printer);
}
if (lightingColor != null) {
lightingColor.print(printer);
@@ -567,22 +563,22 @@
colorProfile.print(printer);
}
if (solidOpacity != null) {
- solidOpacity.print(printer);
+ solidOpacity.print(printer);
}
if (fill != null) {
- fill.print(printer);
+ fill.print(printer);
}
- if (cpSrc != null) {
- cpSrc.print(printer);
+ if (cpSrc != null) {
+ cpSrc.print(printer);
}
if (cpName != null) {
- cpName.print(printer);
+ cpName.print(printer);
}
if (cssRenderIntent != null) {
- cssRenderIntent.print(printer);
+ cssRenderIntent.print(printer);
}
}
-
+
/**
* Returns the name of the actual selector
*/
@@ -590,5 +586,5 @@
{
return (selector.getElement().toLowerCase());
}
-
+
}
Index: WritingModeSVG.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/svgproperties/WritingModeSVG.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- WritingModeSVG.java 19 Jul 2002 20:58:01 -0000 1.1
+++ WritingModeSVG.java 8 Aug 2005 13:19:34 -0000 1.2
@@ -9,12 +9,12 @@
package org.w3c.css.svgproperties;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssExpression;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
+import org.w3c.css.values.CssValue;
/**
* <P>
@@ -49,7 +49,8 @@
/**
* Create a new CssWritingModeSVG
*/
- public WritingModeSVG(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public WritingModeSVG(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
setByUser();
CssValue val = expression.getValue();
@@ -88,6 +89,11 @@
}
}
+ public WritingModeSVG(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Add this property to the CssStyle
*
Index: PointerEvents.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/svgproperties/PointerEvents.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- PointerEvents.java 19 Jul 2002 20:58:01 -0000 1.1
+++ PointerEvents.java 8 Aug 2005 13:19:34 -0000 1.2
@@ -9,12 +9,12 @@
package org.w3c.css.svgproperties;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssExpression;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
+import org.w3c.css.values.CssValue;
/**
* <P>
@@ -28,34 +28,35 @@
*/
public class PointerEvents extends CssProperty {
-
+
CssValue events;
-
+
static CssIdent visiblePainted = new CssIdent("visiblePainted");
-
+
private static String[] values = {
"visiblePainted", "visibleFill", "visibleStroke",
"visible", "painted", "fill", "stroke", "all", "none", "inherit"
};
-
+
/**
* Create a new PointerEvents
*/
public PointerEvents() {
// nothing to do
}
-
+
/**
* Create a new PointerEvents
*
* @param expression The expression for this property
* @exception InvalidParamException Incorrect value
*/
- public PointerEvents(ApplContext ac, CssExpression expression) throws InvalidParamException {
-
+ public PointerEvents(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+
setByUser();
CssValue val = expression.getValue();
-
+
int i = 0;
for (; i < values.length; i++) {
if (val.toString().equals(values[i])) {
@@ -66,10 +67,15 @@
}
if (i == values.length) {
throw new InvalidParamException("value", expression.getValue(),
- getPropertyName(), ac);
+ getPropertyName(), ac);
}
}
-
+
+ public PointerEvents(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Add this property to the CssStyle
*
@@ -80,7 +86,7 @@
style.addRedefinitionWarning(ac, this);
((SVGStyle) style).pointerEvents = this;
}
-
+
/**
* Get this property in the style.
*
@@ -95,7 +101,7 @@
return ((SVGStyle) style).pointerEvents;
}
}
-
+
/**
* Compares two properties for equality.
*
@@ -112,28 +118,28 @@
public String getPropertyName() {
return "pointer-events";
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return events;
}
-
+
/**
* Returns true if this property is "softly" inherited
*/
public boolean isSoftlyInherited() {
return events.equals(inherit);
}
-
+
/**
* Returns a string representation of the object
*/
public String toString() {
return events.toString();
}
-
+
/**
* Is the value of this property a default value
* It is used by alle macro for the function <code>print</code>
@@ -141,5 +147,5 @@
public boolean isDefault() {
return (events == visiblePainted);
}
-
+
}
Index: ClipPath.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/svgproperties/ClipPath.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ClipPath.java 19 Jul 2002 20:58:01 -0000 1.1
+++ ClipPath.java 8 Aug 2005 13:19:34 -0000 1.2
@@ -9,14 +9,13 @@
package org.w3c.css.svgproperties;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssExpression;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.Util;
-import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
import org.w3c.css.values.CssURL;
+import org.w3c.css.values.CssValue;
/**
* <P>
@@ -29,8 +28,8 @@
*/
public class ClipPath extends CssProperty {
-
- CssValue clippath;
+
+ CssValue clippath;
ApplContext ac;
CssIdent none = new CssIdent("none");
@@ -38,107 +37,113 @@
/**
* Create a new ClipPath
*/
- public ClipPath() {
- //nothing to do
- }
-
- /**
- * Create a new ClipPath
- *
- * @param expression The expression for this property
- * @exception InvalidParamException Values are incorrect
- */
- public ClipPath(ApplContext ac, CssExpression expression) throws InvalidParamException {
- this.ac = ac;
- setByUser(); // tell this property is set by the user
- CssValue val = expression.getValue();
- if (val instanceof CssURL) {
- clippath = val;
- expression.next();
- }
- else if (val instanceof CssIdent) {
- if (val.equals(inherit)) {
- clippath = inherit;
- expression.next();
- } else if (val.equals(none)) {
- clippath = none;
- expression.next();
- }
- }
- else {
- throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
- }
- }
-
+ public ClipPath() {
+ //nothing to do
+ }
+
+ /**
+ * Create a new ClipPath
+ *
+ * @param expression The expression for this property
+ * @exception InvalidParamException Values are incorrect
+ */
+ public ClipPath(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+ this.ac = ac;
+ setByUser(); // tell this property is set by the user
+ CssValue val = expression.getValue();
+ if (val instanceof CssURL) {
+ clippath = val;
+ expression.next();
+ }
+ else if (val instanceof CssIdent) {
+ if (val.equals(inherit)) {
+ clippath = inherit;
+ expression.next();
+ } else if (val.equals(none)) {
+ clippath = none;
+ expression.next();
+ }
+ }
+ else {
+ throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
+ }
+ }
+
+ public ClipPath(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Add this property to the CssStyle.
*
* @param style The CssStyle
*/
- public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).clipPath != null)
- style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).clipPath = this;
- }
+ public void addToStyle(ApplContext ac, CssStyle style) {
+ if (((SVGStyle) style).clipPath != null)
+ style.addRedefinitionWarning(ac, this);
+ ((SVGStyle) style).clipPath = 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 ((SVGStyle) style).getClipPath();
- } else {
- return ((SVGStyle) style).clipPath;
- }
+ /**
+ * 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 ((SVGStyle) style).getClipPath();
+ } else {
+ return ((SVGStyle) style).clipPath;
}
+ }
+
+ /**
+ * Compares two properties for equality.
+ *
+ * @param value The other property.
+ */
+ public boolean equals(CssProperty property) {
+ return (property instanceof ClipPath &&
+ clippath.equals( ((ClipPath) property).clippath));
+ }
- /**
- * Compares two properties for equality.
- *
- * @param value The other property.
- */
- public boolean equals(CssProperty property) {
- return (property instanceof ClipPath &&
- clippath.equals( ((ClipPath) property).clippath));
- }
-
/**
* Returns the name of this property
*/
- public String getPropertyName() {
- return "clip-path";
- }
-
+ public String getPropertyName() {
+ return "clip-path";
+ }
+
/**
* Returns the value of this property
*/
- public Object get() {
- return clippath;
- }
-
+ public Object get() {
+ return clippath;
+ }
+
/**
* Returns true if this property is "softly" inherited
*/
- public boolean isSoftlyInherited() {
- return clippath.equals(inherit);
- }
-
- /**
- * Returns a string representation of the object
- */
- public String toString() {
- return clippath.toString();
- }
-
+ public boolean isSoftlyInherited() {
+ return clippath.equals(inherit);
+ }
+
+ /**
+ * Returns a string representation of the object
+ */
+ public String toString() {
+ return clippath.toString();
+ }
+
/**
* Is the value of this property a default value
* It is used by all macro for the function <code>print</code>
*/
- public boolean isDefault() {
- return (clippath == none);
- }
-
+ public boolean isDefault() {
+ return (clippath == none);
+ }
+
}
Index: StrokeWidth.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/svgproperties/StrokeWidth.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- StrokeWidth.java 19 Jul 2002 20:58:01 -0000 1.1
+++ StrokeWidth.java 8 Aug 2005 13:19:34 -0000 1.2
@@ -9,15 +9,13 @@
package org.w3c.css.svgproperties;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssExpression;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.Util;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
import org.w3c.css.properties.CssWidth;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
import org.w3c.css.values.CssNumber;
+import org.w3c.css.values.CssValue;
/**
* <P>
@@ -28,119 +26,124 @@
* <EM>Percentages:</EM>no<BR>
* <EM>Media:</EM>:visual
*/
-
public class StrokeWidth extends CssProperty {
-
+
CssValue value;
ApplContext ac;
-
+
/**
* Create a new Value
*/
- public StrokeWidth() {
- //nothing to do
- }
-
- /**
- * Create a new Value
- *
- * @param expression The expression for this property
- * @exception InvalidParamException Values are incorrect
- */
- public StrokeWidth(ApplContext ac, CssExpression expression) throws InvalidParamException {
- this.ac = ac;
- setByUser(); // tell this property is set by the user
- CssValue val = expression.getValue();
- boolean correct = false;
-
- if (val.equals(inherit)) {
- value = inherit;
- expression.next();
- correct = true;
- } else {
- try {
- CssWidth width = new CssWidth(ac, expression);
- value = val;
- expression.next();
- correct = true;
- } catch (InvalidParamException e) {
- correct = false;
- }
- }
- if (!correct) {
- throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
- }
- }
-
+ public StrokeWidth() {
+ //nothing to do
+ }
+
+ /**
+ * Create a new Value
+ *
+ * @param expression The expression for this property
+ * @exception InvalidParamException Values are incorrect
+ */
+ public StrokeWidth(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+ this.ac = ac;
+ setByUser(); // tell this property is set by the user
+ CssValue val = expression.getValue();
+ boolean correct = false;
+
+ if (val.equals(inherit)) {
+ value = inherit;
+ expression.next();
+ correct = true;
+ } else {
+ try {
+ CssWidth width = new CssWidth(ac, expression);
+ value = val;
+ expression.next();
+ correct = true;
+ } catch (InvalidParamException e) {
+ correct = false;
+ }
+ }
+ if (!correct) {
+ throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
+ }
+ }
+
+ public StrokeWidth(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Add this property to the CssStyle.
*
* @param style The CssStyle
*/
- public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).strokeWidth != null)
- style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).strokeWidth = this;
- }
+ public void addToStyle(ApplContext ac, CssStyle style) {
+ if (((SVGStyle) style).strokeWidth != null)
+ style.addRedefinitionWarning(ac, this);
+ ((SVGStyle) style).strokeWidth = 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 ((SVGStyle) style).getStrokeWidth();
- } else {
- return ((SVGStyle) style).strokeWidth;
- }
+ /**
+ * 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 ((SVGStyle) style).getStrokeWidth();
+ } else {
+ return ((SVGStyle) style).strokeWidth;
}
+ }
+
+ /**
+ * Compares two properties for equality.
+ *
+ * @param value The other property.
+ */
+ public boolean equals(CssProperty property) {
+ return (property instanceof StrokeWidth &&
+ value.equals( ((StrokeWidth) property).value));
+ }
- /**
- * Compares two properties for equality.
- *
- * @param value The other property.
- */
- public boolean equals(CssProperty property) {
- return (property instanceof StrokeWidth &&
- value.equals( ((StrokeWidth) property).value));
- }
-
/**
* Returns the name of this property
*/
- public String getPropertyName() {
- return "stroke-width";
- }
-
+ public String getPropertyName() {
+ return "stroke-width";
+ }
+
/**
* Returns the value of this property
*/
- public Object get() {
- return value;
- }
-
+ public Object get() {
+ return value;
+ }
+
/**
* Returns true if this property is "softly" inherited
*/
- public boolean isSoftlyInherited() {
- return value.equals(inherit);
- }
-
- /**
- * Returns a string representation of the object
- */
- public String toString() {
- return value.toString();
- }
-
+ public boolean isSoftlyInherited() {
+ return value.equals(inherit);
+ }
+
+ /**
+ * Returns a string representation of the object
+ */
+ public String toString() {
+ return value.toString();
+ }
+
/**
* Is the value of this property a default value
* It is used by all macro for the function <code>print</code>
*/
- public boolean isDefault() {
- CssNumber cssnum = new CssNumber(ac, (float) 1.0);
- return value == cssnum;
- }
+ public boolean isDefault() {
+ CssNumber cssnum = new CssNumber(ac, (float) 1.0);
+ return value == cssnum;
+ }
}
Index: Marker.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/svgproperties/Marker.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Marker.java 19 Jul 2002 20:58:01 -0000 1.1
+++ Marker.java 8 Aug 2005 13:19:34 -0000 1.2
@@ -8,15 +8,13 @@
package org.w3c.css.svgproperties;
-import org.w3c.css.values.CssColor;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssExpression;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
import org.w3c.css.values.CssOperator;
+import org.w3c.css.values.CssValue;
/**
* <P>
@@ -31,65 +29,70 @@
public class Marker extends CssProperty
implements CssOperator {
-
+
CssValue value;
MarkerEnd markerEnd;
MarkerMid markerMid;
MarkerStart markerStart;
-
+
/**
* Creates a new Marker
*/
public Marker() {
// nothing to do
}
-
+
/**
* Creates a new Marker
*
* @param expression The expression for this property
* @exception InvalidParamException The expression is incorrect
*/
- public Marker(ApplContext ac, CssExpression expression) throws InvalidParamException {
-
+ public Marker(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+
CssValue val = expression.getValue();
int maxvalues = 3;
boolean correct = true;
char op = SPACE;
-
+
while (correct && (val != null) && (maxvalues-- > 0)) {
-
+
correct = false;
-
+
if (markerStart == null) {
- try {
- markerStart = new MarkerStart(ac, expression);
- correct = true;
- } catch (InvalidParamException e) { }
+ try {
+ markerStart = new MarkerStart(ac, expression);
+ correct = true;
+ } catch (InvalidParamException e) { }
} else if (markerEnd == null) {
- try {
- markerEnd = new MarkerEnd(ac, expression);
- correct = true;
- } catch (InvalidParamException e) { }
+ try {
+ markerEnd = new MarkerEnd(ac, expression);
+ correct = true;
+ } catch (InvalidParamException e) { }
} else if (markerMid == null) {
- try {
- markerMid = new MarkerMid(ac, expression);
- correct = true;
- } catch (InvalidParamException e) { }
+ try {
+ markerMid = new MarkerMid(ac, expression);
+ correct = true;
+ } catch (InvalidParamException e) { }
}
if (!correct) {
- throw new InvalidParamException("value", expression.getValue(),
- getPropertyName(), ac);
+ throw new InvalidParamException("value", expression.getValue(),
+ getPropertyName(), ac);
}
-
+
val = expression.getValue();
op = expression.getOperator();
-
+
}
-
+
}
-
-
+
+ public Marker(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Add this property to the CssStyle
*
@@ -100,7 +103,7 @@
style.addRedefinitionWarning(ac, this);
((SVGStyle) style).marker = this;
}
-
+
/**
* Get this property in the style.
*
@@ -115,63 +118,63 @@
return ((SVGStyle) style).marker;
}
}
-
+
/**
* Compares two properties for equality.
*
* @param value The other property.
*/
public boolean equals(CssProperty property) {
- return false;
+ return false;
}
-
+
/**
* Returns the name of this property
*/
public String getPropertyName() {
- return "marker";
+ return "marker";
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
- return null;
+ return null;
}
-
+
/**
* Returns true if this property is "softly" inherited
*/
// public boolean isSoftlyInherited() {
// return value.equals(inherit);
//}
-
+
/**
* Returns a string representation of the object
*/
public String toString() {
- String ret = "";
-
- if (markerStart != null) {
- if (markerStart.isByUser()) {
- ret += " " + markerStart;
- }
- }
-
- if (markerEnd != null) {
- if (markerEnd.isByUser()) {
- ret += " " + markerEnd;
- }
- }
-
- if (markerMid != null) {
- if (markerMid.isByUser()) {
- ret += " " + markerMid;
- }
- }
-
- return ret.substring(1);
-
+ String ret = "";
+
+ if (markerStart != null) {
+ if (markerStart.isByUser()) {
+ ret += " " + markerStart;
+ }
+ }
+
+ if (markerEnd != null) {
+ if (markerEnd.isByUser()) {
+ ret += " " + markerEnd;
+ }
+ }
+
+ if (markerMid != null) {
+ if (markerMid.isByUser()) {
+ ret += " " + markerMid;
+ }
+ }
+
+ return ret.substring(1);
+
}
-
+
}
Index: FillRule.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/svgproperties/FillRule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FillRule.java 19 Jul 2002 20:58:01 -0000 1.1
+++ FillRule.java 8 Aug 2005 13:19:34 -0000 1.2
@@ -9,13 +9,12 @@
package org.w3c.css.svgproperties;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssExpression;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.Util;
-import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
+import org.w3c.css.values.CssValue;
/**
* <P>
@@ -28,115 +27,121 @@
*/
public class FillRule extends CssProperty {
-
- CssValue fillrule;
+
+ CssValue fillrule;
ApplContext ac;
-
+
CssIdent nonzero = new CssIdent("nonzero");
CssIdent evenodd = new CssIdent("evenodd");
-
+
/**
* Create a new Fillrule
*/
- public FillRule() {
- //nothing to do
- }
-
- /**
- * Create a new Fillrule
- *
- * @param expression The expression for this property
- * @exception InvalidParamException Values are incorrect
- */
- public FillRule(ApplContext ac, CssExpression expression) throws InvalidParamException {
- this.ac = ac;
- setByUser(); // tell this property is set by the user
- CssValue val = expression.getValue();
-
- if (val.equals(inherit)) {
- fillrule = inherit;
- expression.next();
- } else if (val.equals(nonzero)) {
- fillrule = nonzero;
- expression.next();
- } else if (val.equals(evenodd)) {
- fillrule = evenodd;
- expression.next();
- }
- else {
- throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
- }
- }
-
+ public FillRule() {
+ //nothing to do
+ }
+
+ /**
+ * Create a new Fillrule
+ *
+ * @param expression The expression for this property
+ * @exception InvalidParamException Values are incorrect
+ */
+ public FillRule(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+ this.ac = ac;
+ setByUser(); // tell this property is set by the user
+ CssValue val = expression.getValue();
+
+ if (val.equals(inherit)) {
+ fillrule = inherit;
+ expression.next();
+ } else if (val.equals(nonzero)) {
+ fillrule = nonzero;
+ expression.next();
+ } else if (val.equals(evenodd)) {
+ fillrule = evenodd;
+ expression.next();
+ }
+ else {
+ throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
+ }
+ }
+
+ public FillRule(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Add this property to the CssStyle.
*
* @param style The CssStyle
*/
- public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).fillRule != null)
- style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).fillRule = this;
- }
+ public void addToStyle(ApplContext ac, CssStyle style) {
+ if (((SVGStyle) style).fillRule != null)
+ style.addRedefinitionWarning(ac, this);
+ ((SVGStyle) style).fillRule = 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 ((SVGStyle) style).getFillRule();
- } else {
- return ((SVGStyle) style).fillRule;
- }
+ /**
+ * 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 ((SVGStyle) style).getFillRule();
+ } else {
+ return ((SVGStyle) style).fillRule;
}
+ }
+
+ /**
+ * Compares two properties for equality.
+ *
+ * @param value The other property.
+ */
+ public boolean equals(CssProperty property) {
+ return (property instanceof FillRule &&
+ fillrule.equals( ((FillRule) property).fillrule));
+ }
- /**
- * Compares two properties for equality.
- *
- * @param value The other property.
- */
- public boolean equals(CssProperty property) {
- return (property instanceof FillRule &&
- fillrule.equals( ((FillRule) property).fillrule));
- }
-
/**
* Returns the name of this property
*/
- public String getPropertyName() {
- return "fill-rule";
- }
-
+ public String getPropertyName() {
+ return "fill-rule";
+ }
+
/**
* Returns the value of this property
*/
- public Object get() {
- return fillrule;
- }
-
+ public Object get() {
+ return fillrule;
+ }
+
/**
* Returns true if this property is "softly" inherited
*/
- public boolean isSoftlyInherited() {
- return fillrule.equals(inherit);
- }
-
- /**
- * Returns a string representation of the object
- */
- public String toString() {
- return fillrule.toString();
- }
-
+ public boolean isSoftlyInherited() {
+ return fillrule.equals(inherit);
+ }
+
+ /**
+ * Returns a string representation of the object
+ */
+ public String toString() {
+ return fillrule.toString();
+ }
+
/**
* Is the value of this property a default value
* It is used by all macro for the function <code>print</code>
*/
- public boolean isDefault() {
- return (fillrule == nonzero);
- }
-
+ public boolean isDefault() {
+ return (fillrule == nonzero);
+ }
+
}
Index: StrokeDashOffset.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/svgproperties/StrokeDashOffset.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- StrokeDashOffset.java 19 Jul 2002 20:58:01 -0000 1.1
+++ StrokeDashOffset.java 8 Aug 2005 13:19:34 -0000 1.2
@@ -9,14 +9,12 @@
package org.w3c.css.svgproperties;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssLength;
-import org.w3c.css.values.CssNumber;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssLength;
+import org.w3c.css.values.CssValue;
/**
* <H4>
@@ -46,8 +44,8 @@
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
*/
- public StrokeDashOffset(ApplContext ac, CssExpression expression)
- throws InvalidParamException {
+ public StrokeDashOffset(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
setByUser();
CssValue val = expression.getValue();
@@ -65,6 +63,11 @@
}
}
+ public StrokeDashOffset(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Index: StrokeLineCap.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/svgproperties/StrokeLineCap.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- StrokeLineCap.java 19 Jul 2002 20:58:01 -0000 1.1
+++ StrokeLineCap.java 8 Aug 2005 13:19:34 -0000 1.2
@@ -9,12 +9,12 @@
package org.w3c.css.svgproperties;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssExpression;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
+import org.w3c.css.values.CssValue;
/**
* <P>
@@ -49,7 +49,8 @@
* @param expression The expression for this property
* @exception InvalidParamException Incorrect value
*/
- public StrokeLineCap(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public StrokeLineCap(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
setByUser();
CssValue val = expression.getValue();
@@ -68,6 +69,11 @@
}
}
+ public StrokeLineCap(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Add this property to the CssStyle
*
Index: StopOpacity.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/svgproperties/StopOpacity.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- StopOpacity.java 19 Jul 2002 20:58:01 -0000 1.1
+++ StopOpacity.java 8 Aug 2005 13:19:34 -0000 1.2
@@ -9,15 +9,13 @@
package org.w3c.css.svgproperties;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssExpression;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.Util;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
import org.w3c.css.properties3.CssOpacity;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
import org.w3c.css.values.CssNumber;
+import org.w3c.css.values.CssValue;
/**
* <P>
@@ -28,119 +26,124 @@
* <EM>Percentages:</EM>no<BR>
* <EM>Media:</EM>:visual
*/
-
public class StopOpacity extends CssProperty {
-
+
CssValue value;
ApplContext ac;
-
+
/**
* Create a new Value
*/
- public StopOpacity() {
- //nothing to do
- }
-
- /**
- * Create a new Value
- *
- * @param expression The expression for this property
- * @exception InvalidParamException Values are incorrect
- */
- public StopOpacity(ApplContext ac, CssExpression expression) throws InvalidParamException {
- this.ac = ac;
- setByUser(); // tell this property is set by the user
- CssValue val = expression.getValue();
- boolean correct = false;
-
- if (val.equals(inherit)) {
- value = inherit;
- expression.next();
- correct = true;
- } else {
- try {
- CssOpacity opac = new CssOpacity(ac, expression);
- value = val;
- expression.next();
- correct = true;
- } catch (InvalidParamException e) {
- correct = false;
- }
- }
- if (!correct) {
- throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
- }
- }
-
+ public StopOpacity() {
+ //nothing to do
+ }
+
+ /**
+ * Create a new Value
+ *
+ * @param expression The expression for this property
+ * @exception InvalidParamException Values are incorrect
+ */
+ public StopOpacity(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+ this.ac = ac;
+ setByUser(); // tell this property is set by the user
+ CssValue val = expression.getValue();
+ boolean correct = false;
+
+ if (val.equals(inherit)) {
+ value = inherit;
+ expression.next();
+ correct = true;
+ } else {
+ try {
+ CssOpacity opac = new CssOpacity(ac, expression);
+ value = val;
+ expression.next();
+ correct = true;
+ } catch (InvalidParamException e) {
+ correct = false;
+ }
+ }
+ if (!correct) {
+ throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
+ }
+ }
+
+ public StopOpacity(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Add this property to the CssStyle.
*
* @param style The CssStyle
*/
- public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).stopOpacity != null)
- style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).stopOpacity = this;
- }
+ public void addToStyle(ApplContext ac, CssStyle style) {
+ if (((SVGStyle) style).stopOpacity != null)
+ style.addRedefinitionWarning(ac, this);
+ ((SVGStyle) style).stopOpacity = 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 ((SVGStyle) style).getStopOpacity();
- } else {
- return ((SVGStyle) style).stopOpacity;
- }
+ /**
+ * 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 ((SVGStyle) style).getStopOpacity();
+ } else {
+ return ((SVGStyle) style).stopOpacity;
}
+ }
+
+ /**
+ * Compares two properties for equality.
+ *
+ * @param value The other property.
+ */
+ public boolean equals(CssProperty property) {
+ return (property instanceof StopOpacity &&
+ value.equals( ((StopOpacity) property).value));
+ }
- /**
- * Compares two properties for equality.
- *
- * @param value The other property.
- */
- public boolean equals(CssProperty property) {
- return (property instanceof StopOpacity &&
- value.equals( ((StopOpacity) property).value));
- }
-
/**
* Returns the name of this property
*/
- public String getPropertyName() {
- return "stop-opacity";
- }
-
+ public String getPropertyName() {
+ return "stop-opacity";
+ }
+
/**
* Returns the value of this property
*/
- public Object get() {
- return value;
- }
-
+ public Object get() {
+ return value;
+ }
+
/**
* Returns true if this property is "softly" inherited
*/
- public boolean isSoftlyInherited() {
- return value.equals(inherit);
- }
-
- /**
- * Returns a string representation of the object
- */
- public String toString() {
- return value.toString();
- }
-
+ public boolean isSoftlyInherited() {
+ return value.equals(inherit);
+ }
+
+ /**
+ * Returns a string representation of the object
+ */
+ public String toString() {
+ return value.toString();
+ }
+
/**
* Is the value of this property a default value
* It is used by all macro for the function <code>print</code>
*/
- public boolean isDefault() {
- CssNumber cssnum = new CssNumber(ac, (float) 1.0);
- return value == cssnum;
- }
+ public boolean isDefault() {
+ CssNumber cssnum = new CssNumber(ac, (float) 1.0);
+ return value == cssnum;
+ }
}
Index: ColorInterpolation.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/svgproperties/ColorInterpolation.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ColorInterpolation.java 19 Jul 2002 20:58:01 -0000 1.1
+++ ColorInterpolation.java 8 Aug 2005 13:19:34 -0000 1.2
@@ -9,14 +9,12 @@
package org.w3c.css.svgproperties;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssExpression;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.Util;
-import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.ApplContext;
-import org.w3c.css.values.CssURL;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
+import org.w3c.css.values.CssValue;
/**
* <P>
@@ -29,119 +27,126 @@
*/
public class ColorInterpolation extends CssProperty {
-
- CssValue interp;
+
+ CssValue interp;
ApplContext ac;
-
+
CssIdent auto = new CssIdent("auto");
CssIdent sRGB = new CssIdent("sRGB");
CssIdent linearRGB = new CssIdent("linearRGB");
-
+
/**
* Create a new Interp
*/
- public ColorInterpolation() {
- //nothing to do
- }
-
- /**
- * Create a new ColorInterpolation
- *
- * @param expression The expression for this property
- * @exception InvalidParamException Values are incorrect
- */
- public ColorInterpolation(ApplContext ac, CssExpression expression) throws InvalidParamException {
- this.ac = ac;
- setByUser(); // tell this property is set by the user
- CssValue val = expression.getValue();
-
- if (val.equals(inherit)) {
- interp = inherit;
- expression.next();
- } else if (val.equals(sRGB)) {
- interp = sRGB;
- expression.next();
- } else if (val.equals(linearRGB)) {
- interp = linearRGB;
- expression.next();
- } else if (val.equals(auto)) {
- interp = auto;
- expression.next();
- }
- else {
- throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
- }
- }
-
+ public ColorInterpolation() {
+ //nothing to do
+ }
+
+ /**
+ * Create a new ColorInterpolation
+ *
+ * @param expression The expression for this property
+ * @exception InvalidParamException Values are incorrect
+ */
+ public ColorInterpolation(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+ this.ac = ac;
+ setByUser(); // tell this property is set by the user
+ CssValue val = expression.getValue();
+
+ if (val.equals(inherit)) {
+ interp = inherit;
+ expression.next();
+ } else if (val.equals(sRGB)) {
+ interp = sRGB;
+ expression.next();
+ } else if (val.equals(linearRGB)) {
+ interp = linearRGB;
+ expression.next();
+ } else if (val.equals(auto)) {
+ interp = auto;
+ expression.next();
+ }
+ else {
+ throw new InvalidParamException("value", val.toString(),
+ getPropertyName(), ac);
+ }
+ }
+
+ public ColorInterpolation(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Add this property to the CssStyle.
*
* @param style The CssStyle
*/
- public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).colorInterpolation != null)
- style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).colorInterpolation = this;
- }
+ public void addToStyle(ApplContext ac, CssStyle style) {
+ if (((SVGStyle) style).colorInterpolation != null)
+ style.addRedefinitionWarning(ac, this);
+ ((SVGStyle) style).colorInterpolation = 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 ((SVGStyle) style).getColorInterpolation();
- } else {
- return ((SVGStyle) style).colorInterpolation;
- }
+ /**
+ * 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 ((SVGStyle) style).getColorInterpolation();
+ } else {
+ return ((SVGStyle) style).colorInterpolation;
}
+ }
+
+ /**
+ * Compares two properties for equality.
+ *
+ * @param value The other property.
+ */
+ public boolean equals(CssProperty property) {
+ return (property instanceof ColorInterpolation &&
+ interp.equals( ((ColorInterpolation) property).interp));
+ }
- /**
- * Compares two properties for equality.
- *
- * @param value The other property.
- */
- public boolean equals(CssProperty property) {
- return (property instanceof ColorInterpolation &&
- interp.equals( ((ColorInterpolation) property).interp));
- }
-
/**
* Returns the name of this property
*/
- public String getPropertyName() {
- return "color-interpolation";
- }
-
+ public String getPropertyName() {
+ return "color-interpolation";
+ }
+
/**
* Returns the value of this property
*/
- public Object get() {
- return interp;
- }
-
+ public Object get() {
+ return interp;
+ }
+
/**
* Returns true if this property is "softly" inherited
*/
- public boolean isSoftlyInherited() {
- return interp.equals(inherit);
- }
-
- /**
- * Returns a string representation of the object
- */
- public String toString() {
- return interp.toString();
- }
-
+ public boolean isSoftlyInherited() {
+ return interp.equals(inherit);
+ }
+
+ /**
+ * Returns a string representation of the object
+ */
+ public String toString() {
+ return interp.toString();
+ }
+
/**
* Is the value of this property a default value
* It is used by all macro for the function <code>print</code>
*/
- public boolean isDefault() {
- return (interp == sRGB);
- }
-
+ public boolean isDefault() {
+ return (interp == sRGB);
+ }
+
}
Index: StrokeDashArray.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/svgproperties/StrokeDashArray.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- StrokeDashArray.java 19 Jul 2002 20:58:01 -0000 1.1
+++ StrokeDashArray.java 8 Aug 2005 13:19:34 -0000 1.2
@@ -11,14 +11,14 @@
import java.util.Vector;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssExpression;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
import org.w3c.css.values.CssNumber;
import org.w3c.css.values.CssOperator;
+import org.w3c.css.values.CssValue;
/**
@@ -42,7 +42,8 @@
/**
* Create a new StrokeDashArray
*/
- public StrokeDashArray(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public StrokeDashArray(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
//setByUser();
char op = COMMA;
@@ -79,6 +80,11 @@
}
}
+ public StrokeDashArray(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Add this property to the CssStyle.
*
Index: CssRenderIntent.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/svgproperties/CssRenderIntent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CssRenderIntent.java 19 Jul 2002 20:58:01 -0000 1.1
+++ CssRenderIntent.java 8 Aug 2005 13:19:34 -0000 1.2
@@ -8,13 +8,13 @@
package org.w3c.css.svgproperties;
-import org.w3c.css.util.InvalidParamException;
-import org.w3c.css.util.ApplContext;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssValue;
+import org.w3c.css.properties.CssProperty;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
import org.w3c.css.values.CssExpression;
import org.w3c.css.values.CssIdent;
-import org.w3c.css.properties.CssProperty;
+import org.w3c.css.values.CssValue;
/**
* <P>
@@ -29,127 +29,132 @@
* This property permits the specification of a color profile rendering intent other than the default.
* The behavior of values other than auto and inherent are defined by the International Color Consortium standard.
*/
-
- public class CssRenderIntent extends CssProperty {
-
- CssValue renderintent;
-
- static CssIdent auto = new CssIdent("auto");
- static CssIdent abscolorimetric = new CssIdent("absolute-colorimetric");
- static CssIdent relcolorimetric = new CssIdent("relative-colorimetric");
- static CssIdent saturation = new CssIdent("saturation");
- static CssIdent perceptual = new CssIdent("perceptual");
-
- /**
- * Create a new CssRenderIntent
- */
- public CssRenderIntent() {
+public class CssRenderIntent extends CssProperty {
+
+ CssValue renderintent;
+
+ static CssIdent auto = new CssIdent("auto");
+ static CssIdent abscolorimetric = new CssIdent("absolute-colorimetric");
+ static CssIdent relcolorimetric = new CssIdent("relative-colorimetric");
+ static CssIdent saturation = new CssIdent("saturation");
+ static CssIdent perceptual = new CssIdent("perceptual");
+
+ /**
+ * Create a new CssRenderIntent
+ */
+ public CssRenderIntent() {
+ renderintent = auto;
+ }
+
+ /**
+ * Create a new CssRenderIntent
+ *
+ *
+ */
+ public CssRenderIntent(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+ setByUser();
+ CssValue val = expression.getValue();
+ if (val.equals(auto)) {
renderintent = auto;
+ expression.next();
}
-
- /**
- * Create a new CssRenderIntent
- *
- *
- */
- public CssRenderIntent(ApplContext ac, CssExpression expression) throws InvalidParamException {
- setByUser();
- CssValue val = expression.getValue();
- if (val.equals(auto)) {
- renderintent = auto;
- expression.next();
- }
- else if (val.equals(perceptual)) {
- renderintent = perceptual;
- expression.next();
- }
- else if (val.equals(relcolorimetric)) {
- renderintent = relcolorimetric;
- expression.next();
- }
- else if (val.equals(saturation)) {
- renderintent = saturation;
- expression.next();
- }
- else if (val.equals(abscolorimetric)) {
- renderintent = abscolorimetric;
- expression.next();
- }
- else {
- throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
- }
- }
-
- /**
- * Add this property to the CssStyle.
- *
- * @param style The CssStyle
- */
- public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).cssRenderIntent != null)
- style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).cssRenderIntent = 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 ((SVGStyle) style).getRenderIntent();
- } else {
- return ((SVGStyle) style).cssRenderIntent;
- }
- }
-
- /**
- * Compares two properties for equality.
- *
- * @param value The other property.
- */
- public boolean equals(CssProperty property) {
- return (property instanceof CssRenderIntent &&
- renderintent.equals( ((CssRenderIntent) property).renderintent));
+ else if (val.equals(perceptual)) {
+ renderintent = perceptual;
+ expression.next();
}
-
- /**
- * Returns the name of this property
- */
- public String getPropertyName() {
- return "rendering-intent";
+ else if (val.equals(relcolorimetric)) {
+ renderintent = relcolorimetric;
+ expression.next();
}
-
- /**
- * Returns the value of this property
- */
- public Object get() {
- return renderintent;
+ else if (val.equals(saturation)) {
+ renderintent = saturation;
+ expression.next();
}
-
- /**
- * Returns true if this property is "softly" inherited
- */
- public boolean isSoftlyInherited() {
- return renderintent.equals(inherit);
+ else if (val.equals(abscolorimetric)) {
+ renderintent = abscolorimetric;
+ expression.next();
}
-
- /**
- * Returns a string representation of the object
- */
- public String toString() {
- return renderintent.toString();
+ else {
+ throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
}
-
- /**
- * Is the value of this property a default value
- * It is used by all macro for the function <code>print</code>
- */
- public boolean isDefault() {
- return renderintent == auto;
+ }
+
+ public CssRenderIntent(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
+ /**
+ * Add this property to the CssStyle.
+ *
+ * @param style The CssStyle
+ */
+ public void addToStyle(ApplContext ac, CssStyle style) {
+ if (((SVGStyle) style).cssRenderIntent != null)
+ style.addRedefinitionWarning(ac, this);
+ ((SVGStyle) style).cssRenderIntent = 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 ((SVGStyle) style).getRenderIntent();
+ } else {
+ return ((SVGStyle) style).cssRenderIntent;
}
-
}
+
+ /**
+ * Compares two properties for equality.
+ *
+ * @param value The other property.
+ */
+ public boolean equals(CssProperty property) {
+ return (property instanceof CssRenderIntent &&
+ renderintent.equals( ((CssRenderIntent) property).renderintent));
+ }
+
+ /**
+ * Returns the name of this property
+ */
+ public String getPropertyName() {
+ return "rendering-intent";
+ }
+
+ /**
+ * Returns the value of this property
+ */
+ public Object get() {
+ return renderintent;
+ }
+
+ /**
+ * Returns true if this property is "softly" inherited
+ */
+ public boolean isSoftlyInherited() {
+ return renderintent.equals(inherit);
+ }
+
+ /**
+ * Returns a string representation of the object
+ */
+ public String toString() {
+ return renderintent.toString();
+ }
+
+ /**
+ * Is the value of this property a default value
+ * It is used by all macro for the function <code>print</code>
+ */
+ public boolean isDefault() {
+ return renderintent == auto;
+ }
+
+}
Index: ShapeRendering.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/svgproperties/ShapeRendering.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ShapeRendering.java 19 Jul 2002 20:58:01 -0000 1.1
+++ ShapeRendering.java 8 Aug 2005 13:19:34 -0000 1.2
@@ -9,12 +9,12 @@
package org.w3c.css.svgproperties;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssExpression;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
+import org.w3c.css.values.CssValue;
/**
* <P>
@@ -28,33 +28,34 @@
*/
public class ShapeRendering extends CssProperty {
-
+
CssValue value;
-
+
static CssIdent auto = new CssIdent("auto");
-
+
private static String[] values = {
"auto", "optimizeSpeed", "crispEdges", "geometricPrecision", "inherit"
};
-
+
/**
* Create a new ShapeRendering
*/
public ShapeRendering() {
// nothing to do
}
-
+
/**
* Create a new ShapeRendering
*
* @param expression The expression for this property
* @exception InvalidParamException Incorrect value
*/
- public ShapeRendering(ApplContext ac, CssExpression expression) throws InvalidParamException {
-
+ public ShapeRendering(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+
setByUser();
CssValue val = expression.getValue();
-
+
int i = 0;
for (; i < values.length; i++) {
if (val.toString().equals(values[i])) {
@@ -65,10 +66,15 @@
}
if (i == values.length) {
throw new InvalidParamException("value", expression.getValue(),
- getPropertyName(), ac);
+ getPropertyName(), ac);
}
}
-
+
+ public ShapeRendering(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Add this property to the CssStyle
*
@@ -79,7 +85,7 @@
style.addRedefinitionWarning(ac, this);
((SVGStyle) style).shapeRendering = this;
}
-
+
/**
* Get this property in the style.
*
@@ -94,7 +100,7 @@
return ((SVGStyle) style).shapeRendering;
}
}
-
+
/**
* Compares two properties for equality.
*
@@ -111,28 +117,28 @@
public String getPropertyName() {
return "shape-rendering";
}
-
+
/**
* Returns the value of this property
*/
public Object get() {
return value;
}
-
+
/**
* Returns true if this property is "softly" inherited
*/
public boolean isSoftlyInherited() {
return value.equals(inherit);
}
-
+
/**
* Returns a string representation of the object
*/
public String toString() {
return value.toString();
}
-
+
/**
* Is the value of this property a default value
* It is used by alle macro for the function <code>print</code>
@@ -140,5 +146,5 @@
public boolean isDefault() {
return (value == auto);
}
-
+
}
Index: StrokeLinejoin.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/svgproperties/StrokeLinejoin.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- StrokeLinejoin.java 19 Jul 2002 20:58:01 -0000 1.1
+++ StrokeLinejoin.java 8 Aug 2005 13:19:34 -0000 1.2
@@ -9,12 +9,12 @@
package org.w3c.css.svgproperties;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssExpression;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
+import org.w3c.css.values.CssValue;
/**
* <P>
@@ -49,7 +49,8 @@
* @param expression The expression for this property
* @exception InvalidParamException Incorrect value
*/
- public StrokeLinejoin(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public StrokeLinejoin(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
setByUser();
CssValue val = expression.getValue();
@@ -68,6 +69,11 @@
}
}
+ public StrokeLinejoin(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Add this property to the CssStyle
*
Index: Stroke.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/svgproperties/Stroke.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Stroke.java 19 Jul 2002 20:58:01 -0000 1.1
+++ Stroke.java 8 Aug 2005 13:19:34 -0000 1.2
@@ -11,18 +11,17 @@
import java.util.Vector;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssExpression;
+import org.w3c.css.properties.CssColor;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.Util;
-import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.ApplContext;
-import org.w3c.css.properties.CssColor;
-import org.w3c.css.values.CssOperator;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
import org.w3c.css.values.CssFunction;
+import org.w3c.css.values.CssIdent;
import org.w3c.css.values.CssNumber;
+import org.w3c.css.values.CssOperator;
import org.w3c.css.values.CssURL;
+import org.w3c.css.values.CssValue;
/**
* <P>
@@ -33,282 +32,287 @@
* <EM>Percentages:</EM>no<BR>
* <EM>Media:</EM>:visual
*/
-
public class Stroke extends CssProperty implements CssOperator {
-
+
CssValue stroke;
ApplContext ac;
Vector values = new Vector();
CssIdent currentColor = new CssIdent("currentColor");
CssIdent none = new CssIdent("none");
-
+
/**
* Create a new Stroke
*/
- public Stroke() {
- //nothing to do
- }
-
- /**
- * Create a new Stroke
- *
- * @param expression The expression for this property
- * @exception InvalidParamException Values are incorrect
- */
- public Stroke(ApplContext ac, CssExpression expression) throws InvalidParamException {
- this.ac = ac;
- setByUser(); // tell this property is set by the user
- CssValue val = expression.getValue();
- boolean correct = true;
- String errorval = "";
- char op = expression.getOperator();
-
- if (val.equals(inherit)) {
- stroke = inherit;
- expression.next();
- } else if (val.equals(currentColor)) {
- stroke = currentColor;
- expression.next();
- } else if (val.equals(none)) {
- stroke = none;
- expression.next();
- } else {
- try {
- CssColor color = new CssColor(ac, expression);
- values.addElement(val);
- //expression.next();
-
- op = expression.getOperator();
- val = expression.getValue();
-
-
- if (val instanceof CssFunction) { // icc-color(<name>[,<icccolorvalue>]*)]
- CssValue function = val;
- if (!((CssFunction) val).getName().equals("icc-color")) {
- correct = false;
- errorval = val.toString();
- } else {
- CssExpression params = ((CssFunction) val).getParameters();
-
- op = params.getOperator();
- val = params.getValue();
-
- if (!(val instanceof CssIdent)) {
- correct = false;
- errorval = val.toString();
- }
-
- params.next();
- op = params.getOperator();
- val = params.getValue();
-
- if (!params.end()) { // there are more parameters left
- int counter = 0;
-
- while ((op == COMMA || op == SPACE)
- && (counter < (params.getCount() - 1) && correct == true)) {
-
- if ((!(val instanceof CssNumber)) || (((CssNumber) val).getValue() < 0)) {
- correct = false;
- errorval = val.toString();
- }
-
- params.next();
- counter++;
- val = params.getValue();
- op = params.getOperator();
- }
- }
-
- if (correct) {
- params.starts();
- values.addElement(function);
- }
- else {
- correct = false;
- errorval = val.toString();
- }
- }
- }
- } catch (InvalidParamException e) {
- correct = false;
- errorval = val.toString();
- }
-
- if (val instanceof CssURL) {
- values.addElement(val);
- correct = true;
- errorval = null;
-
- expression.next();
- op = expression.getOperator();
- val = expression.getValue();
-
- if (val.equals(none) || val.equals(currentColor)) {
- values.addElement(val);
- expression.next();
- } else {
- //-------------
-
- try {
- CssColor color = new CssColor(ac, expression);
- values.addElement(val);
- //expression.next();
-
- op = expression.getOperator();
- val = expression.getValue();
-
-
- if (val instanceof CssFunction) { // icc-color(<name>[,<icccolorvalue>]*)]
- CssValue function = val;
- if (!((CssFunction) val).getName().equals("icc-color")) {
- correct = false;
- errorval = val.toString();
- } else {
- CssExpression params = ((CssFunction) val).getParameters();
-
- op = params.getOperator();
- val = params.getValue();
-
- if (!(val instanceof CssIdent)) {
- correct = false;
- errorval = val.toString();
- }
-
- params.next();
- op = params.getOperator();
- val = params.getValue();
-
- if (!params.end()) { // there are more parameters left
- int counter = 0;
-
- while ((op == COMMA || op == SPACE)
- && (counter < (params.getCount() - 1) && correct == true)) {
-
- if ((!(val instanceof CssNumber)) || (((CssNumber) val).getValue() < 0)) {
- correct = false;
- errorval = val.toString();
- }
-
- params.next();
- counter++;
- val = params.getValue();
- op = params.getOperator();
- }
- }
-
- if (correct) {
- params.starts();
- values.addElement(function);
- }
- else {
- correct = false;
- errorval = val.toString();
- }
- }
- }
- } catch (InvalidParamException e) {
- correct = false;
- errorval = val.toString();
- }
-
- //-----------------
- }
- } else {
- correct = false;
- errorval = val.toString();
- }
-
- }
-
- expression.next();
-
- if (!correct) {
- throw new InvalidParamException("value", errorval, getPropertyName(), ac);
- }
- }
-
+ public Stroke() {
+ //nothing to do
+ }
+
+ /**
+ * Create a new Stroke
+ *
+ * @param expression The expression for this property
+ * @exception InvalidParamException Values are incorrect
+ */
+ public Stroke(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+ this.ac = ac;
+ setByUser(); // tell this property is set by the user
+ CssValue val = expression.getValue();
+ boolean correct = true;
+ String errorval = "";
+ char op = expression.getOperator();
+
+ if (val.equals(inherit)) {
+ stroke = inherit;
+ expression.next();
+ } else if (val.equals(currentColor)) {
+ stroke = currentColor;
+ expression.next();
+ } else if (val.equals(none)) {
+ stroke = none;
+ expression.next();
+ } else {
+ try {
+ CssColor color = new CssColor(ac, expression);
+ values.addElement(val);
+ //expression.next();
+
+ op = expression.getOperator();
+ val = expression.getValue();
+
+
+ if (val instanceof CssFunction) { // icc-color(<name>[,<icccolorvalue>]*)]
+ CssValue function = val;
+ if (!((CssFunction) val).getName().equals("icc-color")) {
+ correct = false;
+ errorval = val.toString();
+ } else {
+ CssExpression params = ((CssFunction) val).getParameters();
+
+ op = params.getOperator();
+ val = params.getValue();
+
+ if (!(val instanceof CssIdent)) {
+ correct = false;
+ errorval = val.toString();
+ }
+
+ params.next();
+ op = params.getOperator();
+ val = params.getValue();
+
+ if (!params.end()) { // there are more parameters left
+ int counter = 0;
+
+ while ((op == COMMA || op == SPACE)
+ && (counter < (params.getCount() - 1) && correct == true)) {
+
+ if ((!(val instanceof CssNumber)) || (((CssNumber) val).getValue() < 0)) {
+ correct = false;
+ errorval = val.toString();
+ }
+
+ params.next();
+ counter++;
+ val = params.getValue();
+ op = params.getOperator();
+ }
+ }
+
+ if (correct) {
+ params.starts();
+ values.addElement(function);
+ }
+ else {
+ correct = false;
+ errorval = val.toString();
+ }
+ }
+ }
+ } catch (InvalidParamException e) {
+ correct = false;
+ errorval = val.toString();
+ }
+
+ if (val instanceof CssURL) {
+ values.addElement(val);
+ correct = true;
+ errorval = null;
+
+ expression.next();
+ op = expression.getOperator();
+ val = expression.getValue();
+
+ if (val.equals(none) || val.equals(currentColor)) {
+ values.addElement(val);
+ expression.next();
+ } else {
+ //-------------
+
+ try {
+ CssColor color = new CssColor(ac, expression);
+ values.addElement(val);
+ //expression.next();
+
+ op = expression.getOperator();
+ val = expression.getValue();
+
+
+ if (val instanceof CssFunction) { // icc-color(<name>[,<icccolorvalue>]*)]
+ CssValue function = val;
+ if (!((CssFunction) val).getName().equals("icc-color")) {
+ correct = false;
+ errorval = val.toString();
+ } else {
+ CssExpression params = ((CssFunction) val).getParameters();
+
+ op = params.getOperator();
+ val = params.getValue();
+
+ if (!(val instanceof CssIdent)) {
+ correct = false;
+ errorval = val.toString();
+ }
+
+ params.next();
+ op = params.getOperator();
+ val = params.getValue();
+
+ if (!params.end()) { // there are more parameters left
+ int counter = 0;
+
+ while ((op == COMMA || op == SPACE)
+ && (counter < (params.getCount() - 1) && correct == true)) {
+
+ if ((!(val instanceof CssNumber)) || (((CssNumber) val).getValue() < 0)) {
+ correct = false;
+ errorval = val.toString();
+ }
+
+ params.next();
+ counter++;
+ val = params.getValue();
+ op = params.getOperator();
+ }
+ }
+
+ if (correct) {
+ params.starts();
+ values.addElement(function);
+ }
+ else {
+ correct = false;
+ errorval = val.toString();
+ }
+ }
+ }
+ } catch (InvalidParamException e) {
+ correct = false;
+ errorval = val.toString();
+ }
+
+ //-----------------
+ }
+ } else {
+ correct = false;
+ errorval = val.toString();
+ }
+
+ }
+
+ expression.next();
+
+ if (!correct) {
+ throw new InvalidParamException("value", errorval, getPropertyName(), ac);
+ }
+ }
+
+ public Stroke(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Add this property to the CssStyle.
*
* @param style The CssStyle
*/
- public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).stroke != null)
- style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).stroke = this;
- }
+ public void addToStyle(ApplContext ac, CssStyle style) {
+ if (((SVGStyle) style).stroke != null)
+ style.addRedefinitionWarning(ac, this);
+ ((SVGStyle) style).stroke = 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 ((SVGStyle) style).getStroke();
- } else {
- return ((SVGStyle) style).stroke;
- }
+ /**
+ * 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 ((SVGStyle) style).getStroke();
+ } else {
+ return ((SVGStyle) style).stroke;
}
+ }
+
+ /**
+ * Compares two properties for equality.
+ *
+ * @param value The other property.
+ */
+ public boolean equals(CssProperty property) {
+ return (property instanceof Stroke &&
+ stroke.equals( ((Stroke) property).stroke));
+ }
- /**
- * Compares two properties for equality.
- *
- * @param value The other property.
- */
- public boolean equals(CssProperty property) {
- return (property instanceof Stroke &&
- stroke.equals( ((Stroke) property).stroke));
- }
-
/**
* Returns the name of this property
*/
- public String getPropertyName() {
- return "stroke";
- }
-
+ public String getPropertyName() {
+ return "stroke";
+ }
+
/**
* Returns the value of this property
*/
- public Object get() {
- if (stroke != null)
- return stroke;
- else
- return values;
- }
-
+ public Object get() {
+ if (stroke != null)
+ return stroke;
+ else
+ return values;
+ }
+
/**
* Returns true if this property is "softly" inherited
*/
- public boolean isSoftlyInherited() {
- return stroke.equals(inherit);
- }
-
- /**
- * Returns a string representation of the object
- */
- public String toString() {
- if (stroke != null) {
- return stroke.toString();
- } else {
- String ret = "";
- for (int i = 0; i < values.size(); i++) {
- ret += " " + values.elementAt(i).toString();
- }
- return ret;
- }
- }
-
+ public boolean isSoftlyInherited() {
+ return stroke.equals(inherit);
+ }
+
+ /**
+ * Returns a string representation of the object
+ */
+ public String toString() {
+ if (stroke != null) {
+ return stroke.toString();
+ } else {
+ String ret = "";
+ for (int i = 0; i < values.size(); i++) {
+ ret += " " + values.elementAt(i).toString();
+ }
+ return ret;
+ }
+ }
+
/**
* Is the value of this property a default value
* It is used by all macro for the function <code>print</code>
*/
- public boolean isDefault() {
- return stroke == none;
- }
-
+ public boolean isDefault() {
+ return stroke == none;
+ }
+
}
Index: StrokeMiterLimit.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/svgproperties/StrokeMiterLimit.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- StrokeMiterLimit.java 19 Jul 2002 20:58:01 -0000 1.1
+++ StrokeMiterLimit.java 8 Aug 2005 13:19:34 -0000 1.2
@@ -9,14 +9,12 @@
package org.w3c.css.svgproperties;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssExpression;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssLength;
-import org.w3c.css.values.CssNumber;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssNumber;
+import org.w3c.css.values.CssValue;
/**
* <H4>
@@ -46,7 +44,8 @@
* @param expression The expression for this property
* @exception InvalidParamException Values are incorrect
*/
- public StrokeMiterLimit(ApplContext ac, CssExpression expression)
+ public StrokeMiterLimit(ApplContext ac, CssExpression expression,
+ boolean check)
throws InvalidParamException {
setByUser();
@@ -70,6 +69,11 @@
}
}
+ public StrokeMiterLimit(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Returns the value of this property
*/
Index: MarkerStart.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/svgproperties/MarkerStart.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- MarkerStart.java 19 Jul 2002 20:58:01 -0000 1.1
+++ MarkerStart.java 8 Aug 2005 13:19:34 -0000 1.2
@@ -9,14 +9,13 @@
package org.w3c.css.svgproperties;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssExpression;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.Util;
-import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
import org.w3c.css.values.CssURL;
+import org.w3c.css.values.CssValue;
/**
* <P>
@@ -29,116 +28,122 @@
*/
public class MarkerStart extends CssProperty {
-
- CssValue markerStart;
+
+ CssValue markerStart;
ApplContext ac;
-
+
CssIdent none = new CssIdent("none");
-
+
/**
* Create a new MarkerStart
*/
- public MarkerStart() {
- //nothing to do
- }
-
- /**
- * Create a new MarkerStart
- *
- * @param expression The expression for this property
- * @exception InvalidParamException Values are incorrect
- */
- public MarkerStart(ApplContext ac, CssExpression expression) throws InvalidParamException {
- this.ac = ac;
- setByUser(); // tell this property is set by the user
- CssValue val = expression.getValue();
- if (val instanceof CssURL) {
- markerStart = val;
- expression.next();
- }
- else if (val instanceof CssIdent) {
- if (val.equals(inherit)) {
- markerStart = inherit;
- expression.next();
- } else if (val.equals(none)) {
- markerStart = none;
- expression.next();
- }
- }
- else {
- throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
- }
- }
-
+ public MarkerStart() {
+ //nothing to do
+ }
+
+ /**
+ * Create a new MarkerStart
+ *
+ * @param expression The expression for this property
+ * @exception InvalidParamException Values are incorrect
+ */
+ public MarkerStart(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+ this.ac = ac;
+ setByUser(); // tell this property is set by the user
+ CssValue val = expression.getValue();
+ if (val instanceof CssURL) {
+ markerStart = val;
+ expression.next();
+ }
+ else if (val instanceof CssIdent) {
+ if (val.equals(inherit)) {
+ markerStart = inherit;
+ expression.next();
+ } else if (val.equals(none)) {
+ markerStart = none;
+ expression.next();
+ }
+ }
+ else {
+ throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
+ }
+ }
+
+ public MarkerStart(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Add this property to the CssStyle.
*
* @param style The CssStyle
*/
- public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).markerStart != null)
- style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).markerStart = 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 ((SVGStyle) style).getMarkerStart();
- } else {
- return ((SVGStyle) style).markerStart;
- }
+ public void addToStyle(ApplContext ac, CssStyle style) {
+ if (((SVGStyle) style).markerStart != null)
+ style.addRedefinitionWarning(ac, this);
+ ((SVGStyle) style).markerStart = 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 ((SVGStyle) style).getMarkerStart();
+ } else {
+ return ((SVGStyle) style).markerStart;
}
-
- /**
- * Compares two properties for equality.
- *
- * @param value The other property.
- */
- public boolean equals(CssProperty property) {
- return (property instanceof MarkerStart &&
- markerStart.equals( ((MarkerStart) property).markerStart));
- }
-
+ }
+
+ /**
+ * Compares two properties for equality.
+ *
+ * @param value The other property.
+ */
+ public boolean equals(CssProperty property) {
+ return (property instanceof MarkerStart &&
+ markerStart.equals( ((MarkerStart) property).markerStart));
+ }
+
/**
* Returns the name of this property
*/
- public String getPropertyName() {
- return "marker-start";
- }
-
+ public String getPropertyName() {
+ return "marker-start";
+ }
+
/**
* Returns the value of this property
*/
- public Object get() {
- return markerStart;
- }
-
+ public Object get() {
+ return markerStart;
+ }
+
/**
* Returns true if this property is "softly" inherited
*/
- public boolean isSoftlyInherited() {
- return markerStart.equals(inherit);
- }
-
- /**
- * Returns a string representation of the object
- */
- public String toString() {
- return markerStart.toString();
- }
-
+ public boolean isSoftlyInherited() {
+ return markerStart.equals(inherit);
+ }
+
+ /**
+ * Returns a string representation of the object
+ */
+ public String toString() {
+ return markerStart.toString();
+ }
+
/**
* Is the value of this property a default value
* It is used by all macro for the function <code>print</code>
*/
- public boolean isDefault() {
- return (markerStart == none);
- }
-
+ public boolean isDefault() {
+ return (markerStart == none);
+ }
+
}
Index: FloodOpacity.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/svgproperties/FloodOpacity.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FloodOpacity.java 19 Jul 2002 20:58:01 -0000 1.1
+++ FloodOpacity.java 8 Aug 2005 13:19:34 -0000 1.2
@@ -9,14 +9,14 @@
package org.w3c.css.svgproperties;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssExpression;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.Util;
-import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.util.Util;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
import org.w3c.css.values.CssNumber;
+import org.w3c.css.values.CssValue;
/**
* <P>
@@ -29,128 +29,135 @@
*/
public class FloodOpacity extends CssProperty {
-
- CssValue opaclevel;
+
+ CssValue opaclevel;
ApplContext ac;
-
+
/**
* Create a new FloodOpacity
*/
- public FloodOpacity() {
- CssNumber cssnum = new CssNumber((float) 1.0);
- opaclevel = cssnum;
- }
-
- /**
- * Create a new FloodOpacity
- *
- * @param expression The expression for this property
- * @exception InvalidParamException Values are incorrect
- */
- public FloodOpacity(ApplContext ac, CssExpression expression) throws InvalidParamException {
- this.ac = ac;
- setByUser(); // tell this property is set by the user
- CssValue val = expression.getValue();
- if (val instanceof CssNumber) {
-
- CssNumber cssnum = new CssNumber(clampedValue(ac, ((CssNumber) val).getValue()));
- opaclevel = cssnum;
- expression.next();
- }
- else if (val instanceof CssIdent) {
- if (val.equals(inherit)) {
- opaclevel = inherit;
- expression.next();
- }
- }
- else {
- throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
- }
- }
+ public FloodOpacity() {
+ CssNumber cssnum = new CssNumber((float) 1.0);
+ opaclevel = cssnum;
+ }
+
+ /**
+ * Create a new FloodOpacity
+ *
+ * @param expression The expression for this property
+ * @exception InvalidParamException Values are incorrect
+ */
+ public FloodOpacity(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+ this.ac = ac;
+ setByUser(); // tell this property is set by the user
+ CssValue val = expression.getValue();
+ if (val instanceof CssNumber) {
+
+ CssNumber cssnum = new CssNumber(clampedValue(ac, ((CssNumber) val).getValue()));
+ opaclevel = cssnum;
+ expression.next();
+ }
+ else if (val instanceof CssIdent) {
+ if (val.equals(inherit)) {
+ opaclevel = inherit;
+ expression.next();
+ }
+ }
+ else {
+ throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
+ }
+ }
+
+ public FloodOpacity(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Brings all values back between 0 and 1
*
* @param opac The value to be modified if necessary
*/
- private float clampedValue(ApplContext ac, float opac) {
- if (opac < 0 || opac > 1) {
- ac.getFrame().addWarning("out-of-range", Util.displayFloat(opac));
- return ((opac<0)?0:1);
- }
- else return(opac);
- }
-
+ private float clampedValue(ApplContext ac, float opac) {
+ if (opac < 0 || opac > 1) {
+ ac.getFrame().addWarning("out-of-range", Util.displayFloat(opac));
+ return ((opac<0)?0:1);
+ }
+ else return(opac);
+ }
+
/**
* Add this property to the CssStyle.
*
* @param style The CssStyle
*/
- public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).floodOpacity != null)
- style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).floodOpacity = this;
- }
+ public void addToStyle(ApplContext ac, CssStyle style) {
+ if (((SVGStyle) style).floodOpacity != null)
+ style.addRedefinitionWarning(ac, this);
+ ((SVGStyle) style).floodOpacity = 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 ((SVGStyle) style).getFloodOpacity();
- } else {
- return ((SVGStyle) style).floodOpacity;
- }
+ /**
+ * 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 ((SVGStyle) style).getFloodOpacity();
+ } else {
+ return ((SVGStyle) style).floodOpacity;
}
+ }
+
+ /**
+ * Compares two properties for equality.
+ *
+ * @param value The other property.
+ */
+ public boolean equals(CssProperty property) {
+ return (property instanceof FloodOpacity &&
+ opaclevel.equals( ((FloodOpacity) property).opaclevel));
+ }
- /**
- * Compares two properties for equality.
- *
- * @param value The other property.
- */
- public boolean equals(CssProperty property) {
- return (property instanceof FloodOpacity &&
- opaclevel.equals( ((FloodOpacity) property).opaclevel));
- }
-
/**
* Returns the name of this property
*/
- public String getPropertyName() {
- return "flood-opacity";
- }
-
+ public String getPropertyName() {
+ return "flood-opacity";
+ }
+
/**
* Returns the value of this property
*/
- public Object get() {
- return opaclevel;
- }
-
+ public Object get() {
+ return opaclevel;
+ }
+
/**
* Returns true if this property is "softly" inherited
*/
- public boolean isSoftlyInherited() {
- return opaclevel.equals(inherit);
- }
-
- /**
- * Returns a string representation of the object
- */
- public String toString() {
- return opaclevel.toString();
- }
-
+ public boolean isSoftlyInherited() {
+ return opaclevel.equals(inherit);
+ }
+
+ /**
+ * Returns a string representation of the object
+ */
+ public String toString() {
+ return opaclevel.toString();
+ }
+
/**
* Is the value of this property a default value
* It is used by all macro for the function <code>print</code>
*/
- public boolean isDefault() {
- CssNumber cssnum = new CssNumber(ac, (float) 1.0);
- return opaclevel == cssnum;
- }
-
+ public boolean isDefault() {
+ CssNumber cssnum = new CssNumber(ac, (float) 1.0);
+ return opaclevel == cssnum;
+ }
+
}
Index: ColorRendering.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/svgproperties/ColorRendering.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ColorRendering.java 19 Jul 2002 20:58:01 -0000 1.1
+++ ColorRendering.java 8 Aug 2005 13:19:34 -0000 1.2
@@ -9,14 +9,12 @@
package org.w3c.css.svgproperties;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssExpression;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.Util;
-import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.ApplContext;
-import org.w3c.css.values.CssURL;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
+import org.w3c.css.values.CssValue;
/**
* <P>
@@ -29,119 +27,125 @@
*/
public class ColorRendering extends CssProperty {
-
+
CssValue rendering;
ApplContext ac;
-
+
CssIdent auto = new CssIdent("auto");
CssIdent optimizeSpeed = new CssIdent("optimizeSpeed");
CssIdent optimizeQuality = new CssIdent("optimizeQuality");
-
+
/**
* Create a new Rendering
*/
- public ColorRendering() {
- //nothing to do
- }
-
- /**
- * Create a new ColorRendering
- *
- * @param expression The expression for this property
- * @exception InvalidParamException Values are incorrect
- */
- public ColorRendering(ApplContext ac, CssExpression expression) throws InvalidParamException {
- this.ac = ac;
- setByUser(); // tell this property is set by the user
- CssValue val = expression.getValue();
-
- if (val.equals(inherit)) {
- rendering = inherit;
- expression.next();
- } else if (val.equals(optimizeSpeed)) {
- rendering = val;
- expression.next();
- } else if (val.equals(optimizeQuality)) {
- rendering = val;
- expression.next();
- } else if (val.equals(auto)) {
- rendering = auto;
- expression.next();
- }
- else {
- throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
- }
- }
-
+ public ColorRendering() {
+ //nothing to do
+ }
+
+ /**
+ * Create a new ColorRendering
+ *
+ * @param expression The expression for this property
+ * @exception InvalidParamException Values are incorrect
+ */
+ public ColorRendering(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
+ this.ac = ac;
+ setByUser(); // tell this property is set by the user
+ CssValue val = expression.getValue();
+
+ if (val.equals(inherit)) {
+ rendering = inherit;
+ expression.next();
+ } else if (val.equals(optimizeSpeed)) {
+ rendering = val;
+ expression.next();
+ } else if (val.equals(optimizeQuality)) {
+ rendering = val;
+ expression.next();
+ } else if (val.equals(auto)) {
+ rendering = auto;
+ expression.next();
+ }
+ else {
+ throw new InvalidParamException("value", val.toString(), getPropertyName(), ac);
+ }
+ }
+
+ public ColorRendering(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Add this property to the CssStyle.
*
* @param style The CssStyle
*/
- public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).colorRendering != null)
- style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).colorRendering = this;
- }
+ public void addToStyle(ApplContext ac, CssStyle style) {
+ if (((SVGStyle) style).colorRendering != null)
+ style.addRedefinitionWarning(ac, this);
+ ((SVGStyle) style).colorRendering = 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 ((SVGStyle) style).getColorRendering();
- } else {
- return ((SVGStyle) style).colorRendering;
- }
+ /**
+ * 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 ((SVGStyle) style).getColorRendering();
+ } else {
+ return ((SVGStyle) style).colorRendering;
}
+ }
+
+ /**
+ * Compares two properties for equality.
+ *
+ * @param value The other property.
+ */
+ public boolean equals(CssProperty property) {
+ return (property instanceof ColorRendering &&
+ rendering.equals( ((ColorRendering) property).rendering));
+ }
- /**
- * Compares two properties for equality.
- *
- * @param value The other property.
- */
- public boolean equals(CssProperty property) {
- return (property instanceof ColorRendering &&
- rendering.equals( ((ColorRendering) property).rendering));
- }
-
/**
* Returns the name of this property
*/
- public String getPropertyName() {
- return "color-rendering";
- }
-
+ public String getPropertyName() {
+ return "color-rendering";
+ }
+
/**
* Returns the value of this property
*/
- public Object get() {
- return rendering;
- }
-
+ public Object get() {
+ return rendering;
+ }
+
/**
* Returns true if this property is "softly" inherited
*/
- public boolean isSoftlyInherited() {
- return rendering.equals(inherit);
- }
-
- /**
- * Returns a string representation of the object
- */
- public String toString() {
- return rendering.toString();
- }
-
+ public boolean isSoftlyInherited() {
+ return rendering.equals(inherit);
+ }
+
+ /**
+ * Returns a string representation of the object
+ */
+ public String toString() {
+ return rendering.toString();
+ }
+
/**
* Is the value of this property a default value
* It is used by all macro for the function <code>print</code>
*/
- public boolean isDefault() {
- return (rendering == auto);
- }
-
+ public boolean isDefault() {
+ return (rendering == auto);
+ }
+
}
Index: TextRendering.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/svgproperties/TextRendering.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- TextRendering.java 19 Jul 2002 20:58:01 -0000 1.1
+++ TextRendering.java 8 Aug 2005 13:19:34 -0000 1.2
@@ -9,12 +9,12 @@
package org.w3c.css.svgproperties;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssExpression;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
+import org.w3c.css.values.CssValue;
/**
* <P>
@@ -50,7 +50,8 @@
* @param expression The expression for this property
* @exception InvalidParamException Incorrect value
*/
- public TextRendering(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public TextRendering(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
setByUser();
CssValue val = expression.getValue();
@@ -69,6 +70,11 @@
}
}
+ public TextRendering(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Add this property to the CssStyle
*
Index: TextAnchor.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/svgproperties/TextAnchor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- TextAnchor.java 19 Jul 2002 20:58:01 -0000 1.1
+++ TextAnchor.java 8 Aug 2005 13:19:34 -0000 1.2
@@ -9,12 +9,12 @@
package org.w3c.css.svgproperties;
import org.w3c.css.parser.CssStyle;
-import org.w3c.css.values.CssIdent;
-import org.w3c.css.values.CssValue;
-import org.w3c.css.values.CssExpression;
import org.w3c.css.properties.CssProperty;
-import org.w3c.css.util.InvalidParamException;
import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+import org.w3c.css.values.CssExpression;
+import org.w3c.css.values.CssIdent;
+import org.w3c.css.values.CssValue;
/**
* <P>
@@ -49,7 +49,8 @@
* @param expression The expression for this property
* @exception InvalidParamException Incorrect value
*/
- public TextAnchor(ApplContext ac, CssExpression expression) throws InvalidParamException {
+ public TextAnchor(ApplContext ac, CssExpression expression,
+ boolean check) throws InvalidParamException {
setByUser();
CssValue val = expression.getValue();
@@ -68,6 +69,11 @@
}
}
+ public TextAnchor(ApplContext ac, CssExpression expression)
+ throws InvalidParamException {
+ this(ac, expression, false);
+ }
+
/**
* Add this property to the CssStyle
*
Received on Monday, 8 August 2005 13:21:01 UTC