Changeset 11630 for trunk

Timestamp:

2006-04-07T17:38:37+12:00 (18 years ago)

Author:

mdewsnip

Message:

Moved another function out of Utility and into XMLTools.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• cdm/ClassifierManager.java (modified) (1 diff)
• cdm/PluginManager.java (modified) (1 diff)
• util/Utility.java (modified) (1 diff)
• util/XMLTools.java (modified) (1 diff)

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

@@ -333 +333 @@
 
         input_stream = process.getErrorStream();
-        xml = Utility.readXMLStream(input_stream);
+        xml = XMLTools.readXMLStream(input_stream);
         }
 

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

@@ -478 +478 @@
         Process process = runtime.exec(args);
         input_stream = process.getErrorStream();
-        xml = Utility.readXMLStream(input_stream);
+        xml = XMLTools.readXMLStream(input_stream);
         }
 

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

@@ -383 +383 @@
 
 
-    static public StringBuffer readXMLStream(InputStream input_stream)
-    {
-    StringBuffer xml = new StringBuffer("");
-
-    try {
-        InputStreamReader isr = new InputStreamReader(input_stream, "UTF-8");
-        BufferedReader buffered_in = new BufferedReader(isr);
-        
-        String line = "";
-        boolean xml_content = false;
-        while((line = buffered_in.readLine()) != null) {
-        if(xml_content) {
-            xml.append(line);
-            xml.append("\n");
-        }
-        else if(line.trim().startsWith("<?xml")) {
-            xml_content = true;
-            xml.append(line);
-            xml.append("\n");
-        }
-        }
-        buffered_in = null;
-    }
-    catch (Exception error) {
-        System.err.println("Failed when trying to parse XML stream");
-        error.printStackTrace();
-    }
-
-    return xml;
-    }
-
-
     /** I think this works a bit better on Unicode strings. */
     static public String stripNL(String raw_string)

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

@@ -176 +176 @@
 
     return document;
+    }
+
+
+    static public StringBuffer readXMLStream(InputStream input_stream)
+    {
+    StringBuffer xml = new StringBuffer("");
+
+    try {
+        InputStreamReader isr = new InputStreamReader(input_stream, "UTF-8");
+        BufferedReader buffered_in = new BufferedReader(isr);
+
+        String line = "";
+        boolean xml_content = false;
+        while((line = buffered_in.readLine()) != null) {
+        if(xml_content) {
+            xml.append(line);
+            xml.append("\n");
+        }
+        else if(line.trim().startsWith("<?xml")) {
+            xml_content = true;
+            xml.append(line);
+            xml.append("\n");
+        }
+        }
+        buffered_in = null;
+    }
+    catch (Exception error) {
+        System.err.println("Failed when trying to parse XML stream");
+        error.printStackTrace();
+    }
+
+    return xml;
     }