Changeset 13738

Timestamp:

2007-01-23T12:17:09+13:00 (17 years ago)

Author:

mdewsnip

Message:

Tidied up the loadArguments function in ScriptOptions in preparation for removing the code that gets/saves the script options in the configuration file.

File:

• trunk/gli/src/org/greenstone/gatherer/collection/ScriptOptions.java (modified) (3 diffs)

trunk/gli/src/org/greenstone/gatherer/collection/ScriptOptions.java

@@ -283 +283 @@
 
 
-    private Element loadArguments(String filename, String lang) {
-    Element arguments_element = null;
-    InputStream input_stream = null;
-
+    private Element loadArguments(String filename, String lang)
+    {
     // Run the required program.
     try {
         Document document;
+
         if (Gatherer.isGsdlRemote) {
         String script_output = RemoteGreenstoneServer.getScriptOptions(filename, "");
@@ -316 +315 @@
         Runtime runtime = Runtime.getRuntime();
         Process process = runtime.exec(args);
-
-        input_stream = process.getErrorStream();
-        document = XMLTools.parseXML(input_stream);
-        }
-
-        arguments_element = document.getDocumentElement();
+        document = XMLTools.parseXML(process.getErrorStream());
+        }
+
+        return document.getDocumentElement();
     }
     catch (Exception error) {
@@ -327 +324 @@
         DebugStream.printStackTrace(error);
     }
-    return arguments_element;
-    }
-
+
+    return null;
+    }
 }