Changeset 9160

Timestamp:

2005-02-23T15:22:26+13:00 (19 years ago)

Author:

mdewsnip

Message:

Removed use of a deprecated class.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• gui/ExplodeMetadataPrompt.java (modified) (2 diffs)
• util/XMLTools.java (modified) (2 diffs)

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

@@ -32 +32 @@
 import javax.swing.event.*;
 import javax.swing.text.*;
-import java.io.File;
-import java.io.StringBufferInputStream;
+import java.io.*;
 import java.util.ArrayList;
 
@@ -99 +98 @@
     // we have empty initial values
     String dom_string = "<Options/>";
-    Document doc = XMLTools.parseXML(new StringBufferInputStream(dom_string));
+    Document doc = XMLTools.parseXML(new StringReader(dom_string));
     options = new ScriptOptions(doc.getDocumentElement(), "explode_metadata_database.pl", false);
     

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

@@ -124 +124 @@
     try {
         InputStreamReader isr = new InputStreamReader(xml_input_stream, "UTF-8");
-        Reader r              = new BufferedReader(isr);
-        InputSource isc       = new InputSource(r);
+        Reader xml_reader = new BufferedReader(isr);
+        document = parseXML(xml_reader);
+        isr.close();
+        xml_input_stream.close();
+    }
+    catch (Exception exception) {
+        DebugStream.printStackTrace(exception);
+    }
+
+    return document;
+    }
+
+
+    /** Parse an XML document from a given reader */
+    static public Document parseXML(Reader xml_reader)
+    {
+    Document document = null;
+
+    try {
+        InputSource isc       = new InputSource(xml_reader);
         DOMParser parser      = new DOMParser();
         parser.setFeature("http://xml.org/sax/features/validation", false);
@@ -134 +152 @@
         parser.parse(isc);
         document = parser.getDocument();
-        isr.close();
-        xml_input_stream.close();
     }
     catch (Exception exception) {