made the batik pdf transcoder work again

some improvements to svg handling
Submitted by:	Thomas E Deweese <thomas.deweese@kodak.com>


git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@194567 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 29 insertions, 28 deletions

diff --git a/src/org/apache/fop/fo/XMLObj.java b/src/org/apache/fop/fo/XMLObj.java
index db4dd3962..c52006d8a 100644
--- a/src/org/apache/fop/fo/XMLObj.java
+++ b/src/org/apache/fop/fo/XMLObj.java
@@ -53,51 +53,52 @@ public abstract class XMLObj extends FONode {
     public abstract String getNameSpace();
 
     protected static HashMap ns = new HashMap();
+    static {
+        ns.put("xlink", "http://www.w3.org/1999/xlink");
+    }
 
     public void addElement(Document doc, Element parent) {
         this.doc = doc;
         element = doc.createElementNS(getNameSpace(), name);
 
-            for (int count = 0; count < attr.getLength(); count++) {
-                String rf = attr.getValue(count);
-                String qname = attr.getQName(count);
-                if (qname.indexOf(":") == -1) {
-                    element.setAttribute(qname, rf);
+        for (int count = 0; count < attr.getLength(); count++) {
+            String rf = attr.getValue(count);
+            String qname = attr.getQName(count);
+            int idx = qname.indexOf(":");
+            if (idx == -1) {
+                element.setAttribute(qname, rf);
+            } else {
+                String pref = qname.substring(0, idx);
+                String tail = qname.substring(idx + 1);
+                if (pref.equals("xmlns")) {
+                    ns.put(tail, rf);
                 } else {
-                    String pref =
-                        qname.substring(0, qname.indexOf(":"));
-                    if (pref.equals("xmlns")) {
-                        ns.put(qname.substring(qname.indexOf(":")
-                                                      + 1), rf);
-                    }
-                    ns.put("xlink", "http://www.w3.org/1999/xlink");
-                    element.setAttributeNS((String)ns.get(pref),
-                                           qname, rf);
+                    element.setAttributeNS((String)ns.get(pref), tail, rf);
                 }
             }
+        }
         attr = null;
         parent.appendChild(element);
     }
 
     public void buildTopLevel(Document doc, Element svgRoot) {
         // build up the info for the top level element
-            for (int count = 0; count < attr.getLength(); count++) {
-                String rf = attr.getValue(count);
-                String qname = attr.getQName(count);
-                if (qname.indexOf(":") == -1) {
-                    element.setAttribute(qname, rf);
+        for (int count = 0; count < attr.getLength(); count++) {
+            String rf = attr.getValue(count);
+            String qname = attr.getQName(count);
+            int idx = qname.indexOf(":");
+            if (idx == -1) {
+                element.setAttribute(qname, rf);
+            } else {
+                String pref = qname.substring(0, idx);
+                String tail = qname.substring(idx + 1);
+                if (pref.equals("xmlns")) {
+                    ns.put(tail, rf);
                 } else {
-                    String pref =
-                       qname.substring(0, qname.indexOf(":"));
-                    if (pref.equals("xmlns")) {
-                        ns.put(qname.substring(qname.indexOf(":")
-                                                      + 1), rf);
-                    }
-                    ns.put("xlink", "http://www.w3.org/1999/xlink");
-                    element.setAttributeNS((String)ns.get(pref),
-                                           qname, rf);
+                    element.setAttributeNS((String)ns.get(pref), tail, rf);
                 }
             }
+        }
     }
 
     public Document createBasicDocument() {