- From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
- Date: Mon, 07 Apr 2008 14:16:26 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/properties/svg
In directory hutz:/tmp/cvs-serv28353
Modified Files:
AlignmentBaseline.java ClipPath.java ClipRule.java
ColorInterpolation.java ColorInterpolationFilters.java
ColorProfile.java ColorRendering.java DominantBaseLine.java
EnableBackground.java Fill.java FillOpacity.java FillRule.java
Filter.java FloodColor.java FloodOpacity.java
ImageRendering.java Kerning.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 the inheritance of SVG styles was from the biggest to the tiniest
instead of the opposite, now done the right way. All the properties
apprearing in the different profile now cast the profile to the right one
before performing addToStyle or GetPropertyInStyle.
Also some styles were doing wrong casts from one property to another, thanks
to unwanted copy/paste (and those copy/paste were removed, as inheritance
is now done the right way)
Note that I didn't take the time to clean up the property classes, as they
are not used often...
Index: DominantBaseLine.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/svg/DominantBaseLine.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- DominantBaseLine.java 14 Sep 2005 15:15:27 -0000 1.2
+++ DominantBaseLine.java 7 Apr 2008 14:16:23 -0000 1.3
@@ -93,9 +93,9 @@
* @param style The CssStyle
*/
public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).dominantBaseLine != null)
+ if (((SVGBasicStyle) style).dominantBaseLine != null)
style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).dominantBaseLine = this;
+ ((SVGBasicStyle) style).dominantBaseLine = this;
}
/**
@@ -106,10 +106,10 @@
*/
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
- return ((SVGStyle) style).getDominantBaseLineSVG();
+ return ((SVGBasicStyle) style).getDominantBaseLineSVG();
}
else {
- return ((SVGStyle) style).dominantBaseLine;
+ return ((SVGBasicStyle) style).dominantBaseLine;
}
}
Index: ImageRendering.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/svg/ImageRendering.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ImageRendering.java 14 Sep 2005 15:15:27 -0000 1.2
+++ ImageRendering.java 7 Apr 2008 14:16:23 -0000 1.3
@@ -83,9 +83,9 @@
* @param style The CssStyle
*/
public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).imageRendering != null)
+ if (((SVGBasicStyle) style).imageRendering != null)
style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).imageRendering = this;
+ ((SVGBasicStyle) style).imageRendering = this;
}
/**
@@ -96,9 +96,9 @@
*/
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
- return ((SVGStyle) style).getImageRendering();
+ return ((SVGBasicStyle) style).getImageRendering();
} else {
- return ((SVGStyle) style).imageRendering;
+ return ((SVGBasicStyle) style).imageRendering;
}
}
Index: ColorProfile.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/svg/ColorProfile.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ColorProfile.java 14 Sep 2005 15:15:27 -0000 1.2
+++ ColorProfile.java 7 Apr 2008 14:16:23 -0000 1.3
@@ -119,9 +119,9 @@
* @param style The CssStyle
*/
public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).colorProfile != null)
+ if (((SVGBasicStyle) style).colorProfile != null)
style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).colorProfile = this;
+ ((SVGBasicStyle) style).colorProfile = this;
}
@@ -133,9 +133,9 @@
*/
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
- return ((SVGStyle) style).getColorProfileSVG();
+ return ((SVGBasicStyle) style).getColorProfileSVG();
} else {
- return ((SVGStyle) style).colorProfile;
+ return ((SVGBasicStyle) style).colorProfile;
}
}
Index: Filter.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/svg/Filter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Filter.java 14 Sep 2005 15:15:27 -0000 1.2
+++ Filter.java 7 Apr 2008 14:16:23 -0000 1.3
@@ -81,9 +81,9 @@
* @param style The CssStyle
*/
public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).filter != null)
+ if (((SVGBasicStyle) style).filter != null)
style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).filter = this;
+ ((SVGBasicStyle) style).filter = this;
}
/**
@@ -94,9 +94,9 @@
*/
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
- return ((SVGStyle) style).getFilter();
+ return ((SVGBasicStyle) style).getFilter();
} else {
- return ((SVGStyle) style).filter;
+ return ((SVGBasicStyle) style).filter;
}
}
Index: ClipRule.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/svg/ClipRule.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ClipRule.java 14 Sep 2005 15:15:27 -0000 1.2
+++ ClipRule.java 7 Apr 2008 14:16:23 -0000 1.3
@@ -79,9 +79,9 @@
* @param style The CssStyle
*/
public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).clipRule != null)
+ if (((SVGBasicStyle) style).clipRule != null)
style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).clipRule = this;
+ ((SVGBasicStyle) style).clipRule = this;
}
/**
@@ -92,9 +92,9 @@
*/
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
- return ((SVGStyle) style).getClipRule();
+ return ((SVGBasicStyle) style).getClipRule();
} else {
- return ((SVGStyle) style).clipRule;
+ return ((SVGBasicStyle) style).clipRule;
}
}
Index: StrokeOpacity.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/svg/StrokeOpacity.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- StrokeOpacity.java 14 Sep 2005 15:15:27 -0000 1.2
+++ StrokeOpacity.java 7 Apr 2008 14:16:24 -0000 1.3
@@ -82,9 +82,9 @@
* @param style The CssStyle
*/
public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).strokeOpacity != null)
+ if (((SVGBasicStyle) style).strokeOpacity != null)
style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).strokeOpacity = this;
+ ((SVGBasicStyle) style).strokeOpacity = this;
}
/**
@@ -95,9 +95,9 @@
*/
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
- return ((SVGStyle) style).getStrokeOpacity();
+ return ((SVGBasicStyle) style).getStrokeOpacity();
} else {
- return ((SVGStyle) style).strokeOpacity;
+ return ((SVGBasicStyle) style).strokeOpacity;
}
}
Index: Kerning.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/svg/Kerning.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Kerning.java 14 Sep 2005 15:15:27 -0000 1.2
+++ Kerning.java 7 Apr 2008 14:16:23 -0000 1.3
@@ -109,7 +109,7 @@
* @param style The CssStyle
*/
public void addToStyle(ApplContext ac, CssStyle style) {
- SVGStyle style0 = (SVGStyle) style;
+ SVGBasicStyle style0 = (SVGBasicStyle) style;
if (style0.kerning != null)
style0.addRedefinitionWarning(ac, this);
style0.kerning = this;
@@ -123,9 +123,9 @@
*/
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
- return ((SVGStyle) style).getKerning();
+ return ((SVGBasicStyle) style).getKerning();
} else {
- return ((SVGStyle) style).kerning;
+ return ((SVGBasicStyle) style).kerning;
}
}
Index: SVGBasicStyle.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/svg/SVGBasicStyle.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- SVGBasicStyle.java 23 Aug 2005 16:25:02 -0000 1.1
+++ SVGBasicStyle.java 7 Apr 2008 14:16:24 -0000 1.2
@@ -10,7 +10,7 @@
import org.w3c.css.parser.CssPrinterStyle;
-public class SVGBasicStyle extends org.w3c.css.properties.css3.Css3Style {
+public class SVGBasicStyle extends SVGTinyStyle {
AlignmentBaseline alignmentBaseline;
ClipPath clipPath;
@@ -22,7 +22,6 @@
WritingModeSVG writingModeSVG;
FloodOpacity floodOpacity;
Filter filter;
- FillRule fillRule;
FillOpacity fillOpacity;
ImageRendering imageRendering;
Mask mask;
@@ -32,27 +31,19 @@
ShapeRendering shapeRendering;
TextRendering textRendering;
TextAnchor textAnchor;
- StrokeLinejoin strokeLinejoin;
- StrokeLineCap strokeLineCap;
- StrokeMiterLimit strokeMiterLimit;
StrokeOpacity strokeOpacity;
- StrokeWidth strokeWidth;
- StrokeDashOffset strokeDashOffset;
- StrokeDashArray strokeDashArray;
StopColor stopColor;
SolidColor solidColor;
FloodColor floodColor;
- Stroke stroke;
ColorProfile colorProfile;
- DominantBaseLine dominantBaseLine;
- SolidOpacity solidOpacity;
- Fill fill;
+ DominantBaseLine dominantBaseLine;
+ SolidOpacity solidOpacity;
public AlignmentBaseline getAlignmentBaseline() {
if (alignmentBaseline == null) {
alignmentBaseline =
(AlignmentBaseline) style.CascadingOrder (
- new AlignmentBaseline(), style, selector);
+ new AlignmentBaseline(), style, selector);
}
return alignmentBaseline;
}
@@ -61,7 +52,7 @@
if (dominantBaseLine == null) {
dominantBaseLine =
(DominantBaseLine) style.CascadingOrder (
- new DominantBaseLine(), style, selector);
+ new DominantBaseLine(), style, selector);
}
return dominantBaseLine;
}
@@ -70,7 +61,7 @@
if (clipPath == null) {
clipPath =
(ClipPath) style.CascadingOrder (
- new ClipPath(), style, selector);
+ new ClipPath(), style, selector);
}
return clipPath;
}
@@ -79,7 +70,7 @@
if (clipRule == null) {
clipRule =
(ClipRule) style.CascadingOrder (
- new ClipRule(), style, selector);
+ new ClipRule(), style, selector);
}
return clipRule;
}
@@ -88,7 +79,7 @@
if (colorInterpolation == null) {
colorInterpolation =
(ColorInterpolation) style.CascadingOrder (
- new ColorInterpolation(), style, selector);
+ new ColorInterpolation(), style, selector);
}
return colorInterpolation;
}
@@ -97,7 +88,7 @@
if (colorInterpolationFilters == null) {
colorInterpolationFilters =
(ColorInterpolationFilters) style.CascadingOrder (
- new ColorInterpolationFilters(), style, selector);
+ new ColorInterpolationFilters(), style, selector);
}
return colorInterpolationFilters;
}
@@ -106,7 +97,7 @@
if (colorRendering == null) {
colorRendering =
(ColorRendering) style.CascadingOrder (
- new ColorRendering(), style, selector);
+ new ColorRendering(), style, selector);
}
return colorRendering;
}
@@ -115,7 +106,7 @@
if (enableBackground == null) {
enableBackground =
(EnableBackground) style.CascadingOrder (
- new EnableBackground(), style, selector);
+ new EnableBackground(), style, selector);
}
return enableBackground;
}
@@ -124,7 +115,7 @@
if (writingModeSVG == null) {
writingModeSVG =
(WritingModeSVG) style.CascadingOrder (
- new WritingModeSVG(), style, selector);
+ new WritingModeSVG(), style, selector);
}
return writingModeSVG;
}
@@ -133,7 +124,7 @@
if (floodOpacity == null) {
floodOpacity =
(FloodOpacity) style.CascadingOrder (
- new FloodOpacity(), style, selector);
+ new FloodOpacity(), style, selector);
}
return floodOpacity;
}
@@ -142,25 +133,16 @@
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);
- }
- return fillRule;
- }
-
public FillOpacity getFillOpacity() {
if (fillOpacity == null) {
fillOpacity =
(FillOpacity) style.CascadingOrder (
- new FillOpacity(), style, selector);
+ new FillOpacity(), style, selector);
}
return fillOpacity;
}
@@ -169,7 +151,7 @@
if (imageRendering == null) {
imageRendering =
(ImageRendering) style.CascadingOrder (
- new ImageRendering(), style, selector);
+ new ImageRendering(), style, selector);
}
return imageRendering;
}
@@ -178,7 +160,7 @@
if (mask == null) {
mask =
(Mask) style.CascadingOrder (
- new ImageRendering(), style, selector);
+ new ImageRendering(), style, selector);
}
return mask;
}
@@ -187,7 +169,7 @@
if (stopOpacity == null) {
stopOpacity =
(StopOpacity) style.CascadingOrder (
- new StopOpacity(), style, selector);
+ new StopOpacity(), style, selector);
}
return stopOpacity;
}
@@ -196,7 +178,7 @@
if (kerning == null) {
kerning =
(Kerning) style.CascadingOrder (
- new Kerning(), style, selector);
+ new Kerning(), style, selector);
}
return kerning;
}
@@ -205,7 +187,7 @@
if (pointerEvents == null) {
pointerEvents =
(PointerEvents) style.CascadingOrder (
- new PointerEvents(), style, selector);
+ new PointerEvents(), style, selector);
}
return pointerEvents;
}
@@ -214,7 +196,7 @@
if (shapeRendering == null) {
shapeRendering =
(ShapeRendering) style.CascadingOrder (
- new ShapeRendering(), style, selector);
+ new ShapeRendering(), style, selector);
}
return shapeRendering;
}
@@ -223,7 +205,7 @@
if (textRendering == null) {
textRendering =
(TextRendering) style.CascadingOrder (
- new TextRendering(), style, selector);
+ new TextRendering(), style, selector);
}
return textRendering;
}
@@ -232,79 +214,25 @@
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);
- }
- return strokeLinejoin;
- }
-
- public StrokeLineCap getStrokeLineCap() {
- 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;
- }
-
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);
- }
- return strokeWidth;
- }
-
- public StrokeDashOffset getStrokeDashOffset() {
- 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;
- }
-
public StopColor getStopColor() {
if (stopColor == null) {
stopColor =
(StopColor) style.CascadingOrder (
- new StopColor(), style, selector);
+ new StopColor(), style, selector);
}
return stopColor;
}
@@ -313,7 +241,7 @@
if (solidColor == null) {
solidColor =
(SolidColor) style.CascadingOrder (
- new SolidColor(), style, selector);
+ new SolidColor(), style, selector);
}
return solidColor;
}
@@ -322,7 +250,7 @@
if (floodColor == null) {
floodColor =
(FloodColor) style.CascadingOrder (
- new FloodColor(), style, selector);
+ new FloodColor(), style, selector);
}
return floodColor;
}
@@ -331,38 +259,20 @@
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);
+ public SolidOpacity getSolidOpacity() {
+ if (solidOpacity == null) {
+ solidOpacity =
+ (SolidOpacity) style.CascadingOrder (
+ new SolidOpacity(), style, selector);
}
- return stroke;
+ return solidOpacity;
}
-
- public SolidOpacity getSolidOpacity() {
- if (solidOpacity == null) {
- solidOpacity =
- (SolidOpacity) style.CascadingOrder (
- new SolidOpacity(), style, selector);
- }
- return solidOpacity;
- }
-
- public Fill getFill() {
- if (fill == null) {
- fill =
- (Fill) style.CascadingOrder (
- new Fill(), style, selector);
- }
- return fill;
- }
-
+
/**
* Print this style
*
@@ -375,7 +285,7 @@
alignmentBaseline.print(printer);
}
if (dominantBaseLine != null) {
- dominantBaseLine.print(printer);
+ dominantBaseLine.print(printer);
}
if (clipPath != null) {
clipPath.print(printer);
@@ -386,6 +296,9 @@
if (colorInterpolation != null) {
colorInterpolation.print(printer);
}
+ if (colorInterpolationFilters != null) {
+ colorInterpolationFilters.print(printer);
+ }
if (colorRendering != null) {
colorRendering.print(printer);
}
@@ -401,9 +314,6 @@
if (filter != null) {
filter.print(printer);
}
- if (fillRule != null) {
- fillRule.print(printer);
- }
if (fillOpacity != null) {
fillOpacity.print(printer);
}
@@ -431,56 +341,23 @@
if (textAnchor != null) {
textAnchor.print(printer);
}
- if (strokeLinejoin != null) {
- strokeLinejoin.print(printer);
- }
- if (strokeLineCap != null) {
- strokeLineCap.print(printer);
- }
- if (strokeMiterLimit != null) {
- strokeMiterLimit.print(printer);
- }
if (strokeOpacity != null) {
strokeOpacity.print(printer);
}
- if (strokeWidth != null) {
- strokeWidth.print(printer);
- }
- if (strokeDashOffset != null) {
- strokeDashOffset.print(printer);
- }
- if (strokeDashArray != null) {
- strokeDashArray.print(printer);
- }
if (stopColor != null) {
stopColor.print(printer);
}
if (solidColor != null) {
- solidColor.print(printer);
+ solidColor.print(printer);
}
if (floodColor != null) {
floodColor.print(printer);
}
- if (stroke != null) {
- stroke.print(printer);
- }
if (colorProfile != null) {
colorProfile.print(printer);
}
if (solidOpacity != null) {
- solidOpacity.print(printer);
- }
- if (fill != null) {
- fill.print(printer);
+ solidOpacity.print(printer);
}
}
-
- /**
- * Returns the name of the actual selector
- */
- public String getSelector()
- {
- return (selector.getElement().toLowerCase());
- }
-
}
Index: Fill.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/svg/Fill.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Fill.java 14 Sep 2005 15:15:27 -0000 1.2
+++ Fill.java 7 Apr 2008 14:16:23 -0000 1.3
@@ -240,9 +240,9 @@
* @param style The CssStyle
*/
public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).fill != null)
+ if (((SVGTinyStyle) style).fill != null)
style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).fill = this;
+ ((SVGTinyStyle) style).fill = this;
}
/**
@@ -253,9 +253,9 @@
*/
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
- return ((SVGStyle) style).getFill();
+ return ((SVGTinyStyle) style).getFill();
} else {
- return ((SVGStyle) style).fill;
+ return ((SVGTinyStyle) style).fill;
}
}
Index: SolidColor.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/svg/SolidColor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- SolidColor.java 14 Sep 2005 15:15:27 -0000 1.2
+++ SolidColor.java 7 Apr 2008 14:16:24 -0000 1.3
@@ -157,9 +157,9 @@
* @param style The CssStyle
*/
public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).solidColor != null)
+ if (((SVGBasicStyle) style).solidColor != null)
style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).solidColor = this;
+ ((SVGBasicStyle) style).solidColor = this;
}
/**
@@ -170,9 +170,9 @@
*/
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
- return ((SVGStyle) style).getSolidColor();
+ return ((SVGBasicStyle) style).getSolidColor();
} else {
- return ((SVGStyle) style).solidColor;
+ return ((SVGBasicStyle) style).solidColor;
}
}
Index: EnableBackground.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/svg/EnableBackground.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- EnableBackground.java 14 Sep 2005 15:15:27 -0000 1.2
+++ EnableBackground.java 7 Apr 2008 14:16:23 -0000 1.3
@@ -132,9 +132,9 @@
* @param style The CssStyle
*/
public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).enableBackground != null)
+ if (((SVGBasicStyle) style).enableBackground != null)
style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).enableBackground = this;
+ ((SVGBasicStyle) style).enableBackground = this;
}
/**
@@ -145,9 +145,9 @@
*/
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
- return ((SVGStyle) style).getEnableBackground();
+ return ((SVGBasicStyle) style).getEnableBackground();
} else {
- return ((SVGStyle) style).enableBackground;
+ return ((SVGBasicStyle) style).enableBackground;
}
}
Index: FillOpacity.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/svg/FillOpacity.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- FillOpacity.java 14 Sep 2005 15:15:27 -0000 1.2
+++ FillOpacity.java 7 Apr 2008 14:16:23 -0000 1.3
@@ -82,9 +82,9 @@
* @param style The CssStyle
*/
public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).fillOpacity != null)
+ if (((SVGBasicStyle) style).fillOpacity != null)
style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).fillOpacity = this;
+ ((SVGBasicStyle) style).fillOpacity = this;
}
/**
@@ -95,9 +95,9 @@
*/
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
- return ((SVGStyle) style).getFillOpacity();
+ return ((SVGBasicStyle) style).getFillOpacity();
} else {
- return ((SVGStyle) style).fillOpacity;
+ return ((SVGBasicStyle) style).fillOpacity;
}
}
Index: AlignmentBaseline.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/svg/AlignmentBaseline.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- AlignmentBaseline.java 14 Sep 2005 15:15:27 -0000 1.2
+++ AlignmentBaseline.java 7 Apr 2008 14:16:23 -0000 1.3
@@ -82,9 +82,9 @@
* @param style The CssStyle
*/
public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).alignmentBaseline != null)
+ if (((SVGBasicStyle) style).alignmentBaseline != null)
style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).alignmentBaseline = this;
+ ((SVGBasicStyle) style).alignmentBaseline = this;
}
/**
@@ -95,10 +95,10 @@
*/
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
- return ((SVGStyle) style).getAlignmentBaseline();
+ return ((SVGBasicStyle) style).getAlignmentBaseline();
}
else {
- return ((SVGStyle) style).alignmentBaseline;
+ return ((SVGBasicStyle) style).alignmentBaseline;
}
}
Index: ColorInterpolationFilters.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/svg/ColorInterpolationFilters.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ColorInterpolationFilters.java 14 Sep 2005 15:15:27 -0000 1.2
+++ ColorInterpolationFilters.java 7 Apr 2008 14:16:23 -0000 1.3
@@ -84,9 +84,9 @@
* @param style The CssStyle
*/
public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).colorInterpolationFilters != null)
+ if (((SVGBasicStyle) style).colorInterpolationFilters != null)
style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).colorInterpolationFilters = this;
+ ((SVGBasicStyle) style).colorInterpolationFilters = this;
}
/**
@@ -97,9 +97,9 @@
*/
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
- return ((SVGStyle) style).getColorInterpolationFilters();
+ return ((SVGBasicStyle) style).getColorInterpolationFilters();
} else {
- return ((SVGStyle) style).colorInterpolationFilters;
+ return ((SVGBasicStyle) style).colorInterpolationFilters;
}
}
Index: SVGTinyStyle.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/svg/SVGTinyStyle.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- SVGTinyStyle.java 14 Sep 2005 15:15:27 -0000 1.2
+++ SVGTinyStyle.java 7 Apr 2008 14:16:24 -0000 1.3
@@ -8,9 +8,11 @@
package org.w3c.css.properties.svg;
+import org.w3c.css.properties.css3.Css3Style;
+
import org.w3c.css.parser.CssPrinterStyle;
-public class SVGTinyStyle extends org.w3c.css.properties.css3.Css3Style {
+public class SVGTinyStyle extends Css3Style {
FillRule fillRule;
StrokeLinejoin strokeLinejoin;
@@ -26,16 +28,16 @@
if (fillRule == null) {
fillRule =
(FillRule) style.CascadingOrder (
- new FillRule(), style, selector);
+ new FillRule(), style, selector);
}
return fillRule;
}
-
+
public StrokeLinejoin getStrokeLinejoin() {
if (strokeLinejoin == null) {
strokeLinejoin =
(StrokeLinejoin) style.CascadingOrder (
- new StrokeLinejoin(), style, selector);
+ new StrokeLinejoin(), style, selector);
}
return strokeLinejoin;
}
@@ -44,7 +46,7 @@
if (strokeLineCap == null) {
strokeLineCap =
(StrokeLineCap) style.CascadingOrder (
- new StrokeLineCap(), style, selector);
+ new StrokeLineCap(), style, selector);
}
return strokeLineCap;
}
@@ -53,7 +55,7 @@
if (strokeMiterLimit == null) {
strokeMiterLimit =
(StrokeMiterLimit) style.CascadingOrder (
- new StrokeMiterLimit(), style, selector);
+ new StrokeMiterLimit(), style, selector);
}
return strokeMiterLimit;
}
@@ -62,7 +64,7 @@
if (strokeWidth == null) {
strokeWidth =
(StrokeWidth) style.CascadingOrder (
- new StrokeWidth(), style, selector);
+ new StrokeWidth(), style, selector);
}
return strokeWidth;
}
@@ -71,7 +73,7 @@
if (strokeDashOffset == null) {
strokeDashOffset =
(StrokeDashOffset) style.CascadingOrder (
- new StrokeDashOffset(), style, selector);
+ new StrokeDashOffset(), style, selector);
}
return strokeDashOffset;
}
@@ -80,7 +82,7 @@
if (strokeDashArray == null) {
strokeDashArray =
(StrokeDashArray) style.CascadingOrder (
- new StrokeDashArray(), style, selector);
+ new StrokeDashArray(), style, selector);
}
return strokeDashArray;
}
@@ -89,7 +91,7 @@
if (stroke == null) {
stroke =
(Stroke) style.CascadingOrder (
- new Stroke(), style, selector);
+ new Stroke(), style, selector);
}
return stroke;
}
@@ -98,7 +100,7 @@
if (fill == null) {
fill =
(Fill) style.CascadingOrder (
- new Fill(), style, selector);
+ new Fill(), style, selector);
}
return fill;
}
Index: FloodColor.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/svg/FloodColor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- FloodColor.java 14 Sep 2005 15:15:27 -0000 1.2
+++ FloodColor.java 7 Apr 2008 14:16:23 -0000 1.3
@@ -156,9 +156,9 @@
* @param style The CssStyle
*/
public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).floodColor != null)
+ if (((SVGBasicStyle) style).floodColor != null)
style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).floodColor = this;
+ ((SVGBasicStyle) style).floodColor = this;
}
/**
@@ -169,9 +169,9 @@
*/
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
- return ((SVGStyle) style).getFloodColor();
+ return ((SVGBasicStyle) style).getFloodColor();
} else {
- return ((SVGStyle) style).floodColor;
+ return ((SVGBasicStyle) style).floodColor;
}
}
Index: SolidOpacity.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/svg/SolidOpacity.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- SolidOpacity.java 14 Sep 2005 15:15:27 -0000 1.2
+++ SolidOpacity.java 7 Apr 2008 14:16:24 -0000 1.3
@@ -100,9 +100,9 @@
* @param style The CssStyle
*/
public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).solidOpacity != null)
+ if (((SVGBasicStyle) style).solidOpacity != null)
style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).solidOpacity = this;
+ ((SVGBasicStyle) style).solidOpacity = this;
}
/**
@@ -113,9 +113,9 @@
*/
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
- return ((SVGStyle) style).getSolidOpacity();
+ return ((SVGBasicStyle) style).getSolidOpacity();
} else {
- return ((SVGStyle) style).solidOpacity;
+ return ((SVGBasicStyle) style).solidOpacity;
}
}
Index: StopColor.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/svg/StopColor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- StopColor.java 14 Sep 2005 15:15:27 -0000 1.2
+++ StopColor.java 7 Apr 2008 14:16:24 -0000 1.3
@@ -156,9 +156,9 @@
* @param style The CssStyle
*/
public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).stopColor != null)
+ if (((SVGBasicStyle) style).stopColor != null)
style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).stopColor = this;
+ ((SVGBasicStyle) style).stopColor = this;
}
/**
@@ -169,9 +169,9 @@
*/
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
- return ((SVGStyle) style).getStopColor();
+ return ((SVGBasicStyle) style).getStopColor();
} else {
- return ((SVGStyle) style).stopColor;
+ return ((SVGBasicStyle) style).stopColor;
}
}
Index: Mask.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/svg/Mask.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Mask.java 14 Sep 2005 15:15:27 -0000 1.2
+++ Mask.java 7 Apr 2008 14:16:23 -0000 1.3
@@ -81,9 +81,9 @@
* @param style The CssStyle
*/
public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).mask != null)
+ if (((SVGBasicStyle) style).mask != null)
style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).mask = this;
+ ((SVGBasicStyle) style).mask = this;
}
/**
@@ -94,9 +94,9 @@
*/
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
- return ((SVGStyle) style).getMask();
+ return ((SVGBasicStyle) style).getMask();
} else {
- return ((SVGStyle) style).mask;
+ return ((SVGBasicStyle) style).mask;
}
}
Index: SVGStyle.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/svg/SVGStyle.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- SVGStyle.java 14 Sep 2005 15:15:27 -0000 1.2
+++ SVGStyle.java 7 Apr 2008 14:16:24 -0000 1.3
@@ -10,205 +10,17 @@
import org.w3c.css.parser.CssPrinterStyle;
-public class SVGStyle extends org.w3c.css.properties.css3.Css3Style {
+public class SVGStyle extends SVGBasicStyle {
- AlignmentBaseline alignmentBaseline;
- ClipPath clipPath;
- ClipRule clipRule;
- ColorInterpolation colorInterpolation;
- ColorInterpolationFilters colorInterpolationFilters;
- ColorRendering colorRendering;
- EnableBackground enableBackground;
- WritingModeSVG writingModeSVG;
- FloodOpacity floodOpacity;
- Filter filter;
- FillRule fillRule;
- FillOpacity fillOpacity;
- ImageRendering imageRendering;
- Mask mask;
- StopOpacity stopOpacity;
- Kerning kerning;
Marker marker;
MarkerStart markerStart;
MarkerEnd markerEnd;
MarkerMid markerMid;
- PointerEvents pointerEvents;
- ShapeRendering shapeRendering;
- TextRendering textRendering;
- TextAnchor textAnchor;
- StrokeLinejoin strokeLinejoin;
- StrokeLineCap strokeLineCap;
- StrokeMiterLimit strokeMiterLimit;
- StrokeOpacity strokeOpacity;
- StrokeWidth strokeWidth;
- StrokeDashOffset strokeDashOffset;
- StrokeDashArray strokeDashArray;
- StopColor stopColor;
- SolidColor solidColor;
LightingColor lightingColor;
- FloodColor floodColor;
- Stroke stroke;
- ColorProfile colorProfile;
- 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);
- }
- return alignmentBaseline;
- }
-
- public DominantBaseLine getDominantBaseLineSVG() {
- if (dominantBaseLine == null) {
- dominantBaseLine =
- (DominantBaseLine) style.CascadingOrder (
- new DominantBaseLine(), style, selector);
- }
- return dominantBaseLine;
- }
-
- public ClipPath getClipPath() {
- if (clipPath == null) {
- clipPath =
- (ClipPath) style.CascadingOrder (
- new ClipPath(), style, selector);
- }
- return clipPath;
- }
-
- public ClipRule getClipRule() {
- if (clipRule == null) {
- clipRule =
- (ClipRule) style.CascadingOrder (
- new ClipRule(), style, selector);
- }
- return clipRule;
- }
-
- public ColorInterpolation getColorInterpolation() {
- if (colorInterpolation == null) {
- colorInterpolation =
- (ColorInterpolation) style.CascadingOrder (
- new ColorInterpolation(), style, selector);
- }
- return colorInterpolation;
- }
-
- public ColorInterpolationFilters getColorInterpolationFilters() {
- if (colorInterpolationFilters == null) {
- colorInterpolationFilters =
- (ColorInterpolationFilters) style.CascadingOrder (
- new ColorInterpolationFilters(), style, selector);
- }
- return colorInterpolationFilters;
- }
-
- public ColorRendering getColorRendering() {
- if (colorRendering == null) {
- colorRendering =
- (ColorRendering) style.CascadingOrder (
- new ColorRendering(), style, selector);
- }
- return colorRendering;
- }
-
- public EnableBackground getEnableBackground() {
- if (enableBackground == null) {
- enableBackground =
- (EnableBackground) style.CascadingOrder (
- new EnableBackground(), style, selector);
- }
- return enableBackground;
- }
-
- public WritingModeSVG getWritingModeSVG() {
- if (writingModeSVG == null) {
- writingModeSVG =
- (WritingModeSVG) style.CascadingOrder (
- new WritingModeSVG(), style, selector);
- }
- return writingModeSVG;
- }
-
- public FloodOpacity getFloodOpacity() {
- if (floodOpacity == null) {
- floodOpacity =
- (FloodOpacity) style.CascadingOrder (
- new FloodOpacity(), style, selector);
- }
- return floodOpacity;
- }
-
- public Filter getFilter() {
- if (filter == null) {
- filter =
- (Filter) style.CascadingOrder (
- new Filter(), style, selector);
- }
- return filter;
- }
-
- public FillRule getFillRule() {
- if (fillRule == null) {
- fillRule =
- (FillRule) style.CascadingOrder (
- new FillRule(), style, selector);
- }
- return fillRule;
- }
-
- public FillOpacity getFillOpacity() {
- if (fillOpacity == null) {
- fillOpacity =
- (FillOpacity) style.CascadingOrder (
- new FillOpacity(), style, selector);
- }
- return fillOpacity;
- }
-
- public ImageRendering getImageRendering() {
- if (imageRendering == null) {
- imageRendering =
- (ImageRendering) style.CascadingOrder (
- new ImageRendering(), style, selector);
- }
- return imageRendering;
- }
-
- public Mask getMask() {
- if (mask == null) {
- mask =
- (Mask) style.CascadingOrder (
- new ImageRendering(), style, selector);
- }
- return mask;
- }
-
- public StopOpacity getStopOpacity() {
- if (stopOpacity == null) {
- stopOpacity =
- (StopOpacity) style.CascadingOrder (
- new StopOpacity(), style, selector);
- }
- return stopOpacity;
- }
-
- public Kerning getKerning() {
- if (kerning == null) {
- kerning =
- (Kerning) style.CascadingOrder (
- new Kerning(), style, selector);
- }
- return kerning;
- }
-
public Marker getMarker() {
if (marker == null) {
marker =
@@ -245,123 +57,6 @@
return markerMid;
}
- public PointerEvents getPointerEvents() {
- if (pointerEvents == null) {
- pointerEvents =
- (PointerEvents) style.CascadingOrder (
- new PointerEvents(), style, selector);
- }
- return pointerEvents;
- }
-
- public ShapeRendering getShapeRendering() {
- if (shapeRendering == null) {
- shapeRendering =
- (ShapeRendering) style.CascadingOrder (
- new ShapeRendering(), style, selector);
- }
- return shapeRendering;
- }
-
- public TextRendering getTextRendering() {
- if (textRendering == null) {
- textRendering =
- (TextRendering) style.CascadingOrder (
- new TextRendering(), style, selector);
- }
- return textRendering;
- }
-
- public TextAnchor getTextAnchor() {
- if (textAnchor == null) {
- textAnchor =
- (TextAnchor) style.CascadingOrder (
- new TextAnchor(), style, selector);
- }
- return textAnchor;
- }
-
- public StrokeLinejoin getStrokeLinejoin() {
- 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;
- }
-
- public StrokeMiterLimit getStrokeMiterLimit() {
- if (strokeMiterLimit == null) {
- strokeMiterLimit =
- (StrokeMiterLimit) style.CascadingOrder (
- new StrokeMiterLimit(), style, selector);
- }
- return strokeMiterLimit;
- }
-
- public StrokeOpacity getStrokeOpacity() {
- if (strokeOpacity == null) {
- strokeOpacity =
- (StrokeOpacity) style.CascadingOrder (
- new StrokeOpacity(), style, selector);
- }
- return strokeOpacity;
- }
-
- public StrokeWidth getStrokeWidth() {
- 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;
- }
-
- public StrokeDashArray getStrokeDashArray() {
- if (strokeDashArray == null) {
- strokeDashArray =
- (StrokeDashArray) style.CascadingOrder (
- new StrokeDashArray(), style, selector);
- }
- return strokeDashArray;
- }
-
- public StopColor getStopColor() {
- if (stopColor == null) {
- stopColor =
- (StopColor) style.CascadingOrder (
- new StopColor(), style, selector);
- }
- return stopColor;
- }
-
- public SolidColor getSolidColor() {
- if (solidColor == null) {
- solidColor =
- (SolidColor) style.CascadingOrder (
- new SolidColor(), style, selector);
- }
- return solidColor;
- }
-
public LightingColor getLightingColor() {
if (lightingColor == null) {
lightingColor =
@@ -371,51 +66,6 @@
return lightingColor;
}
- public FloodColor getFloodColor() {
- if (floodColor == null) {
- floodColor =
- (FloodColor) style.CascadingOrder (
- new FloodColor(), style, selector);
- }
- return floodColor;
- }
-
- public ColorProfile getColorProfileSVG() {
- if (colorProfile == null) {
- colorProfile =
- (ColorProfile) style.CascadingOrder (
- new ColorProfile(), style, selector);
- }
- return colorProfile;
- }
-
- public Stroke getStroke() {
- if (stroke == null) {
- stroke =
- (Stroke) style.CascadingOrder (
- new Stroke(), style, selector);
- }
- return stroke;
- }
-
- public SolidOpacity getSolidOpacity() {
- if (solidOpacity == null) {
- solidOpacity =
- (SolidOpacity) style.CascadingOrder (
- new SolidOpacity(), style, selector);
- }
- return solidOpacity;
- }
-
- public Fill getFill() {
- if (fill == null) {
- fill =
- (Fill) style.CascadingOrder (
- new Fill(), style, selector);
- }
- return fill;
- }
-
public ColorProfileSrc getColorProfileSrc() {
if (cpSrc == null) {
cpSrc =
@@ -451,54 +101,6 @@
public void print(CssPrinterStyle printer) {
super.print(printer);
- if (alignmentBaseline != null) {
- alignmentBaseline.print(printer);
- }
- if (dominantBaseLine != null) {
- dominantBaseLine.print(printer);
- }
- if (clipPath != null) {
- clipPath.print(printer);
- }
- if (clipRule != null) {
- clipRule.print(printer);
- }
- if (colorInterpolation != null) {
- colorInterpolation.print(printer);
- }
- if (colorRendering != null) {
- colorRendering.print(printer);
- }
- if (enableBackground != null) {
- enableBackground.print(printer);
- }
- if (writingModeSVG != null) {
- writingModeSVG.print(printer);
- }
- if (floodOpacity != null) {
- floodOpacity.print(printer);
- }
- if (filter != null) {
- filter.print(printer);
- }
- if (fillRule != null) {
- fillRule.print(printer);
- }
- if (fillOpacity != null) {
- fillOpacity.print(printer);
- }
- if (imageRendering != null) {
- imageRendering.print(printer);
- }
- if (mask != null) {
- mask.print(printer);
- }
- if (stopOpacity != null) {
- stopOpacity.print(printer);
- }
- if (kerning != null) {
- kerning.print(printer);
- }
if (marker != null) {
marker.print(printer);
}
@@ -511,63 +113,9 @@
if (markerMid != null) {
markerMid.print(printer);
}
- if (pointerEvents != null) {
- pointerEvents.print(printer);
- }
- if (shapeRendering != null) {
- shapeRendering.print(printer);
- }
- if (textRendering != null) {
- textRendering.print(printer);
- }
- if (textAnchor != null) {
- textAnchor.print(printer);
- }
- if (strokeLinejoin != null) {
- strokeLinejoin.print(printer);
- }
- if (strokeLineCap != null) {
- strokeLineCap.print(printer);
- }
- if (strokeMiterLimit != null) {
- strokeMiterLimit.print(printer);
- }
- if (strokeOpacity != null) {
- strokeOpacity.print(printer);
- }
- if (strokeWidth != null) {
- strokeWidth.print(printer);
- }
- if (strokeDashOffset != null) {
- strokeDashOffset.print(printer);
- }
- if (strokeDashArray != null) {
- strokeDashArray.print(printer);
- }
- if (stopColor != null) {
- stopColor.print(printer);
- }
- if (solidColor != null) {
- solidColor.print(printer);
- }
if (lightingColor != null) {
lightingColor.print(printer);
}
- if (floodColor != null) {
- floodColor.print(printer);
- }
- if (stroke != null) {
- stroke.print(printer);
- }
- if (colorProfile != null) {
- colorProfile.print(printer);
- }
- if (solidOpacity != null) {
- solidOpacity.print(printer);
- }
- if (fill != null) {
- fill.print(printer);
- }
if (cpSrc != null) {
cpSrc.print(printer);
}
@@ -578,13 +126,4 @@
cssRenderIntent.print(printer);
}
}
-
- /**
- * Returns the name of the actual selector
- */
- public String getSelector()
- {
- return (selector.getElement().toLowerCase());
- }
-
}
Index: WritingModeSVG.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/svg/WritingModeSVG.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- WritingModeSVG.java 14 Sep 2005 15:15:27 -0000 1.2
+++ WritingModeSVG.java 7 Apr 2008 14:16:24 -0000 1.3
@@ -100,9 +100,9 @@
* @param style The CssStyle
*/
public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).writingModeSVG != null)
+ if (((SVGBasicStyle) style).writingModeSVG != null)
style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).writingModeSVG = this;
+ ((SVGBasicStyle) style).writingModeSVG = this;
}
/**
@@ -113,10 +113,10 @@
*/
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
- return ((SVGStyle) style).getWritingModeSVG();
+ return ((SVGBasicStyle) style).getWritingModeSVG();
}
else {
- return ((SVGStyle) style).writingModeSVG;
+ return ((SVGBasicStyle) style).writingModeSVG;
}
}
Index: PointerEvents.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/svg/PointerEvents.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- PointerEvents.java 14 Sep 2005 15:15:27 -0000 1.2
+++ PointerEvents.java 7 Apr 2008 14:16:24 -0000 1.3
@@ -82,9 +82,9 @@
* @param style The CssStyle
*/
public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).pointerEvents != null)
+ if (((SVGBasicStyle) style).pointerEvents != null)
style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).pointerEvents = this;
+ ((SVGBasicStyle) style).pointerEvents = this;
}
/**
@@ -95,10 +95,10 @@
*/
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
- return ((SVGStyle) style).getPointerEvents();
+ return ((SVGBasicStyle) style).getPointerEvents();
}
else {
- return ((SVGStyle) style).pointerEvents;
+ return ((SVGBasicStyle) style).pointerEvents;
}
}
Index: ClipPath.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/svg/ClipPath.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ClipPath.java 14 Sep 2005 15:15:27 -0000 1.2
+++ ClipPath.java 7 Apr 2008 14:16:23 -0000 1.3
@@ -81,9 +81,9 @@
* @param style The CssStyle
*/
public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).clipPath != null)
+ if (((SVGBasicStyle) style).clipPath != null)
style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).clipPath = this;
+ ((SVGBasicStyle) style).clipPath = this;
}
/**
@@ -94,9 +94,9 @@
*/
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
- return ((SVGStyle) style).getClipPath();
+ return ((SVGBasicStyle) style).getClipPath();
} else {
- return ((SVGStyle) style).clipPath;
+ return ((SVGBasicStyle) style).clipPath;
}
}
Index: StrokeWidth.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/svg/StrokeWidth.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- StrokeWidth.java 14 Sep 2005 15:15:27 -0000 1.2
+++ StrokeWidth.java 7 Apr 2008 14:16:24 -0000 1.3
@@ -81,9 +81,9 @@
* @param style The CssStyle
*/
public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).strokeWidth != null)
+ if (((SVGTinyStyle) style).strokeWidth != null)
style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).strokeWidth = this;
+ ((SVGTinyStyle) style).strokeWidth = this;
}
/**
@@ -94,9 +94,9 @@
*/
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
- return ((SVGStyle) style).getStrokeWidth();
+ return ((SVGTinyStyle) style).getStrokeWidth();
} else {
- return ((SVGStyle) style).strokeWidth;
+ return ((SVGTinyStyle) style).strokeWidth;
}
}
Index: FillRule.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/svg/FillRule.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- FillRule.java 14 Sep 2005 15:15:27 -0000 1.2
+++ FillRule.java 7 Apr 2008 14:16:23 -0000 1.3
@@ -79,9 +79,9 @@
* @param style The CssStyle
*/
public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).fillRule != null)
+ if (((SVGTinyStyle) style).fillRule != null)
style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).fillRule = this;
+ ((SVGTinyStyle) style).fillRule = this;
}
/**
@@ -92,9 +92,9 @@
*/
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
- return ((SVGStyle) style).getFillRule();
+ return ((SVGTinyStyle) style).getFillRule();
} else {
- return ((SVGStyle) style).fillRule;
+ return ((SVGTinyStyle) style).fillRule;
}
}
Index: StrokeDashOffset.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/svg/StrokeDashOffset.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- StrokeDashOffset.java 14 Sep 2005 15:15:27 -0000 1.2
+++ StrokeDashOffset.java 7 Apr 2008 14:16:24 -0000 1.3
@@ -103,7 +103,7 @@
* @param style The CssStyle
*/
public void addToStyle(ApplContext ac, CssStyle style) {
- SVGStyle style0 = (SVGStyle) style;
+ SVGTinyStyle style0 = (SVGTinyStyle) style;
if (style0.strokeDashOffset != null)
style0.addRedefinitionWarning(ac, this);
style0.strokeDashOffset = this;
@@ -117,9 +117,9 @@
*/
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
- return ((SVGStyle) style).getStrokeDashOffset();
+ return ((SVGTinyStyle) style).getStrokeDashOffset();
} else {
- return ((SVGStyle) style).strokeDashOffset;
+ return ((SVGTinyStyle) style).strokeDashOffset;
}
}
Index: StrokeLineCap.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/svg/StrokeLineCap.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- StrokeLineCap.java 14 Sep 2005 15:15:27 -0000 1.2
+++ StrokeLineCap.java 7 Apr 2008 14:16:24 -0000 1.3
@@ -80,9 +80,9 @@
* @param style The CssStyle
*/
public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).strokeLineCap != null)
+ if (((SVGTinyStyle) style).strokeLineCap != null)
style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).strokeLineCap = this;
+ ((SVGTinyStyle) style).strokeLineCap = this;
}
/**
@@ -93,10 +93,10 @@
*/
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
- return ((SVGStyle) style).getStrokeLineCap();
+ return ((SVGTinyStyle) style).getStrokeLineCap();
}
else {
- return ((SVGStyle) style).strokeLineCap;
+ return ((SVGTinyStyle) style).strokeLineCap;
}
}
Index: StopOpacity.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/svg/StopOpacity.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- StopOpacity.java 14 Sep 2005 15:15:27 -0000 1.2
+++ StopOpacity.java 7 Apr 2008 14:16:24 -0000 1.3
@@ -81,9 +81,9 @@
* @param style The CssStyle
*/
public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).stopOpacity != null)
+ if (((SVGBasicStyle) style).stopOpacity != null)
style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).stopOpacity = this;
+ ((SVGBasicStyle) style).stopOpacity = this;
}
/**
@@ -94,9 +94,9 @@
*/
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
- return ((SVGStyle) style).getStopOpacity();
+ return ((SVGBasicStyle) style).getStopOpacity();
} else {
- return ((SVGStyle) style).stopOpacity;
+ return ((SVGBasicStyle) style).stopOpacity;
}
}
Index: ColorInterpolation.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/svg/ColorInterpolation.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ColorInterpolation.java 14 Sep 2005 15:15:27 -0000 1.2
+++ ColorInterpolation.java 7 Apr 2008 14:16:23 -0000 1.3
@@ -84,9 +84,9 @@
* @param style The CssStyle
*/
public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).colorInterpolation != null)
+ if (((SVGBasicStyle) style).colorInterpolation != null)
style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).colorInterpolation = this;
+ ((SVGBasicStyle) style).colorInterpolation = this;
}
/**
@@ -97,9 +97,9 @@
*/
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
- return ((SVGStyle) style).getColorInterpolation();
+ return ((SVGBasicStyle) style).getColorInterpolation();
} else {
- return ((SVGStyle) style).colorInterpolation;
+ return ((SVGBasicStyle) style).colorInterpolation;
}
}
Index: StrokeDashArray.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/svg/StrokeDashArray.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- StrokeDashArray.java 14 Sep 2005 15:15:27 -0000 1.2
+++ StrokeDashArray.java 7 Apr 2008 14:16:24 -0000 1.3
@@ -91,9 +91,9 @@
* @param style The CssStyle
*/
public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).strokeDashArray != null)
+ if (((SVGTinyStyle) style).strokeDashArray != null)
style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).strokeDashArray = this;
+ ((SVGTinyStyle) style).strokeDashArray = this;
}
@@ -105,9 +105,9 @@
*/
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
- return ((SVGStyle) style).getStrokeDashArray();
+ return ((SVGTinyStyle) style).getStrokeDashArray();
} else {
- return ((SVGStyle) style).strokeDashArray;
+ return ((SVGTinyStyle) style).strokeDashArray;
}
}
Index: ShapeRendering.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/svg/ShapeRendering.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ShapeRendering.java 14 Sep 2005 15:15:27 -0000 1.2
+++ ShapeRendering.java 7 Apr 2008 14:16:24 -0000 1.3
@@ -81,9 +81,9 @@
* @param style The CssStyle
*/
public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).shapeRendering != null)
+ if (((SVGBasicStyle) style).shapeRendering != null)
style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).shapeRendering = this;
+ ((SVGBasicStyle) style).shapeRendering = this;
}
/**
@@ -94,10 +94,10 @@
*/
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
- return ((SVGStyle) style).getShapeRendering();
+ return ((SVGBasicStyle) style).getShapeRendering();
}
else {
- return ((SVGStyle) style).shapeRendering;
+ return ((SVGBasicStyle) style).shapeRendering;
}
}
Index: StrokeLinejoin.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/svg/StrokeLinejoin.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- StrokeLinejoin.java 14 Sep 2005 15:15:27 -0000 1.2
+++ StrokeLinejoin.java 7 Apr 2008 14:16:24 -0000 1.3
@@ -80,9 +80,9 @@
* @param style The CssStyle
*/
public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).strokeLinejoin != null)
+ if (((SVGTinyStyle) style).strokeLinejoin != null)
style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).strokeLinejoin = this;
+ ((SVGTinyStyle) style).strokeLinejoin = this;
}
/**
@@ -93,10 +93,10 @@
*/
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
- return ((SVGStyle) style).getStrokeLinejoin();
+ return ((SVGTinyStyle) style).getStrokeLinejoin();
}
else {
- return ((SVGStyle) style).strokeLinejoin;
+ return ((SVGTinyStyle) style).strokeLinejoin;
}
}
Index: Stroke.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/svg/Stroke.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Stroke.java 14 Sep 2005 15:15:27 -0000 1.2
+++ Stroke.java 7 Apr 2008 14:16:24 -0000 1.3
@@ -239,9 +239,9 @@
* @param style The CssStyle
*/
public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).stroke != null)
+ if (((SVGTinyStyle) style).stroke != null)
style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).stroke = this;
+ ((SVGTinyStyle) style).stroke = this;
}
/**
@@ -252,9 +252,9 @@
*/
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
- return ((SVGStyle) style).getStroke();
+ return ((SVGTinyStyle) style).getStroke();
} else {
- return ((SVGStyle) style).stroke;
+ return ((SVGTinyStyle) style).stroke;
}
}
Index: StrokeMiterLimit.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/svg/StrokeMiterLimit.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- StrokeMiterLimit.java 14 Sep 2005 15:15:27 -0000 1.2
+++ StrokeMiterLimit.java 7 Apr 2008 14:16:24 -0000 1.3
@@ -109,7 +109,7 @@
* @param style The CssStyle
*/
public void addToStyle(ApplContext ac, CssStyle style) {
- SVGStyle style0 = (SVGStyle) style;
+ SVGTinyStyle style0 = (SVGTinyStyle) style;
if (style0.strokeMiterLimit != null)
style0.addRedefinitionWarning(ac, this);
style0.strokeMiterLimit = this;
@@ -123,9 +123,9 @@
*/
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
- return ((SVGStyle) style).getStrokeMiterLimit();
+ return ((SVGTinyStyle) style).getStrokeMiterLimit();
} else {
- return ((SVGStyle) style).strokeMiterLimit;
+ return ((SVGTinyStyle) style).strokeMiterLimit;
}
}
Index: FloodOpacity.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/svg/FloodOpacity.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- FloodOpacity.java 14 Sep 2005 15:15:27 -0000 1.2
+++ FloodOpacity.java 7 Apr 2008 14:16:23 -0000 1.3
@@ -93,9 +93,9 @@
* @param style The CssStyle
*/
public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).floodOpacity != null)
+ if (((SVGBasicStyle) style).floodOpacity != null)
style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).floodOpacity = this;
+ ((SVGBasicStyle) style).floodOpacity = this;
}
/**
@@ -106,9 +106,9 @@
*/
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
- return ((SVGStyle) style).getFloodOpacity();
+ return ((SVGBasicStyle) style).getFloodOpacity();
} else {
- return ((SVGStyle) style).floodOpacity;
+ return ((SVGBasicStyle) style).floodOpacity;
}
}
Index: ColorRendering.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/svg/ColorRendering.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ColorRendering.java 14 Sep 2005 15:15:27 -0000 1.2
+++ ColorRendering.java 7 Apr 2008 14:16:23 -0000 1.3
@@ -83,9 +83,9 @@
* @param style The CssStyle
*/
public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).colorRendering != null)
+ if (((SVGBasicStyle) style).colorRendering != null)
style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).colorRendering = this;
+ ((SVGBasicStyle) style).colorRendering = this;
}
/**
@@ -96,9 +96,9 @@
*/
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
- return ((SVGStyle) style).getColorRendering();
+ return ((SVGBasicStyle) style).getColorRendering();
} else {
- return ((SVGStyle) style).colorRendering;
+ return ((SVGBasicStyle) style).colorRendering;
}
}
Index: TextRendering.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/svg/TextRendering.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- TextRendering.java 14 Sep 2005 15:15:27 -0000 1.2
+++ TextRendering.java 7 Apr 2008 14:16:24 -0000 1.3
@@ -81,9 +81,9 @@
* @param style The CssStyle
*/
public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).textRendering != null)
+ if (((SVGBasicStyle) style).textRendering != null)
style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).textRendering = this;
+ ((SVGBasicStyle) style).textRendering = this;
}
/**
@@ -94,10 +94,10 @@
*/
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
- return ((SVGStyle) style).getTextRendering();
+ return ((SVGBasicStyle) style).getTextRendering();
}
else {
- return ((SVGStyle) style).textRendering;
+ return ((SVGBasicStyle) style).textRendering;
}
}
Index: TextAnchor.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/svg/TextAnchor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- TextAnchor.java 14 Sep 2005 15:15:27 -0000 1.2
+++ TextAnchor.java 7 Apr 2008 14:16:24 -0000 1.3
@@ -80,9 +80,9 @@
* @param style The CssStyle
*/
public void addToStyle(ApplContext ac, CssStyle style) {
- if (((SVGStyle) style).textAnchor != null)
+ if (((SVGBasicStyle) style).textAnchor != null)
style.addRedefinitionWarning(ac, this);
- ((SVGStyle) style).textAnchor = this;
+ ((SVGBasicStyle) style).textAnchor = this;
}
/**
@@ -93,10 +93,10 @@
*/
public CssProperty getPropertyInStyle(CssStyle style, boolean resolve) {
if (resolve) {
- return ((SVGStyle) style).getTextAnchor();
+ return ((SVGBasicStyle) style).getTextAnchor();
}
else {
- return ((SVGStyle) style).textAnchor;
+ return ((SVGBasicStyle) style).textAnchor;
}
}
Received on Monday, 7 April 2008 14:17:04 UTC