nsochele 2003/03/10 06:20:29
Modified: sources/org/apache/batik/dom/svg SVGOMAnimatedPoints.java
AbstractSVGList.java
samples/tests/spec/scripting polyline_points2.svg
polygon_points2.svg path_pathSegList2.svg
test-references/samples/tests/spec/scripting
polyline_points2.png polygon_points2.png
path_pathSegList2.png
Log:
- fixed initialization with default value of an SVGList (not working for polygon)
- added test case for the default value
- fixed usage of quick appendItem when the number of items is > 1
Revision Changes Path
1.2 +2 -2
xml-batik/sources/org/apache/batik/dom/svg/SVGOMAnimatedPoints.java
Index: SVGOMAnimatedPoints.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/dom/svg/SVGOMAnimatedPoints.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SVGOMAnimatedPoints.java 4 Mar 2003 18:22:20 -0000 1.1
+++ SVGOMAnimatedPoints.java 10 Mar 2003 14:20:29 -0000 1.2
@@ -61,7 +61,7 @@
public SVGOMAnimatedPoints(AbstractElement elt,
String ns,
String ln,
- String defultValue){
+ String defaultValue){
element = elt;
namespaceURI = ns;
1.2 +2 -2 xml-batik/sources/org/apache/batik/dom/svg/AbstractSVGList.java
Index: AbstractSVGList.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/dom/svg/AbstractSVGList.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractSVGList.java 4 Mar 2003 18:22:20 -0000 1.1
+++ AbstractSVGList.java 10 Mar 2003 14:20:29 -0000 1.2
@@ -406,7 +406,7 @@
//set the parent
item.setParent(this);
- if ( itemList.size() < 1 ){
+ if ( itemList.size() <= 1 ){
resetAttribute();
}
else{
1.2 +49 -1 xml-batik/samples/tests/spec/scripting/polyline_points2.svg
Index: polyline_points2.svg
===================================================================
RCS file: /home/cvs/xml-batik/samples/tests/spec/scripting/polyline_points2.svg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- polyline_points2.svg 4 Mar 2003 18:22:19 -0000 1.1
+++ polyline_points2.svg 10 Mar 2003 14:20:29 -0000 1.2
@@ -61,6 +61,45 @@
text = elt.getOwnerDocument().getElementById('test72_text');
text.getFirstChild().appendData(" ("+nb.getX()+","+nb.getY()+")");
}
+
+ function createNextSibling(evt){
+
+ var elt = evt.target;
+ var doc = elt.getOwnerDocument();
+
+ var polyline = doc.createElementNS(elt.getNamespaceURI(),"polyline");
+ polyline.setAttribute("style","fill:#ffd700;stroke-width:4.0;stroke:#ffa500");
+ var pointsList = polyline.getPoints();
+
+ var point = doc.getDocumentElement().createSVGPoint();
+
+ point.setX(219);
+ point.setY(175);
+ pointsList.appendItem(point);
+ point.setX(255);
+ point.setY(193);
+ pointsList.appendItem(point);
+ point.setX(268);
+ point.setY(235);
+ pointsList.appendItem(point);
+ point.setX(242);
+ point.setY(269);
+ pointsList.appendItem(point);
+ point.setX(199);
+ point.setY(270);
+ pointsList.appendItem(point);
+ point.setX(171);
+ point.setY(237);
+ pointsList.appendItem(point);
+ point.setX(179);
+ point.setY(195);
+ pointsList.appendItem(point);
+
+ var text = elt.getOwnerDocument().getElementById('test8_text');
+ text.getFirstChild().appendData(" "+pointsList.getNumberOfItems()+" points");
+
+ elt.getParentNode().insertBefore(polyline,elt.getNextSibling());
+ }
]]></script>
<g id="test-content" transform="matrix(1.0 0.0 0.0 1.0 -148.27586 -91.37931)">
@@ -111,6 +150,15 @@
</text>
<text x="160" font-size="9" y="285" id="test72_text">
appended point
+ </text>
+ </g>
+
+ <g transform="translate(300,0)" >
+ <!-- onload="initialize/appendItem(evt)" -->
+ <text x="180" y="160" font-size="11" >new Polyline</text>
+ <polyline style="opacity:0.5;fill:#eee; stroke:#aaa; stroke-width:4"
points="219 175, 255 193, 268 235, 242 269, 199 270, 171 237, 179 195"
onload="createNextSibling(evt)"/>
+ <text x="160" font-size="9" y="285" id="test8_text">
+ polyline with
</text>
</g>
1.2 +49 -1 xml-batik/samples/tests/spec/scripting/polygon_points2.svg
Index: polygon_points2.svg
===================================================================
RCS file: /home/cvs/xml-batik/samples/tests/spec/scripting/polygon_points2.svg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- polygon_points2.svg 4 Mar 2003 18:22:19 -0000 1.1
+++ polygon_points2.svg 10 Mar 2003 14:20:29 -0000 1.2
@@ -61,6 +61,45 @@
text = elt.getOwnerDocument().getElementById('test72_text');
text.getFirstChild().appendData(" ("+nb.getX()+","+nb.getY()+")");
}
+
+ function createNextSibling(evt){
+
+ var elt = evt.target;
+ var doc = elt.getOwnerDocument();
+
+ var polygon = doc.createElementNS(elt.getNamespaceURI(),"polygon");
+ polygon.setAttribute("style","fill:#ffd700;stroke-width:4.0;stroke:#ffa500");
+ var pointsList = polygon.getPoints();
+
+ var point = doc.getDocumentElement().createSVGPoint();
+
+ point.setX(219);
+ point.setY(175);
+ pointsList.appendItem(point);
+ point.setX(255);
+ point.setY(193);
+ pointsList.appendItem(point);
+ point.setX(268);
+ point.setY(235);
+ pointsList.appendItem(point);
+ point.setX(242);
+ point.setY(269);
+ pointsList.appendItem(point);
+ point.setX(199);
+ point.setY(270);
+ pointsList.appendItem(point);
+ point.setX(171);
+ point.setY(237);
+ pointsList.appendItem(point);
+ point.setX(179);
+ point.setY(195);
+ pointsList.appendItem(point);
+
+ var text = elt.getOwnerDocument().getElementById('test8_text');
+ text.getFirstChild().appendData(" "+pointsList.getNumberOfItems()+" points");
+
+ elt.getParentNode().insertBefore(polygon,elt.getNextSibling());
+ }
]]></script>
<g id="test-content" transform="matrix(1.0 0.0 0.0 1.0 -148.27586 -91.37931)">
@@ -111,6 +150,15 @@
</text>
<text x="160" font-size="9" y="285" id="test72_text">
appended point
+ </text>
+ </g>
+
+ <g transform="translate(300,0)" >
+ <!-- onload="fromScratch(evt)" -->
+ <text x="180" y="160" font-size="11" >new Polygon</text>
+ <polygon style="opacity:0.5;fill:#eee; stroke:#aaa; stroke-width:4"
points="219 175, 255 193, 268 235, 242 269, 199 270, 171 237, 179 195"
onload="createNextSibling(evt)"/>
+ <text x="160" font-size="9" y="285" id="test8_text">
+ polygon with
</text>
</g>
1.2 +34 -1 xml-batik/samples/tests/spec/scripting/path_pathSegList2.svg
Index: path_pathSegList2.svg
===================================================================
RCS file: /home/cvs/xml-batik/samples/tests/spec/scripting/path_pathSegList2.svg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- path_pathSegList2.svg 4 Mar 2003 18:22:19 -0000 1.1
+++ path_pathSegList2.svg 10 Mar 2003 14:20:29 -0000 1.2
@@ -61,6 +61,30 @@
text = elt.getOwnerDocument().getElementById('test72_text');
text.getFirstChild().appendData(" ("+nb.getPathSegType()+")");
}
+
+ function createNextSibling(evt){
+
+ var elt = evt.target;
+ var doc = elt.getOwnerDocument();
+
+ var path = doc.createElementNS(elt.getNamespaceURI(),"path");
+ path.setAttribute("style","fill:#ffd700;stroke-width:4.0;stroke:#ffa500");
+ var segList = path.getPathSegList();
+
+ segList.appendItem(path.createSVGPathSegMovetoAbs(150,200));
+ segList.appendItem(path.createSVGPathSegLinetoAbs(200,200));
+
segList.appendItem(path.createSVGPathSegCurvetoCubicAbs(220,250,210,180,250,240));
+
segList.appendItem(path.createSVGPathSegCurvetoQuadraticAbs(200,250,210,275));
+ segList.appendItem(path.createSVGPathSegLinetoAbs(182.5,237.5));
+ segList.appendItem(path.createSVGPathSegLinetoAbs(150,250));
+ segList.appendItem(path.createSVGPathSegLinetoAbs(162.5,212.5));
+ segList.appendItem(path.createSVGPathSegClosePath());
+
+ var text = elt.getOwnerDocument().getElementById('test8_text');
+ text.getFirstChild().appendData(" "+segList.getNumberOfItems()+" segments");
+
+ elt.getParentNode().insertBefore(path,elt.getNextSibling());
+ }
]]></script>
<g id="test-content" transform="matrix(1.0 0.0 0.0 1.0 -140 -91.37931)">
@@ -111,6 +135,15 @@
</text>
<text x="160" font-size="9" y="285" id="test72_text">
appended seg
+ </text>
+ </g>
+
+ <g transform="translate(300,0)" >
+ <!-- onload="initialize/appendItem(evt)" -->
+ <text x="180" y="160" font-size="11" >new Path</text>
+ <path style="opacity:0.5;fill:#eee; stroke:#aaa; stroke-width:4" d="M150 200
L200 200 C 210 180 250 240 220 250 Q 210 275 200 250 L 182.5 237.5 150 250 162.5
212.5z" onload="createNextSibling(evt)" />
+ <text x="160" font-size="9" y="285" id="test8_text">
+ path with
</text>
</g>
1.2 +107 -73
xml-batik/test-references/samples/tests/spec/scripting/polyline_points2.png
<<Binary file>>
1.2 +103 -86
xml-batik/test-references/samples/tests/spec/scripting/polygon_points2.png
<<Binary file>>
1.2 +87 -39
xml-batik/test-references/samples/tests/spec/scripting/path_pathSegList2.png
<<Binary file>>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
