Changeset 10202 for trunk/gsdl3

Timestamp:

2005-07-01T16:24:07+12:00 (19 years ago)

Author:

kjdon

Message:

getString now uses a StringBuffer instead of concating lots of Strings

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/util/XMLConverter.java (modified) (10 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/util/XMLConverter.java

@@ -85 +85 @@
         this.parser.parse(xml_source);
         Document doc = this.parser.getDocument();
+        
         return doc;
         
@@ -141 +142 @@
     {
     outputEscaping = true;
-    return getString(xmlNode, 0, false);
+    StringBuffer xmlRepresentation = new StringBuffer();
+    getString(xmlNode, xmlRepresentation, 0, false);
+    return xmlRepresentation.toString();
     }
 
@@ -150 +153 @@
     
     outputEscaping = true;
-    return getString(xmlNode, 0, true);
-    }
-
-    private String getString(Node xmlNode, int depth, boolean pretty)
+    StringBuffer xmlRepresentation = new StringBuffer();
+    getString(xmlNode, xmlRepresentation, 0, true);
+    return xmlRepresentation.toString();
+    }
+
+    private void getString(Node xmlNode, StringBuffer xmlRepresentation, 
+                 int depth, boolean pretty)
     {
-    String xmlRepresentation = "";
-
-    if (xmlNode == null)
-        return "<null>";
+    
+    if (xmlNode == null) {
+        xmlRepresentation.append("<null>");
+        return;
+    }
 
     short nodeType = xmlNode.getNodeType();
@@ -164 +171 @@
 
     if (nodeType == Node.DOCUMENT_NODE) {
-        return getString(((Document)xmlNode).getDocumentElement(), depth, pretty);
+        getString(((Document)xmlNode).getDocumentElement(), xmlRepresentation, depth, pretty);
+        return;
     }
     // Handle Element nodes
     if (nodeType == Node.ELEMENT_NODE) {
         if (pretty) {
-        xmlRepresentation += "\n";
+        xmlRepresentation.append("\n");
         for (int i = 0; i < depth; i++) {
-            xmlRepresentation += "  ";
+            xmlRepresentation.append("  ");
         }
         }
 
         // Write opening tag
-        xmlRepresentation += "<" + nodeName;
+        xmlRepresentation.append("<");
+        xmlRepresentation.append(nodeName);
         
         // Write the node attributes
@@ -182 +191 @@
         for (int i = 0; i < nodeAttributes.getLength(); i++) {
         Node attribute = nodeAttributes.item(i);
-        xmlRepresentation += " " + attribute.getNodeName() + "=";
-        xmlRepresentation += "\"" + attribute.getNodeValue() + "\"";
+        xmlRepresentation.append(" ");
+        xmlRepresentation.append(attribute.getNodeName());
+        xmlRepresentation.append("=\"");
+        xmlRepresentation.append(attribute.getNodeValue());
+        xmlRepresentation.append("\"");
         }
 
@@ -194 +206 @@
         // but this causes problems with the display of links (the link text
         // will contain a newline character, which is displayed badly).
-        xmlRepresentation += " />";
-        return xmlRepresentation;
+        xmlRepresentation.append(" />");
+        return;
         }
         
         // Close the opening tag
-        xmlRepresentation += ">";
+        xmlRepresentation.append(">");
         
         // Apply recursively to the children of this node
@@ -211 +223 @@
             do_pretty=false; // if there is a text node amongst the children, do teh following nodes in non-pretty mode - hope this doesn't stuff up something else
         }
-        xmlRepresentation += getString(children.item(i), depth + 1, do_pretty);
+        getString(children.item(i), xmlRepresentation, depth + 1, do_pretty);
         }
         
         // Write closing tag
         if (pretty) {
-        if (xmlRepresentation.endsWith("\n")) {
+        if (xmlRepresentation.charAt(xmlRepresentation.length()-1) == '\n') {
             for (int i = 0; i < depth; i++)
-            xmlRepresentation += "  ";
+            xmlRepresentation.append("  ");
         }
         }
-        xmlRepresentation += "</" + nodeName + ">";
+        xmlRepresentation.append("</");
+        xmlRepresentation.append(nodeName);
+        xmlRepresentation.append(">");
         if (pretty) {
-        xmlRepresentation += "\n";
+        xmlRepresentation.append("\n");
         }
     }
@@ -242 +256 @@
         // Remove any control-C characters
         text = text.replaceAll("" + (char) 3, "");
-        xmlRepresentation += text;
+        xmlRepresentation.append(text);
     }
 
@@ -260 +274 @@
     else if (nodeType == Node.COMMENT_NODE) {
         String text = xmlNode.getNodeValue();
-        xmlRepresentation += "<!-- "+text+" -->";
+        xmlRepresentation.append("<!-- ");
+        xmlRepresentation.append(text);
+        xmlRepresentation.append(" -->");
     }
         
@@ -270 +286 @@
     }
 
-    return xmlRepresentation;
+    return;
     }