Changeset 12620

Timestamp:

2006-08-30T16:59:00+12:00 (18 years ago)

Author:

mdewsnip

Message:

Removed the unnecessary CollectionDesignManager.XMLStringToDOM() function.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• cdm/ClassifierManager.java (modified) (2 diffs)
• cdm/CollectionDesignManager.java (modified) (1 diff)
• cdm/PluginManager.java (modified) (2 diffs)
• gui/DownloadPane.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/cdm/ClassifierManager.java

@@ -335 +335 @@
 
         if (xml.length() > 0) {
-        document = CollectionDesignManager.XMLStringToDOM(xml, classifier);
+        document = XMLTools.parseXML(new StringReader(xml.toString()));
         }
         else {
@@ -426 +426 @@
     private void loadClassifiers(StringBuffer xml)
     {
-    Document document = CollectionDesignManager.XMLStringToDOM(xml, "-listall");
+    Document document = XMLTools.parseXML(new StringReader(xml.toString()));
 
     // Parse XML to build up list of classifier names

trunk/gli/src/org/greenstone/gatherer/cdm/CollectionDesignManager.java

@@ -229 +229 @@
 
 
-    static public Document XMLStringToDOM(StringBuffer xml, String form) 
-    {
-    Document document = null;
-
-    try {
-        // Read the xml from the piped input stream.
-        StringReader xml_sr = new StringReader(xml.toString());
-        InputSource source = new InputSource(xml_sr);
-        DOMParser parser = new DOMParser();
-        parser.parse(source);
-        document = parser.getDocument();
-    }
-    catch (Exception error) {
-        System.err.println("Failed when trying to parse XML stream ");
-        error.printStackTrace();
-    }
-
-    return document;
-    }
-
     public static int getRebuildTypeRequired() {
     return rebuildTypeRequired;

trunk/gli/src/org/greenstone/gatherer/cdm/PluginManager.java

@@ -475 +475 @@
 
         if (xml.length() > 0) {
-        document = CollectionDesignManager.XMLStringToDOM(xml, plugin);
+        document = XMLTools.parseXML(new StringReader(xml.toString()));
         }
         else {
@@ -572 +572 @@
     private void loadPlugins(StringBuffer xml)
     {
-    Document document = CollectionDesignManager.XMLStringToDOM(xml, "-listall");
+    Document document = XMLTools.parseXML(new StringReader(xml.toString()));
 
     // Parse XML to build up list of plugin names

trunk/gli/src/org/greenstone/gatherer/gui/DownloadPane.java

@@ -270 +270 @@
         }
 
-        StringBuffer xml = Utility.readXMLStream(input_stream);
-            document = CollectionDesignManager.XMLStringToDOM(xml,download_name);
+            document = XMLTools.parseXML(input_stream);
     }
     catch (Exception error) {