Changeset 8249

Timestamp:

2004-10-08T14:25:37+13:00 (20 years ago)

Author:

mdewsnip

Message:

Moved the XMLStringToDOM() function from Utility into CollectionDesignManager, as it depends on the Gatherer class.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• cdm/ClassifierManager.java (modified) (2 diffs)
• cdm/CollectionDesignManager.java (modified) (2 diffs)
• cdm/PlugInManager.java (modified) (2 diffs)
• util/Utility.java (modified) (1 diff)

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

@@ -351 +351 @@
 
         StringBuffer xml = Utility.readXMLStream(input_stream);
-        document = Utility.XMLStringToDOM(xml,classifier);
+        document = CollectionDesignManager.XMLStringToDOM(xml,classifier);
     }
     catch (Exception error) {
@@ -436 +436 @@
     {
     StringBuffer xml  = Utility.readXMLStream(input_stream);
-    Document document = Utility.XMLStringToDOM(xml, "-listall");
+    Document document = CollectionDesignManager.XMLStringToDOM(xml, "-listall");
 
     // Parse XML to build up list of classifier names

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

@@ -32 +32 @@
 import javax.swing.*;
 import javax.swing.event.*;
+import org.apache.xerces.parsers.*;
 import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.DebugStream;
+import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.util.GSDLSiteConfig;
 import org.greenstone.gatherer.util.Utility;
+import org.w3c.dom.*;
+import org.xml.sax.*;
 
 /** This manager provides access to submanagers, which in turn provide tools for the designing of Greenstone collections via the information stored in etc/collect.cfg. This class acts as a hub for the managers that handle specific parts of the configuration such as classifiers, format strings and language settings.
@@ -242 +246 @@
 
 
+    static public Document XMLStringToDOM(StringBuffer xml, String form) 
+    {
+    Document document = null;
+
+    // If something has gone horribly wrong then xml will be empty.
+    if(xml.length() > 0) {
+        try {
+        // Then 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();
+        }
+    }
+    else {
+        //DebugStream.println("Zero length argument xml detected for: " + form);
+        String[] margs = new String[1];
+        margs[0] = form;
+        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CDM.PlugInManager.PlugIn_XML_Parse_Failed", margs), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
+    }
+
+    return document;
+    }
+
+
     private class CDMChangeListener
     implements ActionListener, DocumentListener {

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

@@ -403 +403 @@
 
         StringBuffer xml = Utility.readXMLStream(input_stream);
-        document = Utility.XMLStringToDOM(xml,plugin);
+        document = CollectionDesignManager.XMLStringToDOM(xml,plugin);
     }
     catch (Exception error) {
@@ -470 +470 @@
     {
     StringBuffer xml  = Utility.readXMLStream(input_stream);
-    Document document = Utility.XMLStringToDOM(xml, "-listall");
+    Document document = CollectionDesignManager.XMLStringToDOM(xml, "-listall");
 
     // Parse XML to build up list of plugin names

trunk/gli/src/org/greenstone/gatherer/util/Utility.java

@@ -1410 +1410 @@
 
 
-    static public Document XMLStringToDOM(StringBuffer xml, String form) 
-    {
-    Document document = null;
-
-    // If something has gone horribly wrong then xml will be empty.
-    if(xml.length() > 0) {
-        try {
-        // Then 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();
-        }
-    }
-    else {
-        //DebugStream.println("Zero length argument xml detected for: " + form);
-        String[] margs = new String[1];
-        margs[0] = form;
-        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CDM.PlugInManager.PlugIn_XML_Parse_Failed", margs), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
-    }
-
-    return document;
-    }
-
-
-
     /** Method to spread out a line of text so that is is justified to the given width, by attempting to widen white-spacing in a balanced way.
      * @param original The <strong>String</strong> to justify.