deweese 2003/10/07 17:28:47
Modified: samples/tests/spec/scripting markerUpdate.svg
sources/org/apache/batik/util/gui MemoryMonitor.java
test-references/samples/tests/spec/scripting
markerUpdate.png
test-resources/org/apache/batik/test interactiveSamples.xml
samplesRendering.xml
xdocs mail-lists.xml
Log:
1) Updated test for markerUpdate.svg is now an update test instead of an
interactive test.
2) MemoryMonitor has a small thread safety fix.
3) mail-lists page has been updated to reference the apache eyebrowse
archives.
Revision Changes Path
1.4 +115 -63 xml-batik/samples/tests/spec/scripting/markerUpdate.svg
Index: markerUpdate.svg
===================================================================
RCS file: /home/cvs/xml-batik/samples/tests/spec/scripting/markerUpdate.svg,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- markerUpdate.svg 8 Aug 2003 11:39:33 -0000 1.3
+++ markerUpdate.svg 8 Oct 2003 00:28:47 -0000 1.4
@@ -68,79 +68,131 @@
<title>Marker with geometry updates</title>
- <text x="50%" y="25" class="title">Marker with geometry updates
-<tspan x="50%" dy="1.1em" style="font-style:italic; font-size:12">(click on all
shapes and see
-<a style="fill:blue"
xlink:href="markerUpdateRef.svg">markerUpdateRef.svg</a>)</tspan></text>
+ <text x="50%" y="25" class="title">Marker with geometry and property updates.
+ <tspan x="50%" dy="1.1em" style="font-style:italic; font-size:12">(click on
shapes or run button)</tspan></text>
- <script type="text/ecmascript">
+ <script type="text/ecmascript">
var svgNamespaceURI = "http://www.w3.org/2000/svg";;
+var stroke = document.getElementById("stroke");
+var userspace = document.getElementById("userspace");
+var start = document.getElementById("start");
+var mid = document.getElementById("mid");
+var end = document.getElementById("end");
- function changeGeometry(evt) {
- evt.target.setAttribute("points",
- "130 150 150 170 110 190 150 210 110 230 150 250 110 270 150 290 110 310
150 330 110 350 130 370");
- }
-
- </script>
-
-<defs>
-
-<marker id="markerUserSpaceOnUse" refX="8" refY="8" markerUnits="userSpaceOnUse"
markerWidth="16" markerHeight="16">
- <circle cx="8" cy="8" r="8" style="fill:#aaa" />
-</marker>
-
-<marker id="markerStrokeWidth" refX="2" refY="2" markerUnits="strokeWidth"
markerWidth="4" markerHeight="4">
- <circle cx="2" cy="2" r="2" style="fill:#aaa" />
-</marker>
-
-</defs>
-
-
-<g id="test-content" transform="translate(0, -20)">
-
-<g id="board" style="fill:none; stroke:black">
- <rect x="40" y="80" width="200" height="20" style="fill:#eee"/>
- <rect x="240" y="80" width="200" height="20" style="fill:#eee"/>
-
- <rect x="40" y="100" width="200" height="380" />
- <rect x="240" y="100" width="200" height="380" />
-
- <rect x="20" y="100" width="20" height="380" style="fill:#eee"/>
-
- <g style="fill:black; stroke:none; text-anchor:middle">
- <text x="134" y="94">strokeWidth</text>
- <text x="314" y="94">userSpaceOnUse</text>
- <text x="0" y="0" transform="translate(34
290)rotate(-90)"><marker></text>
- </g>
-</g>
+function changeGeometryEvt(evt) {
+ changeGeometry(evt.target);
+}
+function changeGeometry(tgt) {
+ tgt.setAttribute("points",
+ "130 150 150 170 110 190 150 210 110 230 150 250 110 270 150 290
110 310 150 330 110 350 130 370");
+}
-<polyline onclick="changeGeometry(evt)"
- points="130 150 110 170 150 190 110 210 150 230 110 250 150 270 110 290
150 310 110 330 150 350 130 370"
- style="stroke:black; stroke-width:4; fill:none;
marker:url(#markerStrokeWidth)" />
+function changeMarkerStartEvt(evt) { changeMarkerStart(evt.target); }
+function changeMarkerStart(tgt) {
+ changeProperty(tgt, "marker-start", "url(#markerRed)");
+}
+function changeMarkerMidEvt(evt) { changeMarkerMid(evt.target); }
+function changeMarkerMid(tgt) {
+ changeProperty(tgt, "marker-mid", "url(#markerRed)");
+}
+function changeMarkerEndEvt(evt) { changeMarkerEnd(evt.target); }
+function changeMarkerEnd(tgt) {
+ changeProperty(tgt, "marker-end", "url(#markerRed)");
+}
+function changeProperty(tgt, prop, val) {
+ tgt.style.setProperty(prop, val, "");
+}
+function run() {
+ changeGeometry(stroke);
+ changeGeometry(userspace);
+ changeMarkerStart(start);
+ changeMarkerMid(mid);
+ changeMarkerEnd(end);
+}
-<polyline transform="translate(200 0)" onclick="changeGeometry(evt)"
- points="130 150 110 170 150 190 110 210 150 230 110 250 150 270 110 290
150 310 110 330 150 350 130 370"
- style="stroke:black; stroke-width:4; fill:none;
marker:url(#markerUserSpaceOnUse)" />
+function regardStart() {
+ run();
+ setTimeout("regardTestInstance.scriptDone()", 100);
+}
-</g>
+</script>
+ <defs>
+ <marker id="markerUserSpaceOnUse" refX="8" refY="8"
markerUnits="userSpaceOnUse" markerWidth="16" markerHeight="16">
+ <circle cx="8" cy="8" r="8" style="fill:#aaa" />
+ </marker>
+
+ <marker id="markerStrokeWidth" refX="2" refY="2" markerUnits="strokeWidth"
markerWidth="4" markerHeight="4">
+ <circle cx="2" cy="2" r="2" style="fill:#aaa" />
+ </marker>
+
+ <marker id="markerRed" refX="2" refY="2" markerUnits="strokeWidth"
markerWidth="4" markerHeight="4">
+ <circle cx="2" cy="2" r="2" style="fill:#a44" />
+ </marker>
+ </defs>
+
+ <g id="test-content" transform="translate(0, -20)">
+
+ <g id="board" style="fill:none; stroke:black">
+ <rect x="40" y="80" width="75" height="20" style="fill:#eee"/>
+ <rect x="115" y="80" width="75" height="20" style="fill:#eee"/>
+ <rect x="190" y="80" width="75" height="20" style="fill:#eee"/>
+ <rect x="265" y="80" width="75" height="20" style="fill:#eee"/>
+ <rect x="340" y="80" width="75" height="20" style="fill:#eee"/>
+
+ <rect x="20" y="100" width="20" height="380" style="fill:#eee"/>
+
+ <rect x="40" y="100" width="75" height="380" />
+ <rect x="115" y="100" width="75" height="380" />
+ <rect x="190" y="100" width="75" height="380" />
+ <rect x="265" y="100" width="75" height="380" />
+ <rect x="340" y="100" width="75" height="380" />
+
+
+ <g style="fill:black; stroke:none; text-anchor:middle">
+ <text x="77.5" y="94">strokeWidth</text>
+ <text x="154.5" y="94">userspace<desc>userSpaceOnUse</desc></text>
+ <text x="229.5" y="94">start</text>
+ <text x="304.5" y="94">mid</text>
+ <text x="379.5" y="94">end</text>
- <script type="text/ecmascript"><![CDATA[
-function onDone() {
- if (!(regardTestInstance == null)) {
- regardTestInstance.scriptDone();
- } else {
- alert("This button only works when run in the regard framework");
- }
-}
- ]]></script>
- <g id="done" transform="translate(195, 468)" cursor="pointer"
onclick="onDone()">
- <rect rx="5" ry="5" width="60" height="25" fill="#eeeeee" stroke="black" />
- <text x="30" y="18" font-size="14" font-weight="bold"
text-anchor="middle">Done</text>
+ <text x="0" y="0" transform="translate(34
290)rotate(-90)"><marker></text>
+ </g>
</g>
-
-
+ <polyline id="stroke"
+ transform="translate(-50, 0)" onclick="changeGeometryEvt(evt)"
+ points="130 150 110 170 150 190 110 210 150 230 110 250 150 270 110 290 150
310 110 330 150 350 130 370"
+ style="stroke:black; stroke-width:4; fill:none;
marker:url(#markerStrokeWidth)" />
+
+
+ <polyline id="userspace"
+ transform="translate(25 0)" onclick="changeGeometryEvt(evt)"
+ points="130 150 110 170 150 190 110 210 150 230 110 250 150 270 110 290 150
310 110 330 150 350 130 370"
+ style="stroke:black; stroke-width:4; fill:none;
marker:url(#markerUserSpaceOnUse)" />
+
+ <polyline id="start"
+ transform="translate(100 0)" onclick="changeMarkerStartEvt(evt)"
+ points="130 150 110 170 150 190 110 210 150 230 110 250 150 270 110 290 150
310 110 330 150 350 130 370"
+ style="stroke:black; stroke-width:4; fill:none;
marker:url(#markerUserSpaceOnUse)" />
+
+ <polyline id="mid"
+ transform="translate(175 0)" onclick="changeMarkerMidEvt(evt)"
+ points="130 150 110 170 150 190 110 210 150 230 110 250 150 270 110 290 150
310 110 330 150 350 130 370"
+ style="stroke:black; stroke-width:4; fill:none;
marker:url(#markerUserSpaceOnUse)" />
+
+ <polyline id="end"
+ transform="translate(250 0)" onclick="changeMarkerEndEvt(evt)"
+ points="130 150 110 170 150 190 110 210 150 230 110 250 150 270 110 290 150
310 110 330 150 350 130 370"
+ style="stroke:black; stroke-width:4; fill:none;
marker:url(#markerUserSpaceOnUse)" />
+ </g>
+
+ <g id="run" transform="translate(195, 468)" cursor="pointer" onclick="run()">
+ <rect rx="5" ry="5" width="60" height="25" fill="#eeeeee" stroke="black" />
+ <text x="30" y="18" font-size="14"
+ font-weight="bold" text-anchor="middle">Run</text>
+ </g>
</svg>
1.6 +5 -7 xml-batik/sources/org/apache/batik/util/gui/MemoryMonitor.java
Index: MemoryMonitor.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/util/gui/MemoryMonitor.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MemoryMonitor.java 8 Aug 2003 11:39:27 -0000 1.5
+++ MemoryMonitor.java 8 Oct 2003 00:28:47 -0000 1.6
@@ -733,11 +733,9 @@
}
try {
sleep(timeout);
- if (suspended) {
- synchronized(this) {
- while (suspended) {
- wait();
- }
+ synchronized(this) {
+ while (suspended) {
+ wait();
}
}
} catch (InterruptedException e) {}
@@ -747,7 +745,7 @@
/**
* Suspends the thread.
*/
- public void safeSuspend() {
+ public synchronized void safeSuspend() {
if (!suspended) {
suspended = true;
}
1.3 +78 -51
xml-batik/test-references/samples/tests/spec/scripting/markerUpdate.png
<<Binary file>>
1.8 +1 -2
xml-batik/test-resources/org/apache/batik/test/interactiveSamples.xml
Index: interactiveSamples.xml
===================================================================
RCS file:
/home/cvs/xml-batik/test-resources/org/apache/batik/test/interactiveSamples.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- interactiveSamples.xml 8 Aug 2003 11:39:46 -0000 1.7
+++ interactiveSamples.xml 8 Oct 2003 00:28:47 -0000 1.8
@@ -75,7 +75,6 @@
<test id="samples/tests/spec/scripting/gradientsUpdate.svg" />
<test id="samples/tests/spec/scripting/imageUpdate.svg" />
<test id="samples/tests/spec/scripting/javaBinding.svg" />
- <test id="samples/tests/spec/scripting/markerUpdate.svg" />
<test id="samples/tests/spec/scripting/maskClipUpdate.svg" />
<!-- <test id="samples/tests/spec/scripting/removeLast.svg" /> -->
<test id="samples/tests/spec/scripting/security3.svg" />
1.115 +2 -1
xml-batik/test-resources/org/apache/batik/test/samplesRendering.xml
Index: samplesRendering.xml
===================================================================
RCS file:
/home/cvs/xml-batik/test-resources/org/apache/batik/test/samplesRendering.xml,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- samplesRendering.xml 6 Oct 2003 00:56:00 -0000 1.114
+++ samplesRendering.xml 8 Oct 2003 00:28:47 -0000 1.115
@@ -412,6 +412,7 @@
class="org.apache.batik.test.svg.JSVGRenderingAccuracyTest">
<test id="samples/tests/spec/scripting/boundsTransformChange.svg" />
<test id="samples/tests/spec/scripting/eventAttrAdd.svg" />
+ <test id="samples/tests/spec/scripting/markerUpdate.svg" />
<test id="samples/tests/spec/scripting/rootSizeChange.svg" />
<test id="samples/tests/spec/scripting/rectResizeOnClick.svg" />
<test id="samples/tests/spec/scripting/setProperty.svg" />
1.5 +5 -1 xml-batik/xdocs/mail-lists.xml
Index: mail-lists.xml
===================================================================
RCS file: /home/cvs/xml-batik/xdocs/mail-lists.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mail-lists.xml 11 Mar 2002 09:04:38 -0000 1.4
+++ mail-lists.xml 8 Oct 2003 00:28:47 -0000 1.5
@@ -30,6 +30,8 @@
mailing list, please first look at the following resources in this order:</p>
<ol>
<li><link href="faqs.html">Batik FAQs</link></li>
+ <li><link href="http://nagoya.apache.org/eyebrowse/[EMAIL
PROTECTED]">Batik-Users Archive</link>
+ <li><link href="http://nagoya.apache.org/eyebrowse/[EMAIL PROTECTED]">Batik-Dev
Archive</link>
<li><link href="http://koala.ilog.fr/batik/";>Batik mailing lists archives
hosted by Koala</link></li>
</ol>
</s1>
@@ -37,6 +39,7 @@
<s1 title="Batik Users">
<p><link href="mailto:[EMAIL PROTECTED]">Subscribe</link>
<link href="mailto:[EMAIL PROTECTED]">Unsubscribe</link>
+ <link href="http://nagoya.apache.org/eyebrowse/[EMAIL
PROTECTED]">Archive</link>
</p>
<p>The general Batik list, for problems using Batik, bug reports...
@@ -54,6 +57,7 @@
<s1 title="Batik Dev">
<p><link href="mailto:[EMAIL PROTECTED]">Subscribe</link>
<link href="mailto:[EMAIL PROTECTED]">Unsubscribe</link>
+ <link href="http://nagoya.apache.org/eyebrowse/[EMAIL
PROTECTED]">Archive</link>
</p>
<p>This list is for developers <strong>working on</strong> or wanting to work on
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
