vhardy 02/04/12 09:48:06
Modified: sources/org/apache/batik/bridge
BaseScriptingEnvironment.java
ScriptingEnvironment.java
Log:
Fixed type attribute default setting on script tag
Revision Changes Path
1.5 +5 -1
xml-batik/sources/org/apache/batik/bridge/BaseScriptingEnvironment.java
Index: BaseScriptingEnvironment.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/bridge/BaseScriptingEnvironment.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BaseScriptingEnvironment.java 10 Apr 2002 16:19:02 -0000 1.4
+++ BaseScriptingEnvironment.java 12 Apr 2002 16:48:06 -0000 1.5
@@ -56,7 +56,7 @@
* This class is the base class for SVG scripting.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Stephane Hillion</a>
- * @version $Id: BaseScriptingEnvironment.java,v 1.4 2002/04/10 16:19:02 hillion
Exp $
+ * @version $Id: BaseScriptingEnvironment.java,v 1.5 2002/04/12 16:48:06 vhardy Exp
$
*/
public class BaseScriptingEnvironment {
@@ -232,6 +232,10 @@
Element script = (Element)scripts.item(i);
String type = script.getAttributeNS
(null, SVGConstants.SVG_TYPE_ATTRIBUTE);
+
+ if (type.length() == 0) {
+ type = "text/ecmascript";
+ }
//
// Java code invocation.
1.22 +10 -12
xml-batik/sources/org/apache/batik/bridge/ScriptingEnvironment.java
Index: ScriptingEnvironment.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/bridge/ScriptingEnvironment.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ScriptingEnvironment.java 12 Apr 2002 16:04:24 -0000 1.21
+++ ScriptingEnvironment.java 12 Apr 2002 16:48:06 -0000 1.22
@@ -46,7 +46,7 @@
* This class contains the informations needed by the SVG scripting.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Stephane Hillion</a>
- * @version $Id: ScriptingEnvironment.java,v 1.21 2002/04/12 16:04:24 hillion Exp $
+ * @version $Id: ScriptingEnvironment.java,v 1.22 2002/04/12 16:48:06 vhardy Exp $
*/
public class ScriptingEnvironment extends BaseScriptingEnvironment {
@@ -642,18 +642,16 @@
DocumentFragment result = null;
try {
Document d = df.createDocument(uri, new StringReader(text));
- for (Node n = d.getDocumentElement().getFirstChild();
- n != null;
- n = n.getNextSibling()) {
- if (n.getNodeType() == n.ELEMENT_NODE) {
- n = doc.importNode(n, true);
- result = doc.createDocumentFragment();
- result.appendChild(n);
- break;
- }
- }
+ result = doc.createDocumentFragment();
+ result.appendChild(doc.importNode(d.getDocumentElement(), true));
} catch (Exception ex) {
- text = "<svg>" + text + "</svg>";
+ StringBuffer sb = new StringBuffer(text.length()
+ + "<svg>".length()
+ + "</svg>".length());
+ sb.append("<svg>");
+ sb.append(text);
+ sb.append("</svg>");
+ text = sb.toString();
try {
Document d = df.createDocument(uri,
new StringReader(text));
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
