Changeset 8231 for trunk/gli/src/org/greenstone/gatherer/collection/BuildOptions.java

Timestamp:

2004-10-07T16:44:32+13:00 (20 years ago)

Author:

mdewsnip

Message:

Replaced all "Gatherer.config" with "Configuration".

File:

• trunk/gli/src/org/greenstone/gatherer/collection/BuildOptions.java (modified) (5 diffs)

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

@@ -6 +6 @@
 import java.util.*;
 import org.apache.xerces.parsers.DOMParser;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.cdm.Argument;
@@ -45 +46 @@
     public BuildOptions(Element build_values_element, Element import_values_element) {
     // first check the saved arguments language
-    String interface_lang = Gatherer.config.getLanguage();
-    String args_lang = Gatherer.config.getArgumentsLanguage();
+    String interface_lang = Configuration.getLanguage();
+    String args_lang = Configuration.getArgumentsLanguage();
     if (interface_lang.equals(args_lang)) {
         // Try to retrieve the arguments for import and build.
-        build_arguments_element = Gatherer.config.getArguments("buildcol.pl");
-        import_arguments_element = Gatherer.config.getArguments("import.pl");
+        build_arguments_element = Configuration.getArguments("buildcol.pl");
+        import_arguments_element = Configuration.getArguments("import.pl");
     }
     // If that fails try to reconstruct the arguments
@@ -73 +74 @@
         // By now we should definately have the arguments. However the reason we are here is because they are not stored in the config.xml file, to make sure they are stored now.
         if (used_defaults) {
-        Gatherer.config.setArgumentsLanguage("en");
+        Configuration.setArgumentsLanguage("en");
         } else {
-        Gatherer.config.setArgumentsLanguage(interface_lang);
-        }
-        Gatherer.config.setArguments(build_arguments_element);
-        Gatherer.config.setArguments(import_arguments_element);
+        Configuration.setArgumentsLanguage(interface_lang);
+        }
+        Configuration.setArguments(build_arguments_element);
+        Configuration.setArguments(import_arguments_element);
     }
     else {
@@ -397 +398 @@
         if(Utility.isWindows()) {
             args = new String[6];
-            args[0] = Gatherer.config.perl_path;
+            args[0] = Configuration.perl_path;
             args[1] = "-S";
-            args[2] = Gatherer.config.getScriptPath() + filename;
+            args[2] = Configuration.getScriptPath() + filename;
             args[3] = "-xml";
             args[4] = "-language";
@@ -406 +407 @@
         else {
             args = new String[4];
-            args[0] = Gatherer.config.getScriptPath() + filename;
+            args[0] = Configuration.getScriptPath() + filename;
             args[1] = "-xml";
             args[2] = "-language";