Changeset 8231

Timestamp:

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

Author:

mdewsnip

Message:

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

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• Configuration.java (modified) (2 diffs)
• Gatherer.java (modified) (2 diffs)
• WGet.java (modified) (1 diff)
• cdm/ArgumentConfiguration.java (modified) (6 diffs)
• cdm/ClassifierManager.java (modified) (6 diffs)
• cdm/CollectionConfiguration.java (modified) (3 diffs)
• cdm/CollectionDesignManager.java (modified) (2 diffs)
• cdm/CollectionMeta.java (modified) (1 diff)
• cdm/CollectionMetaManager.java (modified) (2 diffs)
• cdm/FormatManager.java (modified) (3 diffs)
• cdm/GeneralManager.java (modified) (6 diffs)
• cdm/IndexManager.java (modified) (3 diffs)
• cdm/LanguageManager.java (modified) (3 diffs)
• cdm/MetadataSetView.java (modified) (2 diffs)
• cdm/PlugInManager.java (modified) (8 diffs)
• cdm/SearchTypeManager.java (modified) (2 diffs)
• cdm/SubcollectionIndexManager.java (modified) (2 diffs)
• cdm/SubcollectionManager.java (modified) (3 diffs)
• cdm/SuperCollectionManager.java (modified) (3 diffs)
• cdm/TranslationView.java (modified) (9 diffs)
• collection/BuildOptions.java (modified) (5 diffs)
• collection/Collection.java (modified) (3 diffs)
• collection/CollectionManager.java (modified) (33 diffs)
• collection/DeleteCollectionPrompt.java (modified) (6 diffs)
• collection/DownloadJob.java (modified) (3 diffs)
• collection/ExportCollectionPrompt.java (modified) (7 diffs)
• collection/SaveCollectionTask.java (modified) (2 diffs)
• file/FileAssociationManager.java (modified) (4 diffs)
• file/FileNode.java (modified) (3 diffs)
• file/FileQueue.java (modified) (3 diffs)
• file/RecycleBin.java (modified) (4 diffs)
• gui/CreatePane.java (modified) (12 diffs)
• gui/EditorDialog.java (modified) (2 diffs)
• gui/EnrichPane.java (modified) (6 diffs)
• gui/ExternalCollectionPrompt.java (modified) (3 diffs)
• gui/FileAssociationDialog.java (modified) (2 diffs)
• gui/GComboBox.java (modified) (3 diffs)
• gui/GUIManager.java (modified) (10 diffs)
• gui/GatherPane.java (modified) (8 diffs)
• gui/LockFileDialog.java (modified) (5 diffs)
• gui/MenuBar.java (modified) (2 diffs)
• gui/MetaEditPrompt.java (modified) (5 diffs)
• gui/MetadataElementListCellRenderer.java (modified) (2 diffs)
• gui/MetadataImportMappingPrompt.java (modified) (3 diffs)
• gui/MetadataValueTableCellRenderer.java (modified) (3 diffs)
• gui/MirrorPane.java (modified) (2 diffs)
• gui/NewCollectionDetailsPrompt.java (modified) (8 diffs)
• gui/NewCollectionMetadataPrompt.java (modified) (3 diffs)
• gui/NewFolderPrompt.java (modified) (2 diffs)
• gui/NewMetaSetPrompt.java (modified) (5 diffs)
• gui/OptionsPane.java (modified) (5 diffs)
• gui/Preferences.java (modified) (23 diffs)
• gui/PreviewCommandDialog.java (modified) (2 diffs)
• gui/SimpleOpenCollectionDialog.java (modified) (4 diffs)
• gui/WarningDialog.java (modified) (4 diffs)
• gui/metaaudit/AutofilterDialog.java (modified) (2 diffs)
• gui/metaaudit/MetaAuditFrame.java (modified) (2 diffs)
• gui/table/GTableModel.java (modified) (1 diff)
• gui/table/TableCellRenderer.java (modified) (2 diffs)
• gui/tree/DragTreeCellRenderer.java (modified) (1 diff)
• gui/tree/WorkspaceTree.java (modified) (2 diffs)
• mem/MEMNode.java (modified) (1 diff)
• mem/MetadataEditorManager.java (modified) (26 diffs)
• metadata/MetadataAuditTableModel.java (modified) (1 diff)
• metadata/MetadataElement.java (modified) (2 diffs)
• metadata/MetadataValueTableModel.java (modified) (1 diff)
• msm/ExportMDSPrompt.java (modified) (2 diffs)
• msm/GreenstoneArchiveParser.java (modified) (1 diff)
• msm/MSMPrompt.java (modified) (5 diffs)
• msm/MSMUtils.java (modified) (3 diffs)
• msm/MetadataSet.java (modified) (4 diffs)
• msm/MetadataSetManager.java (modified) (1 diff)
• shell/GBuildProgressMonitor.java (modified) (8 diffs)
• shell/GImportProgressMonitor.java (modified) (7 diffs)
• shell/GShell.java (modified) (2 diffs)
• util/Utility.java (modified) (7 diffs)

trunk/gli/src/org/greenstone/gatherer/Configuration.java

@@ -1 +1 @@
 /**
  *#########################################################################
- *
+ * Configuration
  * A component of the Gatherer application, part of the Greenstone digital
  * library suite from the New Zealand Digital Library Project at the
@@ -132 +132 @@
     static private String wget_version_str = StaticStrings.NO_WGET_STR;
 
-    public URL exec_address = null;
+    static public URL exec_address = null;
 
     /** Constructor.

trunk/gli/src/org/greenstone/gatherer/Gatherer.java

@@ -589 +589 @@
     }
     WarningDialog dialog = new WarningDialog(message_name, "general.exec_address" );
-    dialog.setValueField(new URLField(Gatherer.config.getColor("coloring.editable_foreground", false), Gatherer.config.getColor("coloring.editable_background", false), Gatherer.config.getColor("coloring.error_foreground", false), Gatherer.config.getColor("coloring.error_background", false)));
+    dialog.setValueField(new URLField(Configuration.getColor("coloring.editable_foreground", false), Configuration.getColor("coloring.editable_background", false), Configuration.getColor("coloring.error_foreground", false), Configuration.getColor("coloring.error_background", false)));
     dialog.display();
     dialog.dispose();
     dialog = null;
 
-    String library_path_string = Gatherer.config.getString("general.exec_address", true);
+    String library_path_string = Configuration.getString("general.exec_address", true);
     if (!library_path_string.equals("")) {
         try {
-        Gatherer.config.exec_address = new URL(library_path_string);
+        Configuration.exec_address = new URL(library_path_string);
         }
         catch (MalformedURLException error) {
@@ -673 +673 @@
     static public void setProxy() {
     try {// Can throw several exceptions
-        if(Gatherer.config.get("general.use_proxy", true)) {
+        if(Configuration.get("general.use_proxy", true)) {
         System.setProperty("http.proxyType", "4");
-        System.setProperty("http.proxyHost", Gatherer.config.getString("general.proxy_host", true));
-        System.setProperty("http.proxyPort", Gatherer.config.getString("general.proxy_port", true));
+        System.setProperty("http.proxyHost", Configuration.getString("general.proxy_host", true));
+        System.setProperty("http.proxyPort", Configuration.getString("general.proxy_port", true));
         System.setProperty("http.proxySet", "true");
         } else {

trunk/gli/src/org/greenstone/gatherer/WGet.java

@@ -261 +261 @@
     Gatherer.println("About to create a new job");
 
-    DownloadJob new_job = new DownloadJob(Gatherer.config.get("mirroring.debug", false), no_parents, other_hosts, page_requisites, Gatherer.config.get("mirroring.quiet", false), url, depth, destination, Gatherer.config.proxy_pass, Gatherer.config.proxy_user, this, simple);
+    DownloadJob new_job = new DownloadJob(Configuration.get("mirroring.debug", false), no_parents, other_hosts, page_requisites, Configuration.get("mirroring.quiet", false), url, depth, destination, Configuration.proxy_pass, Configuration.proxy_user, this, simple);
 
     // Tell it to run as soon as possible

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

@@ -156 +156 @@
 
     // Display on screen.
-    Dimension screen_size = Gatherer.config.screen_size;
+    Dimension screen_size = Configuration.screen_size;
     setLocation((screen_size.width - SIZE.width) / 2, (screen_size.height - SIZE.height) / 2);
     screen_size = null;
@@ -215 +215 @@
     inner_pane.setBackground(color);
     JLabel header_label = new JLabel("<html><strong>" + name + "</strong></html>");
-    header_label.setBackground(Gatherer.config.getColor("coloring.collection_heading_background", false));
+    header_label.setBackground(Configuration.getColor("coloring.collection_heading_background", false));
     header_label.setHorizontalAlignment(JLabel.CENTER);
     header_label.setOpaque(true);
@@ -235 +235 @@
     ArrayList arguments = data.getArguments(true, false);
     int total_height = 250;
-    int mode = Gatherer.config.getMode();
+    int mode = Configuration.getMode();
     for(int i = 0; i < arguments.size(); i++) {
         Argument argument = (Argument) arguments.get(i);
@@ -246 +246 @@
     // now add in the custom args bit
     coloured = !coloured;
-    Color color = (coloured ? Gatherer.config.getColor("coloring.collection_heading_background", false) : Gatherer.config.getColor("coloring.collection_tree_background", false));
+    Color color = (coloured ? Configuration.getColor("coloring.collection_heading_background", false) : Configuration.getColor("coloring.collection_tree_background", false));
     addHeader(Dictionary.get("CDM.ArgumentConfiguration.Custom_Header"), color);
     custom_pane.setBackground(color);
@@ -264 +264 @@
     private Argument argument = null;
 
-    private Color colour_one = Gatherer.config.getColor("coloring.collection_heading_background", false);
-    private Color colour_two = Gatherer.config.getColor("coloring.collection_tree_background", false);
+    private Color colour_one = Configuration.getColor("coloring.collection_heading_background", false);
+    private Color colour_two = Configuration.getColor("coloring.collection_tree_background", false);
     /** One of a possible two buttons available for adding to this control. */
     private JButton one = null;
@@ -449 +449 @@
 
         // Editable for advanced modes (allows things like dc.Title,ex.Title)
-        if (Gatherer.config.getMode() > Configuration.ASSISTANT_MODE) {
+        if (Configuration.getMode() > Configuration.ASSISTANT_MODE) {
             ((JComboBox) value).setEditable(true);
         }

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

@@ -36 +36 @@
 import javax.swing.event.*;
 import org.apache.xerces.parsers.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
@@ -327 +328 @@
         if(Utility.isWindows()) {
             args = new String[6];
-            if(Gatherer.config.perl_path != null) {
-            args[0] = Gatherer.config.perl_path;
+            if(Configuration.perl_path != null) {
+            args[0] = Configuration.perl_path;
             }
             else {
             args[0] = "Perl.exe";
             }
-            args[1] = Gatherer.config.gsdl_path + "bin" + File.separator + "script" + File.separator + "classinfo.pl";
+            args[1] = Configuration.gsdl_path + "bin" + File.separator + "script" + File.separator + "classinfo.pl";
             args[2] = "-xml";
             args[3] = "-language";
@@ -386 +387 @@
         if (Gatherer.isGsdlRemote) {
 
-        String lang = Gatherer.config.getLanguage();
+        String lang = Configuration.getLanguage();
 
         String launch  = Gatherer.cgiBase + "launch";
@@ -410 +411 @@
 
         // Retrieve the gsdl home directory...
-        String directory = Gatherer.config.gsdl_path;
+        String directory = Configuration.gsdl_path;
         directory = directory + "perllib" + File.separator + "classify" + File.separator;
 
-        String current_lang = Gatherer.config.getLanguage();
+        String current_lang = Configuration.getLanguage();
         File files[] = (new File(directory)).listFiles();
         if(files != null) {
@@ -465 +466 @@
     }
 
-    String current_lang = Gatherer.config.getLanguage();
+    String current_lang = Configuration.getLanguage();
     if (num_classifiers>0) {
         // Create a progress indicator.
@@ -659 +660 @@
         ClassifierComboboxListener ccl = new ClassifierComboboxListener();
         classifier = new GComboBox(getAvailable());
-        classifier.setBackgroundNonSelectionColor(Gatherer.config.getColor("coloring.editable_background", false));
-        classifier.setBackgroundSelectionColor(Gatherer.config.getColor("coloring.collection_selection_background", false));
+        classifier.setBackgroundNonSelectionColor(Configuration.getColor("coloring.editable_background", false));
+        classifier.setBackgroundSelectionColor(Configuration.getColor("coloring.collection_selection_background", false));
         classifier.setEditable(true);
-        classifier.setTextNonSelectionColor(Gatherer.config.getColor("coloring.workspace_tree_foreground", false));
-        classifier.setTextSelectionColor(Gatherer.config.getColor("coloring.collection_selection_foreground", false));
+        classifier.setTextNonSelectionColor(Configuration.getColor("coloring.workspace_tree_foreground", false));
+        classifier.setTextSelectionColor(Configuration.getColor("coloring.collection_selection_foreground", false));
         if(classifier.getItemCount() > 0) {
         classifier.setSelectedIndex(0);

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

@@ -32 +32 @@
 import java.util.*;
 import javax.swing.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.cdm.CommandTokenizer;
@@ -1091 +1092 @@
             String name = (String) acquired_collectionmeta_names.get(y);
             String value = name.substring(1);
-            Gatherer.println("G2.39 CollectMeta missing. Adding: " + name + " [l=" + Gatherer.config.getLanguage() + "] \"" + value + "\"");
+            Gatherer.println("G2.39 CollectMeta missing. Adding: " + name + " [l=" + Configuration.getLanguage() + "] \"" + value + "\"");
             Element element = document.createElement(COLLECTIONMETADATA_ELEMENT);
             element.setAttribute(NAME_ATTRIBUTE, name);
-            element.setAttribute(LANGUAGE_ATTRIBUTE, Gatherer.config.getLanguage());
+            element.setAttribute(LANGUAGE_ATTRIBUTE, Configuration.getLanguage());
             element.setAttribute(ASSIGNED_ATTRIBUTE, TRUE_STR);
             XMLTools.setValue(element, value);
@@ -1367 +1368 @@
         String value_str = tokenizer.nextToken();
         if(name_str != null && value_str != null) {
-        String language_str = Gatherer.config.getLanguage();
+        String language_str = Configuration.getLanguage();
         // Check if the value string is actually a language string
         if(value_str.startsWith(LBRACKET_CHARACTER) && value_str.endsWith(RBRACKET_CHARACTER)) {

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

@@ -32 +32 @@
 import javax.swing.*;
 import javax.swing.event.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.cdm.ClassifierManager;
@@ -215 +216 @@
       boolean formats_changed = format_manager.formatsChanged();
 
-      if(formats_changed && Gatherer.c_man.built() && Gatherer.config.exec_file != null) {
+      if(formats_changed && Gatherer.c_man.built() && Configuration.exec_file != null) {
       // Release the collection
       Gatherer.self.configServer(GSDLSiteConfig.RELEASE_COMMAND + col_name);

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

@@ -65 +65 @@
     element = CollectionDesignManager.collect_config.document.createElement(StaticStrings.COLLECTIONMETADATA_ELEMENT);
     element.setAttribute(StaticStrings.NAME_ATTRIBUTE, name);
-    element.setAttribute(StaticStrings.LANGUAGE_ATTRIBUTE, Gatherer.config.getLanguage());
+    element.setAttribute(StaticStrings.LANGUAGE_ATTRIBUTE, Configuration.getLanguage());
     element.setAttribute(StaticStrings.ASSIGNED_ATTRIBUTE, StaticStrings.FALSE_STR);
     }

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

@@ -32 +32 @@
 import javax.swing.*;
 import javax.swing.event.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.cdm.CollectionDesignManager;
@@ -124 +125 @@
     for(int i = 0; i < size; i++) {
         CollectionMeta metadatum = (CollectionMeta) getElementAt(i);
-        if(metadatum.getName().equals(name) && metadatum.getLanguage().equals(Gatherer.config.getLanguage())) {
+        if(metadatum.getName().equals(name) && metadatum.getLanguage().equals(Configuration.getLanguage())) {
         Gatherer.println("Found '" + metadatum + "'");
         return metadatum;

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

@@ -37 +37 @@
 import javax.swing.*;
 import javax.swing.event.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
@@ -274 +275 @@
 
         instructions_textarea = new JTextArea();
-        instructions_textarea.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+        instructions_textarea.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
         instructions_textarea.setEditable(false);
         instructions_textarea.setLineWrap(true);
@@ -323 +324 @@
         
         editor_textarea = new JTextArea();
-        editor_textarea.setBackground(Gatherer.config.getColor("coloring.editable_background", false));
+        editor_textarea.setBackground(Configuration.getColor("coloring.editable_background", false));
         editor_textarea.setCaretPosition(0);
         editor_textarea.setLineWrap(true);

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

@@ -213 +213 @@
         Dictionary.registerText(creator_label, "CDM.General.Email.Creator");
 
-        creator_emailfield = new EmailField(Gatherer.config.getColor("coloring.error_background", false));
+        creator_emailfield = new EmailField(Configuration.getColor("coloring.error_background", false));
         Dictionary.registerTooltip(creator_emailfield, "CDM.General.Email.Creator_Tooltip");
 
@@ -219 +219 @@
         Dictionary.registerText(maintainer_label, "CDM.General.Email.Maintainer");
 
-        maintainer_emailfield = new EmailField(Gatherer.config.getColor("coloring.error_background", false));
+        maintainer_emailfield = new EmailField(Configuration.getColor("coloring.error_background", false));
         Dictionary.registerTooltip(maintainer_emailfield, "CDM.General.Email.Maintainer_Tooltip");
 
@@ -230 +230 @@
         JTextField short_name_textfield = new JTextField(Gatherer.c_man.getCollection().getName());
         short_name_textfield.setEditable(false);
-        short_name_textfield.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+        short_name_textfield.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
         JPanel icon_panel = new JPanel();
         icon_label = new JLabel();
@@ -259 +259 @@
         Dictionary.registerText(description_label, "CDM.General.Collection_Extra");
         description_textarea = new JTextArea();
-        description_textarea.setBackground(Gatherer.config.getColor("coloring.editable_background", false));
+        description_textarea.setBackground(Configuration.getColor("coloring.editable_background", false));
         Dictionary.registerTooltip(description_textarea, "CDM.General.Collection_Extra_Tooltip");
         // Connection
@@ -423 +423 @@
         creator_collectionmeta.setValue(creator_email_str);
         // If the email is currently empty, store this email
-        if(Gatherer.config.getEmail() == null) {
-            Gatherer.config.setEmail(creator_email_str); // Store the email address in the configuration
+        if(Configuration.getEmail() == null) {
+            Configuration.setEmail(creator_email_str); // Store the email address in the configuration
         }
         collection_extra_collectionmeta.setValue(description_textarea.getText());
@@ -579 +579 @@
     public DesignTree() {
         super();
-        resetModel(Gatherer.config.getMode());
+        resetModel(Configuration.getMode());
         expandRow(0);
         setRootVisible(false);

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

@@ -32 +32 @@
 import javax.swing.*;
 import javax.swing.event.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
@@ -958 +959 @@
         index_combobox = new GComboBox();
         index_combobox.setPreferredSize(FIELD_SIZE);
-        index_combobox.setBackgroundNonSelectionColor(Gatherer.config.getColor("coloring.editable_background", false));
-        index_combobox.setBackgroundSelectionColor(Gatherer.config.getColor("coloring.collection_selection_background", false));
+        index_combobox.setBackgroundNonSelectionColor(Configuration.getColor("coloring.editable_background", false));
+        index_combobox.setBackgroundSelectionColor(Configuration.getColor("coloring.collection_selection_background", false));
         index_combobox.setEditable(true);
-        index_combobox.setTextNonSelectionColor(Gatherer.config.getColor("coloring.workspace_tree_foreground", false));
-        index_combobox.setTextSelectionColor(Gatherer.config.getColor("coloring.collection_selection_foreground", false));
+        index_combobox.setTextNonSelectionColor(Configuration.getColor("coloring.workspace_tree_foreground", false));
+        index_combobox.setTextSelectionColor(Configuration.getColor("coloring.collection_selection_foreground", false));
         Dictionary.registerTooltip(index_combobox, "CDM.IndexManager.MGPP.Index_Tooltip");
 
@@ -1090 +1091 @@
         level_combobox = new GComboBox(Index.LEVEL);
         level_combobox.setPreferredSize(FIELD_SIZE);
-        level_combobox.setBackgroundNonSelectionColor(Gatherer.config.getColor("coloring.editable_background", false));
-        level_combobox.setBackgroundSelectionColor(Gatherer.config.getColor("coloring.collection_selection_background", false));
+        level_combobox.setBackgroundNonSelectionColor(Configuration.getColor("coloring.editable_background", false));
+        level_combobox.setBackgroundSelectionColor(Configuration.getColor("coloring.collection_selection_background", false));
         level_combobox.setEditable(true);
-        level_combobox.setTextNonSelectionColor(Gatherer.config.getColor("coloring.workspace_tree_foreground", false));
-        level_combobox.setTextSelectionColor(Gatherer.config.getColor("coloring.collection_selection_foreground", false));
+        level_combobox.setTextNonSelectionColor(Configuration.getColor("coloring.workspace_tree_foreground", false));
+        level_combobox.setTextSelectionColor(Configuration.getColor("coloring.collection_selection_foreground", false));
         Dictionary.registerTooltip(level_combobox, "CDM.IndexManager.Level_Tooltip");
 

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

@@ -38 +38 @@
 import javax.swing.*;
 import javax.swing.event.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
@@ -293 +294 @@
         }
         default_language_field.setPreferredSize(COMPONENT_SIZE);
-        default_language_field.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+        default_language_field.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
         default_language_field.setEditable(false);
         JPanel control_panel = new JPanel();
@@ -302 +303 @@
         selector_combobox = new JComboBox(getLanguageCodes().toArray());
         selector_combobox.setPreferredSize(COMPONENT_SIZE);
-        selector_combobox.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+        selector_combobox.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
         selector_combobox.setRenderer(new LanguageListCellRenderer());
         Dictionary.registerTooltip(selector_combobox, "CDM.LanguageManager.Selector_Tooltip");

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

@@ -32 +32 @@
 import javax.swing.*;
 import javax.swing.event.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
@@ -208 +209 @@
         header_pane = new JPanel();
         instructions = new JTextArea();
-        instructions.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+        instructions.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
         instructions.setEditable(false);
         instructions.setLineWrap(true);

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

@@ -380 +380 @@
         if(Utility.isWindows()) {
             args = new String[6];
-            if(Gatherer.config.perl_path != null) {
-            args[0] = Gatherer.config.perl_path;
+            if(Configuration.perl_path != null) {
+            args[0] = Configuration.perl_path;
             }
             else {
             args[0] = "Perl.exe";
             }
-            args[1] = Gatherer.config.gsdl_path + "bin" + File.separator + "script" + File.separator + "pluginfo.pl";
+            args[1] = Configuration.gsdl_path + "bin" + File.separator + "script" + File.separator + "pluginfo.pl";
             args[2] = "-xml";
             args[3] = "-language";
@@ -436 +436 @@
         if (Gatherer.isGsdlRemote) {
 
-        String lang = Gatherer.config.getLanguage();
+        String lang = Configuration.getLanguage();
 
         String launch  = Gatherer.cgiBase + "launch";
@@ -459 +459 @@
         else {
         // Retrieve the gsdl home directory...
-        String directory = Gatherer.config.gsdl_path;
+        String directory = Configuration.gsdl_path;
         directory = directory + "perllib" + File.separator + "plugins" + File.separator;
         loadPlugIns(new File(directory));
@@ -503 +503 @@
     boolean is_mac = Utility.isMac();
 
-    String current_lang = Gatherer.config.getLanguage();
+    String current_lang = Configuration.getLanguage();
     if (num_plugins>0) {
         // Create a progress indicator.
@@ -532 +532 @@
     boolean is_windows = Utility.isWindows();
     boolean is_mac = Utility.isMac();
-    String current_lang = Gatherer.config.getLanguage();
+    String current_lang = Configuration.getLanguage();
     if(files != null) {
         // Create a progress indicator.
@@ -729 +729 @@
 
         instructions = new JTextArea();
-        instructions.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+        instructions.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
         instructions.setEditable(false);
         instructions.setLineWrap(true);
@@ -752 +752 @@
         PlugInComboboxListener picl = new PlugInComboboxListener();
         plugin = new GComboBox(getAvailable());
-        plugin.setBackgroundNonSelectionColor(Gatherer.config.getColor("coloring.editable_background", false));
-        plugin.setBackgroundSelectionColor(Gatherer.config.getColor("coloring.collection_selection_background", false));
+        plugin.setBackgroundNonSelectionColor(Configuration.getColor("coloring.editable_background", false));
+        plugin.setBackgroundSelectionColor(Configuration.getColor("coloring.collection_selection_background", false));
         plugin.setEditable(true);
-        plugin.setTextNonSelectionColor(Gatherer.config.getColor("coloring.workspace_tree_foreground", false));
-        plugin.setTextSelectionColor(Gatherer.config.getColor("coloring.collection_selection_foreground", false));
+        plugin.setTextNonSelectionColor(Configuration.getColor("coloring.workspace_tree_foreground", false));
+        plugin.setTextSelectionColor(Configuration.getColor("coloring.collection_selection_foreground", false));
         picl.itemStateChanged(new ItemEvent(plugin, 0, null, ItemEvent.SELECTED));
 
@@ -818 +818 @@
         plugin_list_pane.add(plugin_list_label, BorderLayout.NORTH);
         plugin_list_pane.add(new JScrollPane(plugin_list), BorderLayout.CENTER);
-        modeChanged(Gatherer.config.getMode()); // Whether the movement buttons are visible is mode dependant
+        modeChanged(Configuration.getMode()); // Whether the movement buttons are visible is mode dependant
 
         plugin_label.setBorder(BorderFactory.createEmptyBorder(0,0,5,0));

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

@@ -36 +36 @@
 import javax.swing.*;
 import javax.swing.event.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
@@ -210 +211 @@
         search_type_combobox = new GComboBox(SEARCH_TYPES);
         search_type_combobox.setPreferredSize(Utility.LABEL_SIZE);
-        search_type_combobox.setBackgroundNonSelectionColor(Gatherer.config.getColor("coloring.editable_background", false));
-        search_type_combobox.setBackgroundSelectionColor(Gatherer.config.getColor("coloring.collection_selection_background", false));
+        search_type_combobox.setBackgroundNonSelectionColor(Configuration.getColor("coloring.editable_background", false));
+        search_type_combobox.setBackgroundSelectionColor(Configuration.getColor("coloring.collection_selection_background", false));
         search_type_combobox.setEditable(true);
         search_type_combobox.setSelectedIndex(0);
-        search_type_combobox.setTextNonSelectionColor(Gatherer.config.getColor("coloring.workspace_tree_foreground", false));
-        search_type_combobox.setTextSelectionColor(Gatherer.config.getColor("coloring.collection_selection_foreground", false));
+        search_type_combobox.setTextNonSelectionColor(Configuration.getColor("coloring.workspace_tree_foreground", false));
+        search_type_combobox.setTextSelectionColor(Configuration.getColor("coloring.collection_selection_foreground", false));
         Dictionary.registerTooltip(search_type_combobox, "CDM.SearchTypeManager.SearchType_Selection_Tooltip");
 

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

@@ -32 +32 @@
 import javax.swing.*;
 import javax.swing.event.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
@@ -246 +247 @@
         }
         default_value_field.setPreferredSize(Utility.LABEL_SIZE);
-        default_value_field.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+        default_value_field.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
         default_value_field.setEditable(false);
 

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

@@ -218 +218 @@
         JPanel button_pane_1 = new JPanel();
         include_button = new JRadioButton();
-        include_button.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+        include_button.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
         include_button.setMnemonic(KeyEvent.VK_I);
         include_button.setOpaque(false);
         Dictionary.registerText(include_button, "CDM.SubcollectionManager.Include");
         exclude_button = new JRadioButton();
-        exclude_button.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+        exclude_button.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
         exclude_button.setMnemonic(KeyEvent.VK_X);
         exclude_button.setOpaque(false);
@@ -268 +268 @@
         JPanel message_pane = new JPanel();
         String args[] = new String[3];
-        args[0] = Gatherer.config.getModeAsString();
+        args[0] = Configuration.getModeAsString();
         args[1] = Dictionary.get("Preferences.Mode.Systems");
         args[2] = Dictionary.get("Preferences.Mode.Expert");
@@ -347 +347 @@
         border_pane.setBorder(BorderFactory.createEmptyBorder(0,5,5,5));
         border_pane.setLayout(card_layout);
-        if(Gatherer.config.getMode() > Configuration.LIBRARIAN_MODE) {
+        if(Configuration.getMode() > Configuration.LIBRARIAN_MODE) {
         border_pane.add(tabbed_pane, ENABLED_CONTROLS);
         border_pane.add(message_pane, DISABLED_CONTROLS);

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

@@ -32 +32 @@
 import javax.swing.*;
 import javax.swing.event.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
@@ -126 +127 @@
 
         JTextArea instructions = new JTextArea();
-        instructions.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+        instructions.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
         instructions.setCaretPosition(0);
         instructions.setEditable(false);
@@ -193 +194 @@
         File gsdl_collection_directory;
         if (Gatherer.GS3) {
-        gsdl_collection_directory = new File(Utility.getCollectDir(Gatherer.config.gsdl3_path, Gatherer.config.site_name));
+        gsdl_collection_directory = new File(Utility.getCollectDir(Configuration.gsdl3_path, Configuration.site_name));
         } else {
-        gsdl_collection_directory = new File(Utility.getCollectDir(Gatherer.config.gsdl_path));
+        gsdl_collection_directory = new File(Utility.getCollectDir(Configuration.gsdl_path));
         }
         current_coll_name = Gatherer.c_man.getCollection().getName();

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

@@ -33 +33 @@
 import javax.swing.event.*;
 import javax.swing.table.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
@@ -220 +221 @@
         fragment_table = new JTable(fragment_table_model);
         fragment_table.setAutoResizeMode(JTable.AUTO_RESIZE_LAST_COLUMN);
-        fragment_table.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+        fragment_table.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
         fragment_table.setColumnSelectionAllowed(false);
         fragment_table.setDefaultRenderer(Object.class, new FragmentTableRenderer());
@@ -226 +227 @@
 
         JScrollPane table_scroll = new JScrollPane(fragment_table);
-        table_scroll.getViewport().setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+        table_scroll.getViewport().setBackground(Configuration.getColor("coloring.collection_tree_background", false));
         table_scroll.setOpaque(true);
 
@@ -245 +246 @@
         Dictionary.registerText(default_label, "CDM.TranslationManager.Default_Text");
         default_area = new JTextArea();
-        default_area.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+        default_area.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
         default_area.setEditable(false);
         default_area.setLineWrap(true);
@@ -254 +255 @@
         Dictionary.registerText(translation_label, "CDM.TranslationManager.Translation");
         translation_area = new JTextArea();
-        translation_area.setBackground(Gatherer.config.getColor("coloring.disabled", false));
+        translation_area.setBackground(Configuration.getColor("coloring.disabled", false));
         translation_area.setEnabled(false);
         translation_area.setLineWrap(true);
@@ -466 +467 @@
             // Update and enable the text area
             translation_area.setEnabled(true);
-            translation_area.setBackground(Gatherer.config.getColor("coloring.editable_background", false));
+            translation_area.setBackground(Configuration.getColor("coloring.editable_background", false));
             }
             else {
@@ -476 +477 @@
             translation_area.setText("");
             translation_area.setEnabled(false);
-            translation_area.setBackground(Gatherer.config.getColor("coloring.disabled", false));
+            translation_area.setBackground(Configuration.getColor("coloring.disabled", false));
             }
         }
@@ -654 +655 @@
         JComponent component = (JComponent) super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
         if(isSelected) {
-            component.setBackground(Gatherer.config.getColor("coloring.workspace_heading_background", false));
+            component.setBackground(Configuration.getColor("coloring.workspace_heading_background", false));
         }
         else {
-            component.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+            component.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
         }
         return component;
@@ -683 +684 @@
             // Ready the text area
             translation_area.setEnabled(true);
-            translation_area.setBackground(Gatherer.config.getColor("coloring.editable_background", false));
+            translation_area.setBackground(Configuration.getColor("coloring.editable_background", false));
             ignore_event = false;
         }

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";

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

@@ -41 +41 @@
 import javax.swing.*;
 import javax.swing.tree.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.cdm.CollectionDesignManager;
@@ -105 +106 @@
     }
     // Point the Configuration class at our gatherer config arguments.
-    Gatherer.config.setCollectionConfiguration(document);
+    Configuration.setCollectionConfiguration(document);
     // Finally create all of the child managers that are directly dependant on a collection
     build_options = new BuildOptions(getBuildValues(), getImportValues());
@@ -119 +120 @@
     gdm.destroy();
     msm.destroy();
-    Gatherer.config.setCollectionConfiguration(null);
+    Configuration.setCollectionConfiguration(null);
     cdm = null;
     document = null;

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

@@ -44 +44 @@
 import javax.swing.filechooser.FileSystemView;
 import javax.swing.tree.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
@@ -133 +134 @@
     public void addDirectoryMapping(String name, File file) {
     // Update the information stored in the Gatherer config
-    Gatherer.config.addDirectoryMapping(name, file);
+    Configuration.addDirectoryMapping(name, file);
     // Now update the tree
     Gatherer.g_man.refreshWorkspaceTree(WorkspaceTree.FOLDER_SHORTCUTS_CHANGED);
@@ -150 +151 @@
     Gatherer.println("CollectionManager.buildCollection()");
     building = true;
-    String lang = Gatherer.config.getLanguage();
+    String lang = Configuration.getLanguage();
     String collect_dir = getCollectDirectory();
 
@@ -156 +157 @@
     if((Utility.isWindows()) && (!Gatherer.isGsdlRemote)) {
         args = new String[8];
-        args[0] = Gatherer.config.perl_path;
+        args[0] = Configuration.perl_path;
         args[1] = "-S";
-        args[2] = Gatherer.config.getScriptPath() + "buildcol.pl";
+        args[2] = Configuration.getScriptPath() + "buildcol.pl";
         args[3] = "-gli";
         args[4] = "-language";
@@ -167 +168 @@
     else {
         args = new String[6];
-        args[0] = Gatherer.config.getScriptPath() + "buildcol.pl";
+        args[0] = Configuration.getScriptPath() + "buildcol.pl";
         args[1] = "-gli";
         args[2] = "-language";
@@ -219 +220 @@
     String collection_dir;
     if (Gatherer.GS3) {
-        collection_dir = Utility.getCollectionDir(Gatherer.config.gsdl3_path, Gatherer.config.site_name, collection.getName());
+        collection_dir = Utility.getCollectionDir(Configuration.gsdl3_path, Configuration.site_name, collection.getName());
     } else {
-        collection_dir = Utility.getCollectionDir(Gatherer.config.gsdl_path, collection.getName());
+        collection_dir = Utility.getCollectionDir(Configuration.gsdl_path, collection.getName());
 
     }
@@ -233 +234 @@
     collection_model = null;
     // workspace_model = null;
-    Gatherer.config.setCollectionConfiguration(null);
+    Configuration.setCollectionConfiguration(null);
     if (Gatherer.g_man != null) {
         Gatherer.g_man.collectionChanged(false);
@@ -255 +256 @@
     if((Utility.isWindows()) && (!Gatherer.isGsdlRemote)) {
         command = new String[6];
-        command[0] = Gatherer.config.perl_path;
+        command[0] = Configuration.perl_path;
         command[1] = "-S";
-        command[2] = Gatherer.config.getGS3ScriptPath() + "convert_coll_from_gs2.pl";
+        command[2] = Configuration.getGS3ScriptPath() + "convert_coll_from_gs2.pl";
         command[3] = "-collectdir";
         command[4] = collect_dir;
@@ -263 +264 @@
     } else {
         command = new String[4];
-        command[0] = Gatherer.config.getGS3ScriptPath() + "convert_coll_from_gs2.pl";
+        command[0] = Configuration.getGS3ScriptPath() + "convert_coll_from_gs2.pl";
         command[1] = "-collectdir";
         command[2] = collect_dir;
@@ -341 +342 @@
         String a_dir;
         if (Gatherer.GS3) {
-        a_dir = Utility.getCollectionDir(Gatherer.config.gsdl3_path, Gatherer.config.site_name, name);
+        a_dir = Utility.getCollectionDir(Configuration.gsdl3_path, Configuration.site_name, name);
         } else {
-        a_dir = Utility.getCollectionDir(Gatherer.config.gsdl_path, name);
+        a_dir = Utility.getCollectionDir(Configuration.gsdl_path, name);
         }
         File config_file = new File(Utility.getConfigFile(a_dir));
@@ -599 +600 @@
     public String getCollectionArchive() {
     if (Gatherer.GS3) {
-        return Utility.getArchiveDir(Utility.getCollectionDir(Gatherer.config.gsdl3_path, Gatherer.config.site_name, collection.getName()));
+        return Utility.getArchiveDir(Utility.getCollectionDir(Configuration.gsdl3_path, Configuration.site_name, collection.getName()));
     } else {
-        return Utility.getArchiveDir(Utility.getCollectionDir(Gatherer.config.gsdl_path, collection.getName()));
+        return Utility.getArchiveDir(Utility.getCollectionDir(Configuration.gsdl_path, collection.getName()));
     }
     }
@@ -613 +614 @@
     public String getCollectionBuild() {
     if (Gatherer.GS3) {
-        return Utility.getBuildDir(Utility.getCollectionDir(Gatherer.config.gsdl3_path, Gatherer.config.site_name, collection.getName()));
+        return Utility.getBuildDir(Utility.getCollectionDir(Configuration.gsdl3_path, Configuration.site_name, collection.getName()));
     } else {
-        return Utility.getBuildDir(Utility.getCollectionDir(Gatherer.config.gsdl_path, collection.getName()));
+        return Utility.getBuildDir(Utility.getCollectionDir(Configuration.gsdl_path, collection.getName()));
     }
     }
@@ -627 +628 @@
     public String getCollectionConfig() {
     if (Gatherer.GS3) {
-        return Utility.getConfigFile(Utility.getCollectionDir(Gatherer.config.gsdl3_path, Gatherer.config.site_name, collection.getName()));
+        return Utility.getConfigFile(Utility.getCollectionDir(Configuration.gsdl3_path, Configuration.site_name, collection.getName()));
     } else {
-    return Utility.getConfigFile(Utility.getCollectionDir(Gatherer.config.gsdl_path, collection.getName()));
+    return Utility.getConfigFile(Utility.getCollectionDir(Configuration.gsdl_path, collection.getName()));
     }
     }
@@ -642 +643 @@
     public String getCollectionDirectory() {
     if (Gatherer.GS3) {
-        return Utility.getCollectionDir(Gatherer.config.gsdl3_path, Gatherer.config.site_name, collection.getName());
+        return Utility.getCollectionDir(Configuration.gsdl3_path, Configuration.site_name, collection.getName());
     } else {
-        return Utility.getCollectionDir(Gatherer.config.gsdl_path,  collection.getName());
+        return Utility.getCollectionDir(Configuration.gsdl_path,  collection.getName());
     }
     }
@@ -657 +658 @@
     public String getCollectionEtc() {
     if (Gatherer.GS3) {
-        return Utility.getEtcDir(Utility.getCollectionDir(Gatherer.config.gsdl3_path, Gatherer.config.site_name, collection.getName()));
+        return Utility.getEtcDir(Utility.getCollectionDir(Configuration.gsdl3_path, Configuration.site_name, collection.getName()));
     } else {
-    return Utility.getEtcDir(Utility.getCollectionDir(Gatherer.config.gsdl_path, collection.getName()));
+    return Utility.getEtcDir(Utility.getCollectionDir(Configuration.gsdl_path, collection.getName()));
     }
     }
@@ -671 +672 @@
     public String getCollectionFilename() {
     if (Gatherer.GS3) {
-        return Utility.getCollectionDir(Gatherer.config.gsdl3_path, Gatherer.config.site_name, collection.getName()) + collection.getName() + ".col";
+        return Utility.getCollectionDir(Configuration.gsdl3_path, Configuration.site_name, collection.getName()) + collection.getName() + ".col";
     } else {
-    return Utility.getCollectionDir(Gatherer.config.gsdl_path, collection.getName()) + collection.getName() + ".col";
+    return Utility.getCollectionDir(Configuration.gsdl_path, collection.getName()) + collection.getName() + ".col";
     }
     }
@@ -685 +686 @@
     public String getCollectionImages() {
     if (Gatherer.GS3) {
-        return Utility.getImagesDir(Utility.getCollectionDir(Gatherer.config.gsdl3_path, Gatherer.config.site_name, collection.getName()));
+        return Utility.getImagesDir(Utility.getCollectionDir(Configuration.gsdl3_path, Configuration.site_name, collection.getName()));
     } else {
-    return Utility.getImagesDir(Utility.getCollectionDir(Gatherer.config.gsdl_path, collection.getName()));
+    return Utility.getImagesDir(Utility.getCollectionDir(Configuration.gsdl_path, collection.getName()));
     }
     }
@@ -699 +700 @@
     public String getCollectionImport() {
     if (Gatherer.GS3) {
-        return Utility.getImportDir(Utility.getCollectionDir(Gatherer.config.gsdl3_path, Gatherer.config.site_name, collection.getName()));
+        return Utility.getImportDir(Utility.getCollectionDir(Configuration.gsdl3_path, Configuration.site_name, collection.getName()));
     } else {
-        return Utility.getImportDir(Utility.getCollectionDir(Gatherer.config.gsdl_path, collection.getName()));
+        return Utility.getImportDir(Utility.getCollectionDir(Configuration.gsdl_path, collection.getName()));
     }
     }
@@ -713 +714 @@
     public String getCollectionIndex() {
     if (Gatherer.GS3) {
-        return Utility.getIndexDir(Utility.getCollectionDir(Gatherer.config.gsdl3_path, Gatherer.config.site_name, collection.getName()));
+        return Utility.getIndexDir(Utility.getCollectionDir(Configuration.gsdl3_path, Configuration.site_name, collection.getName()));
     } else {
-        return Utility.getIndexDir(Utility.getCollectionDir(Gatherer.config.gsdl_path, collection.getName()));
+        return Utility.getIndexDir(Utility.getCollectionDir(Configuration.gsdl_path, collection.getName()));
     }
     }
@@ -727 +728 @@
     public String getCollectionLog() {
     if (Gatherer.GS3) {
-        return Utility.getLogDir(Utility.getCollectionDir(Gatherer.config.gsdl3_path, Gatherer.config.site_name, collection.getName()));
+        return Utility.getLogDir(Utility.getCollectionDir(Configuration.gsdl3_path, Configuration.site_name, collection.getName()));
     } else {
-        return Utility.getLogDir(Utility.getCollectionDir(Gatherer.config.gsdl_path, collection.getName()));
+        return Utility.getLogDir(Utility.getCollectionDir(Configuration.gsdl_path, collection.getName()));
     }
     }
@@ -741 +742 @@
     public String getCollectionMetadata() {
     if (Gatherer.GS3) {
-        return Utility.getMetadataDir(Utility.getCollectionDir(Gatherer.config.gsdl3_path, Gatherer.config.site_name, collection.getName()));
+        return Utility.getMetadataDir(Utility.getCollectionDir(Configuration.gsdl3_path, Configuration.site_name, collection.getName()));
     } else {
-        return Utility.getMetadataDir(Utility.getCollectionDir(Gatherer.config.gsdl_path, collection.getName()));
+        return Utility.getMetadataDir(Utility.getCollectionDir(Configuration.gsdl_path, collection.getName()));
     }
     }
@@ -784 +785 @@
     {
     // Return any predefined special directories
-    HashMap mappings = Gatherer.config.getDirectoryMappings();
+    HashMap mappings = Configuration.getDirectoryMappings();
     FileNode[] mapping_nodes = new FileNode[mappings.size()];
     Iterator mappings_iterator = mappings.keySet().iterator();
@@ -845 +846 @@
 
         String args[];
-        String lang = Gatherer.config.getLanguage();
+        String lang = Configuration.getLanguage();
         if((Utility.isWindows()) && (!Gatherer.isGsdlRemote)) {
         args = new String[8];
-        args[0] = Gatherer.config.perl_path;
+        args[0] = Configuration.perl_path;
         args[1] = "-S";
-        args[2] = Gatherer.config.getScriptPath() + "import.pl";
+        args[2] = Configuration.getScriptPath() + "import.pl";
         args[3] = "-gli";
         args[4] = "-language";
@@ -859 +860 @@
         else {
         args = new String[6];
-        args[0] = Gatherer.config.getScriptPath() + "import.pl";
+        args[0] = Configuration.getScriptPath() + "import.pl";
         args[1] = "-gli";
         args[2] = "-language";
@@ -1055 +1056 @@
         if(description == null || title == null) {
         command = new String[8];
-        command[0] = Gatherer.config.perl_path;
+        command[0] = Configuration.perl_path;
         command[1] = "-S";
-        command[2] = Gatherer.config.getScriptPath() + "mkcol.pl";
+        command[2] = Configuration.getScriptPath() + "mkcol.pl";
         command[3] = "-collectdir";
         command[4] = collect_dir;
@@ -1067 +1068 @@
         else if(email == null) {
         command = new String[12];
-        command[0] = Gatherer.config.perl_path;
+        command[0] = Configuration.perl_path;
         command[1] = "-S";
-        command[2] = Gatherer.config.getScriptPath() + "mkcol.pl";
+        command[2] = Configuration.getScriptPath() + "mkcol.pl";
         command[3] = "-collectdir";
         command[4] = collect_dir;
@@ -1082 +1083 @@
         else {
         command = new String[14];
-        command[0] = Gatherer.config.perl_path;
+        command[0] = Configuration.perl_path;
         command[1] = "-S";
-        command[2] = Gatherer.config.getScriptPath() + "mkcol.pl";
+        command[2] = Configuration.getScriptPath() + "mkcol.pl";
         command[3] = "-collectdir";
         command[4] = collect_dir;
@@ -1186 +1187 @@
         if(installCollection()) {
         // If we have a local library running (that we know about) then we ask it to add our newly create collection
-        if (Gatherer.config.exec_file != null) {
+        if (Configuration.exec_file != null) {
             Gatherer.self.configServer(GSDLSiteConfig.ADD_COMMAND + collection.getName());
             // This is very important -- it ensures that the above command has finished
@@ -1193 +1194 @@
         else if (Gatherer.GS3) {
             convertToGS3Collection();
-            Gatherer.self.configGS3Server(Gatherer.config.site_name, ServletConfiguration.ADD_COMMAND + collection.getName());
+            Gatherer.self.configGS3Server(Configuration.site_name, ServletConfiguration.ADD_COMMAND + collection.getName());
         }  
 
@@ -1276 +1277 @@
     public File removeDirectoryMapping(FileNode target) {
     // Remove from config, remembering file
-    File file = Gatherer.config.removeDirectoryMapping(target.toString());
+    File file = Configuration.removeDirectoryMapping(target.toString());
     // Update tree.
     Gatherer.g_man.refreshWorkspaceTree(WorkspaceTree.FOLDER_SHORTCUTS_CHANGED);
@@ -1333 +1334 @@
     /* private void updatePrivateWorkspace(DefaultTreeModel model) {
     // Add Private workspace if a collection has been loaded.
-    if(ready() && !Gatherer.config.get("workflow.mirror", true)) {
+    if(ready() && !Configuration.get("workflow.mirror", true)) {
         FileNode root = (FileNode)model.getRoot();
                 // Remove old private workspace
@@ -1409 +1410 @@
     String collect_dir;
     if (Gatherer.GS3) {
-        collect_dir = Utility.getCollectDir(Gatherer.config.gsdl3_path, Gatherer.config.site_name);
+        collect_dir = Utility.getCollectDir(Configuration.gsdl3_path, Configuration.site_name);
     } else {
-        collect_dir = Utility.getCollectDir(Gatherer.config.gsdl_path);
+        collect_dir = Utility.getCollectDir(Configuration.gsdl_path);
     }
 
@@ -1431 +1432 @@
     try {
         // We have to ensure that the local library has released this collection so we can delete the index directory
-        if (!Gatherer.GS3 && Gatherer.config.exec_file != null) {
+        if (!Gatherer.GS3 && Configuration.exec_file != null) {
         Gatherer.self.configServer(GSDLSiteConfig.RELEASE_COMMAND + collection.getName());
 

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

@@ -43 +43 @@
 import javax.swing.*;
 import javax.swing.event.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
@@ -104 +105 @@
     details = new JTextArea();
     details.setEditable(false);
-    details.setFont(Gatherer.config.getFont("general.tooltip_font", false));
+    details.setFont(Configuration.getFont("general.tooltip_font", false));
     Dictionary.setText(details, "DeleteCollectionPrompt.No_Collection");
     details_label = new JLabel();
@@ -188 +189 @@
 
     // Center and display.
-    Dimension screen_size = Gatherer.config.screen_size;
+    Dimension screen_size = Configuration.screen_size;
     this.setLocation((screen_size.width - SIZE.width) / 2, (screen_size.height - SIZE.height) / 2);
     this.setVisible(true); // blocks until the dialog is killed
@@ -220 +221 @@
     File collect_directory;
     if (Gatherer.GS3) {
-        collect_directory = new File(Utility.getCollectDir(Gatherer.config.gsdl3_path, Gatherer.config.site_name));
+        collect_directory = new File(Utility.getCollectDir(Configuration.gsdl3_path, Configuration.site_name));
     } else {
-        collect_directory = new File(Utility.getCollectDir(Gatherer.config.gsdl_path));
+        collect_directory = new File(Utility.getCollectDir(Configuration.gsdl_path));
     }
     if(collect_directory.exists()) {
@@ -309 +310 @@
 
         // first of all we must release it from the local library
-        if (Gatherer.config.exec_file != null) {
+        if (Configuration.exec_file != null) {
         ///ystem.err.println("Local Library Found!");
         Gatherer.self.configServer(GSDLSiteConfig.RELEASE_COMMAND + collection.getShortName());
@@ -356 +357 @@
         File delete_me;
         if (Gatherer.GS3) {
-        delete_me = new File(Utility.getCollectionDir(Gatherer.config.gsdl3_path, Gatherer.config.site_name, collection.getShortName()));
+        delete_me = new File(Utility.getCollectionDir(Configuration.gsdl3_path, Configuration.site_name, collection.getShortName()));
         } else {
-        delete_me = new File(Utility.getCollectionDir(Gatherer.config.gsdl_path, collection.getShortName()));
+        delete_me = new File(Utility.getCollectionDir(Configuration.gsdl_path, collection.getShortName()));
         }
         if (Utility.delete(delete_me)) {

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

@@ -42 +42 @@
 import java.util.*;
 import javax.swing.tree.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
@@ -206 +207 @@
 
     // want to always download newer files,  convert non-relative links to relative, always use directories, and only try twice to get a file before giving up
-    String command = Gatherer.config.getWGetPath() + " -N -k -x -t 2 "; // + " -nc -c "; 
+    String command = Configuration.getWGetPath() + " -N -k -x -t 2 "; // + " -nc -c "; 
 
     if (no_parents) {
@@ -225 +226 @@
     String proxy_url = "";
     // Determine if we have to use a proxy.
-    if(Gatherer.config.get("general.use_proxy", true)) {
-        String proxy_host = Gatherer.config.getString("general.proxy_host", true);
-        String proxy_port = Gatherer.config.getString("general.proxy_port", true);
+    if(Configuration.get("general.use_proxy", true)) {
+        String proxy_host = Configuration.getString("general.proxy_host", true);
+        String proxy_port = Configuration.getString("general.proxy_port", true);
         // Find out whether the user has already authenticated themselves
         String user_pass = null;

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

@@ -45 +45 @@
 import org.greenstone.gatherer.checklist.CheckList;
 import org.greenstone.gatherer.checklist.Entry;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
@@ -120 +121 @@
     details_textarea = new JTextArea();
     details_textarea.setEditable(false);
-    details_textarea.setFont(Gatherer.config.getFont("general.tooltip_font", false));
+    details_textarea.setFont(Configuration.getFont("general.tooltip_font", false));
     Dictionary.setText(details_textarea, "DeleteCollectionPrompt.No_Collection");
     details_label = new JLabel();
@@ -232 +233 @@
 
     // Center and display.
-    Dimension screen_size = Gatherer.config.screen_size;
+    Dimension screen_size = Configuration.screen_size;
     this.setLocation((screen_size.width - SIZE.width) / 2, (screen_size.height - SIZE.height) / 2);
     this.setVisible(true); // blocks until the dialog is killed
@@ -268 +269 @@
     if(Utility.isWindows()) {
         args = new String[num_args+2];
-        args[0] = Gatherer.config.perl_path;
+        args[0] = Configuration.perl_path;
         args[1] = "-S";
         next_arg = 2;
@@ -275 +276 @@
     }
     
-    args[next_arg] = Gatherer.config.getScriptPath() + "exportcol.pl";
+    args[next_arg] = Configuration.getScriptPath() + "exportcol.pl";
     next_arg++;
     args[next_arg] = "-gli"; next_arg++;
     args[next_arg] = "-language"; next_arg++;
-    args[next_arg] = Gatherer.config.getLanguage(); next_arg++;
+    args[next_arg] = Configuration.getLanguage(); next_arg++;
 
     if (has_title) {
@@ -317 +318 @@
     
     args[0] = coll_names.toString();
-    args[1] = Gatherer.config.gsdl_path+"tmp"+File.separator;
+    args[1] = Configuration.gsdl_path+"tmp"+File.separator;
     if(cd_title.equals("")) {
         args[1] += "exported_collections";
@@ -347 +348 @@
     File collect_directory;
     if (Gatherer.GS3) {
-        collect_directory = new File(Utility.getCollectDir(Gatherer.config.gsdl3_path, Gatherer.config.site_name));
+        collect_directory = new File(Utility.getCollectDir(Configuration.gsdl3_path, Configuration.site_name));
     } else {
-        collect_directory = new File(Utility.getCollectDir(Gatherer.config.gsdl_path));
+        collect_directory = new File(Utility.getCollectDir(Configuration.gsdl_path));
     }
     if(collect_directory.exists()) {

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

@@ -40 +40 @@
 import java.util.*;
 import javax.swing.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.collection.Collection;
@@ -164 +165 @@
         File copied_dir;
         if (Gatherer.GS3) {
-        copied_dir = new File(Utility.getCollectionDir(Gatherer.config.gsdl3_path, Gatherer.config.site_name, name));
+        copied_dir = new File(Utility.getCollectionDir(Configuration.gsdl3_path, Configuration.site_name, name));
         } else {
-        copied_dir = new File(Utility.getCollectionDir(Gatherer.config.gsdl_path, name));
+        copied_dir = new File(Utility.getCollectionDir(Configuration.gsdl_path, name));
         }
         files.add(collection_file.getParentFile());

trunk/gli/src/org/greenstone/gatherer/file/FileAssociationManager.java

@@ -29 +29 @@
 import java.io.*;
 import javax.swing.table.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
@@ -51 +52 @@
     public FileAssociationManager() {
     // Retrieve the associations_element from the config
-    associations_element = Gatherer.config.getFileAssociations();
+    associations_element = Configuration.getFileAssociations();
     // Initialize the associations. This involves looking through all current associations searching for those with a command of "".
     if(associations_element != null) {
@@ -92 +93 @@
     Gatherer.println("Get browser command: " + url);
     // First off we try to retrieve one from the configuration
-    String command = Gatherer.config.getPreviewCommand();
+    String command = Configuration.getPreviewCommand();
     // If that worked, substitute in the url and return
     if(command != null && command.length() > 0) {
@@ -131 +132 @@
     // Store the result if any
     if(command != null && !command.equals("")) {
-        Gatherer.config.setPreviewCommand(command);
+        Configuration.setPreviewCommand(command);
         command = command.replaceAll(FILENAME_ARG, url);
         Gatherer.println("Result = " + command);

trunk/gli/src/org/greenstone/gatherer/file/FileNode.java

@@ -7 +7 @@
 import javax.swing.filechooser.*;
 import javax.swing.tree.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
@@ -272 +273 @@
         // the Greenstone collections folder for GS3 - this contains a 
         // folder for each site
-        File start = new File(Utility.getSitesDir(Gatherer.config.gsdl3_path));
+        File start = new File(Utility.getSitesDir(Configuration.gsdl3_path));
         File sites[] = start.listFiles();
         ArrayTools.sort(sites);
@@ -297 +298 @@
         File start;
         if (gs3_site) {
-            start = new File(Utility.getCollectDir(Gatherer.config.gsdl3_path, title));
+            start = new File(Utility.getCollectDir(Configuration.gsdl3_path, title));
         } else {
-            start = new File(Utility.getCollectDir(Gatherer.config.gsdl_path));
+            start = new File(Utility.getCollectDir(Configuration.gsdl_path));
         }
         File cols[] = start.listFiles();

trunk/gli/src/org/greenstone/gatherer/file/FileQueue.java

@@ -90 +90 @@
     Dictionary.setText(file_status, "FileActions.Selected", args);
     progress = new LongProgressBar();
-    progress.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
-    progress.setForeground(Gatherer.config.getColor("coloring.collection_tree_foreground", false));
+    progress.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
+    progress.setForeground(Configuration.getColor("coloring.collection_tree_foreground", false));
     progress.setString(Dictionary.get("FileActions.No_Activity"));
     progress.setStringPainted(true);
@@ -234 +234 @@
 
             // The number one thing to check is whether we are in a cyclic loop. The easiest way is just to check how deep we are
-            int max_folder_depth = Gatherer.config.getInt("general.max_folder_depth", Configuration.COLLECTION_SPECIFIC);
+            int max_folder_depth = Configuration.getInt("general.max_folder_depth", Configuration.COLLECTION_SPECIFIC);
             boolean continue_over_depth = false;
             if(FileManager.countFolderDepth(source_file) > max_folder_depth) {
@@ -248 +248 @@
                 case 2: // Continue and increase depth
                 continue_over_depth = true;
-                Gatherer.config.setInt("general.max_folder_depth", Configuration.COLLECTION_SPECIFIC, (max_folder_depth + 1));
+                Configuration.setInt("general.max_folder_depth", Configuration.COLLECTION_SPECIFIC, (max_folder_depth + 1));
                 break;
                 }

trunk/gli/src/org/greenstone/gatherer/file/RecycleBin.java

@@ -46 +46 @@
 import javax.swing.*;
 import javax.swing.tree.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.file.FileNode;
@@ -77 +78 @@
     this.drop_target = new DropTarget(this, drag_action, this, true);
 
-    setBackground(Gatherer.config.getColor("coloring.button_background", true));
-    setForeground(Gatherer.config.getColor("coloring.button_foreground", true));
+    setBackground(Configuration.getColor("coloring.button_background", true));
+    setForeground(Configuration.getColor("coloring.button_foreground", true));
     setOpaque(true);
 
@@ -93 +94 @@
     public void dragEnter(DropTargetDragEvent event) {
     group.grabFocus(this);
-    setBackground(Gatherer.config.getColor("coloring.button_selected_background", true));
-    setForeground(Gatherer.config.getColor("coloring.button_selected_foreground", true));
+    setBackground(Configuration.getColor("coloring.button_selected_background", true));
+    setForeground(Configuration.getColor("coloring.button_selected_foreground", true));
     }
 
     /** Any implementation of DropTargetListener must include this method so we can be notified when the drag focus leaves this component. We need to indicate that we have lost focus. */
     public void dragExit(DropTargetEvent event) {
-    setBackground(Gatherer.config.getColor("coloring.button_background", true));
-    setForeground(Gatherer.config.getColor("coloring.button_foreground", true));
+    setBackground(Configuration.getColor("coloring.button_background", true));
+    setForeground(Configuration.getColor("coloring.button_foreground", true));
     }
 
@@ -125 +126 @@
     ignore = true;
     group.grabFocus(this);
-    setBackground(Gatherer.config.getColor("coloring.button_background", true));
-    setForeground(Gatherer.config.getColor("coloring.button_foreground", true));
+    setBackground(Configuration.getColor("coloring.button_background", true));
+    setForeground(Configuration.getColor("coloring.button_foreground", true));
     Transferable transferable = event.getTransferable();
     try {

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

@@ -292 +292 @@
     } 
     // If we are in simple mode, we have to rebuild the simple arguments list
-    if(Gatherer.config.getMode() < THRESHOLD) {
+    if(Configuration.getMode() < THRESHOLD) {
         souter_panel.remove(sargument_configuration_scroll);
         souter_panel.remove(sinner_panel);
@@ -305 +305 @@
     
     // now do the preview stuff
-    if (!Gatherer.c_man.built() || Gatherer.config.exec_address == null) {
+    if (!Gatherer.c_man.built() || Configuration.exec_address == null) {
         preview_button.setEnabled(false);
         simple_preview_button.setEnabled(false);
@@ -326 +326 @@
     public void display() {
 
-    int current_mode = Gatherer.config.getMode();
+    int current_mode = Configuration.getMode();
 
     // Build control_pane
@@ -438 +438 @@
      */
     public void gainFocus() {
-    if(Gatherer.config.getMode() < THRESHOLD) {
+    if(Configuration.getMode() < THRESHOLD) {
         card_layout.show(main_pane, SIMPLE);
     }
@@ -479 +479 @@
     public void modeChanged(int mode) {
     // If we are below the complexity threshold ensure the simple controls are being shown
-    if(Gatherer.config.getMode() < THRESHOLD) {
+    if(Configuration.getMode() < THRESHOLD) {
         // Update the arguments
         souter_panel.remove(sargument_configuration_scroll);
@@ -544 +544 @@
         build_monitor.reset();
         import_monitor.reset();
-        if(Gatherer.config.getMode() >= THRESHOLD) {
+        if(Configuration.getMode() >= THRESHOLD) {
             control_pane.add(button_pane, BorderLayout.SOUTH);
             card_layout.show(main_pane, CONTROL);
@@ -568 +568 @@
         }
         options_pane.resetFileEntry();
-        if(Gatherer.config.getMode() >= THRESHOLD) {
+        if(Configuration.getMode() >= THRESHOLD) {
         control_pane.add(button_pane, BorderLayout.SOUTH);
         card_layout.show(main_pane, CONTROL);
@@ -578 +578 @@
     // set up the home page for the current collection
     Collection current_collection = Gatherer.c_man.getCollection();
-    String site = Gatherer.config.site_name; // for GS3 colls
+    String site = Configuration.site_name; // for GS3 colls
     String extra_args = "";
     SearchTypeManager st_man = current_collection.cdm.searchtype_manager;
@@ -598 +598 @@
     // Remember to add unique timestamp
     if (Gatherer.GS3) {
-        homepage = Gatherer.config.exec_address.toString() + Gatherer.config.getServletPath()+ "?a=p&sa=about&c=" + current_collection.getName()+"&l="+Gatherer.config.getLanguage(); //+extra_args + StaticStrings.TIMESTAMP_ARGUMENT + System.currentTimeMillis();
+        homepage = Configuration.exec_address.toString() + Configuration.getServletPath()+ "?a=p&sa=about&c=" + current_collection.getName()+"&l="+Configuration.getLanguage(); //+extra_args + StaticStrings.TIMESTAMP_ARGUMENT + System.currentTimeMillis();
     } else {
-        homepage = Gatherer.config.exec_address.toString() + "?a=p&p=about&c=" + current_collection.getName()+"&l="+Gatherer.config.getLanguage()+extra_args + StaticStrings.TIMESTAMP_ARGUMENT + System.currentTimeMillis();
+        homepage = Configuration.exec_address.toString() + "?a=p&p=about&c=" + current_collection.getName()+"&l="+Configuration.getLanguage()+extra_args + StaticStrings.TIMESTAMP_ARGUMENT + System.currentTimeMillis();
     }
     }
@@ -620 +620 @@
         
         // Remember that for lower thresholds the above doesn't work, so try this instead
-        if(Gatherer.config.getMode() < THRESHOLD) {
+        if(Configuration.getMode() < THRESHOLD) {
         options_pane.update(sargument_configuration_panel);
         }
@@ -638 +638 @@
         // Change the view.
         processing = true;
-        if(Gatherer.config.getMode() >= THRESHOLD) {
+        if(Configuration.getMode() >= THRESHOLD) {
         progress_pane.add(button_pane, BorderLayout.SOUTH);
         card_layout.show(main_pane, PROGRESS);
@@ -674 +674 @@
         processing = false;
         document.setSpecialCharacter(OptionsPane.CANCELLED);
-        if(Gatherer.config.getMode() >= THRESHOLD) {
+        if(Configuration.getMode() >= THRESHOLD) {
         control_pane.add(button_pane, BorderLayout.SOUTH);
         card_layout.show(main_pane, CONTROL);

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

@@ -40 +40 @@
 import java.awt.event.*;
 import javax.swing.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
@@ -134 +135 @@
     content_pane.add(button_pane, BorderLayout.SOUTH);
           
-    Dimension screen_size = Gatherer.config.screen_size;
+    Dimension screen_size = Configuration.screen_size;
     setLocation((screen_size.width - SIZE.width) / 2, (screen_size.height - SIZE.height) / 2);
     setVisible(true);

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

@@ -324 +324 @@
         Dictionary.registerText(collection_label, "Collection.Collection");
         // Update label coloring.
-        collection_label.setBackground(Gatherer.config.getColor("coloring.collection_heading_background", false));
-        collection_label.setForeground(Gatherer.config.getColor("coloring.collection_heading_foreground", false));
+        collection_label.setBackground(Configuration.getColor("coloring.collection_heading_background", false));
+        collection_label.setForeground(Configuration.getColor("coloring.collection_heading_foreground", false));
         collection_tree.setModel(collection_model);
         // Update tree coloring.
-        collection_tree.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
-        collection_tree.setForeground(Gatherer.config.getColor("coloring.collection_tree_foreground", false));
+        collection_tree.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
+        collection_tree.setForeground(Configuration.getColor("coloring.collection_tree_foreground", false));
         // Register our msm dependant components (or correctly their models) with msm.
         if (model != null) {
@@ -400 +400 @@
 
     filter = Gatherer.g_man.getFilter(collection_tree);
-    filter.setBackground(Gatherer.config.getColor("coloring.collection_heading_background", false));
-    filter.setEditable(Gatherer.config.getMode() > Configuration.LIBRARIAN_MODE);
+    filter.setBackground(Configuration.getColor("coloring.collection_heading_background", false));
+    filter.setEditable(Configuration.getMode() > Configuration.LIBRARIAN_MODE);
     Dictionary.registerTooltip(filter.getComboBox(), "Collection.Filter_Tooltip");
 
@@ -433 +433 @@
 
     table_label = new JTextField();
-    table_label.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+    table_label.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
     table_label.setEditable(false);
     Dictionary.registerText(table_label, "MetaEdit.No_File");
@@ -494 +494 @@
 
     JScrollPane table_scroll = new JScrollPane(table);
-    table_scroll.getViewport().setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+    table_scroll.getViewport().setBackground(Configuration.getColor("coloring.collection_tree_background", false));
     table_scroll.setOpaque(true);
 
@@ -1202 +1202 @@
         super();
 
-        setFont(Gatherer.config.getFont("general.font", false));
+        setFont(Configuration.getFont("general.font", false));
         setPreferredSize(new Dimension(width, height));
 
@@ -1213 +1213 @@
         JPanel value_field_pane = new JPanel();
         value = new JTextField();
-        value.setBackground(Gatherer.config.getColor("coloring.editable_background", false));
-        value.setForeground(Gatherer.config.getColor("coloring.editable_foreground", false));
+        value.setBackground(Configuration.getColor("coloring.editable_background", false));
+        value.setForeground(Configuration.getColor("coloring.editable_foreground", false));
         value.setPreferredSize(new Dimension(413, 24));
         value.getDocument().addDocumentListener(new DocumentListenerImpl());

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

@@ -43 +43 @@
 import javax.swing.*;
 import javax.swing.event.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
@@ -89 +90 @@
 
     /*  new_mds_button = new JRadioButton();
-    new_mds_button.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+    new_mds_button.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
     //new_mds_button.setMnemonic(KeyEvent.VK_I);
     new_mds_button.setOpaque(false);
     Dictionary.registerText(new_mds_button, "ExternalCollectionPrompt.NewMDS");
     existing_mds_button = new JRadioButton();
-    existing_mds_button.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+    existing_mds_button.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
     //existing_mds_button.setMnemonic(KeyEvent.VK_X);
     existing_mds_button.setOpaque(false);
@@ -143 +144 @@
 
     // Show
-    Dimension screen_size = Gatherer.config.screen_size;
+    Dimension screen_size = Configuration.screen_size;
     setLocation((screen_size.width - size.width) / 2, (screen_size.height - size.height) / 2);
     setVisible(true);

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

@@ -45 +45 @@
 import javax.swing.filechooser.*;
 import javax.swing.table.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
@@ -92 +93 @@
 
     JPanel content_pane = (JPanel) getContentPane();
-    content_pane.setBackground(Gatherer.config.getColor("coloring.collection_heading_background", false));
+    content_pane.setBackground(Configuration.getColor("coloring.collection_heading_background", false));
 
     JTextArea instructions_area = new JTextArea();

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

@@ -41 +41 @@
 import javax.swing.*;
 import javax.swing.plaf.basic.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Gatherer;
 
@@ -154 +155 @@
 
     // Initialization
-    this.background = Gatherer.config.getColor("coloring.collection_tree_background", false);
-    this.foreground = Gatherer.config.getColor("coloring.collection_tree_foreground", false);
-    this.editable_background = Gatherer.config.getColor("coloring.editable_background", false);
-    this.editable_foreground = Gatherer.config.getColor("coloring.editable_foreground", false);
-    this.selection_background = Gatherer.config.getColor("coloring.collection_selection_background", false);
-    this.selection_foreground = Gatherer.config.getColor("coloring.collection_selection_foreground", false);
+    this.background = Configuration.getColor("coloring.collection_tree_background", false);
+    this.foreground = Configuration.getColor("coloring.collection_tree_foreground", false);
+    this.editable_background = Configuration.getColor("coloring.editable_background", false);
+    this.editable_foreground = Configuration.getColor("coloring.editable_foreground", false);
+    this.selection_background = Configuration.getColor("coloring.collection_selection_background", false);
+    this.selection_foreground = Configuration.getColor("coloring.collection_selection_foreground", false);
     if (isEditable()) {
         this.setBackground(editable_background);
@@ -350 +351 @@
 
     public void setButtonBackground() {
-        arrowButton.setBackground(Gatherer.config.getColor("coloring.button_background", false));
+        arrowButton.setBackground(Configuration.getColor("coloring.button_background", false));
     }
     }

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

@@ -331 +331 @@
      */
     public void collectionChanged(final boolean ready) {
-    if(Gatherer.config.get("workflow.mirror", true)) {
+    if(Configuration.get("workflow.mirror", true)) {
         mirror_pane.collectionChanged(ready);
     }
@@ -413 +413 @@
         tab_pane = new JTabbedPane();
         tab_pane.addChangeListener(this);
-        tab_pane.setFont(Gatherer.config.getFont("general.font", false));
-
-        if(Gatherer.config.get(StaticStrings.WORKFLOW_MIRROR, true)) {
+        tab_pane.setFont(Configuration.getFont("general.font", false));
+
+        if(Configuration.get(StaticStrings.WORKFLOW_MIRROR, true)) {
         mirror_pane = new MirrorPane();
         tab_pane.addTab("GUI.Mirror", Utility.getImage("mirroring.gif"), mirror_pane);
-        tab_pane.setEnabledAt(tab_pane.indexOfComponent(mirror_pane), Gatherer.config.get(StaticStrings.WORKFLOW_MIRROR, false));
+        tab_pane.setEnabledAt(tab_pane.indexOfComponent(mirror_pane), Configuration.get(StaticStrings.WORKFLOW_MIRROR, false));
         }
 
         gather_pane = new GatherPane(workspace_tree_sync, collection_tree_sync);
         gather_pane.display();
-        if(Gatherer.config.get("workflow.gather", true)) {
+        if(Configuration.get("workflow.gather", true)) {
         tab_pane.addTab("GUI.Gather", Utility.getImage("collection.gif"), gather_pane);
-        tab_pane.setEnabledAt(tab_pane.indexOfComponent(gather_pane), Gatherer.config.get("workflow.gather", false));
+        tab_pane.setEnabledAt(tab_pane.indexOfComponent(gather_pane), Configuration.get("workflow.gather", false));
         }
 
         enrich_pane = new EnrichPane(collection_tree_sync);
         enrich_pane.display();
-        if(Gatherer.config.get("workflow.enrich", true)) {
+        if(Configuration.get("workflow.enrich", true)) {
         tab_pane.addTab("GUI.Enrich", Utility.getImage("metaedit.gif"), enrich_pane);
         tab_pane.setEnabledAt(tab_pane.indexOfComponent(enrich_pane), false);
@@ -437 +437 @@
         design_pane = new DesignPane();
         design_pane.display();
-        if(Gatherer.config.get("workflow.design", true)) {
+        if(Configuration.get("workflow.design", true)) {
         tab_pane.addTab("GUI.Design", Utility.getImage("build.gif"), design_pane);
         tab_pane.setEnabledAt(tab_pane.indexOfComponent(design_pane), false);
         }
 
-        if(Gatherer.config.get("workflow.export", true)) {
+        if(Configuration.get("workflow.export", true)) {
         tab_pane.addTab("GUI.Export", Utility.getImage("export.gif"), export_pane);
         tab_pane.setEnabledAt(tab_pane.indexOfComponent(export_pane), false);
@@ -449 +449 @@
         create_pane = new CreatePane();
         create_pane.display();
-        if(Gatherer.config.get("workflow.create", true)) {
+        if(Configuration.get("workflow.create", true)) {
         tab_pane.addTab("GUI.Create", Utility.getImage("build session.gif"), create_pane);
         tab_pane.setEnabledAt(tab_pane.indexOfComponent(create_pane), false);
@@ -455 +455 @@
 
         // Select the collect pane if it is available
-        if(Gatherer.config.get("workflow.gather", false)) {
+        if(Configuration.get("workflow.gather", false)) {
         tab_pane.setSelectedComponent(gather_pane);
         }
@@ -649 +649 @@
     // Describe the current user mode
     title_buffer.append(StaticStrings.MODE_STR);
-    title_buffer.append(Gatherer.config.getModeAsString());
+    title_buffer.append(Configuration.getModeAsString());
     title_buffer.append(StaticStrings.SPACE_CHARACTER);
     title_buffer.append(StaticStrings.SPACE_CHARACTER);
@@ -690 +690 @@
         File file;
         if (Gatherer.GS3) {
-        if (Gatherer.config.gsdl3_path != null) {
-            file = new File(Utility.getSitesDir(Gatherer.config.gsdl3_path));
+        if (Configuration.gsdl3_path != null) {
+            file = new File(Utility.getSitesDir(Configuration.gsdl3_path));
         } else {
             file = new File(Utility.BASE_DIR);
@@ -698 +698 @@
         } else {
 
-        if(Gatherer.config.gsdl_path != null) {
-            file = new File(Utility.getCollectDir(Gatherer.config.gsdl_path));
+        if(Configuration.gsdl_path != null) {
+            file = new File(Utility.getCollectDir(Configuration.gsdl_path));
         }
         else {
@@ -796 +796 @@
         ///ystem.err.println("Running CreationTask...");
         if(ncm_prompt == null) {
-        Gatherer.c_man.createCollection(ncd_prompt.getDescription(), Gatherer.config.getEmail(), ncd_prompt.getName(), ncd_prompt.getTitle(), ncd_prompt.getBase(), null);
+        Gatherer.c_man.createCollection(ncd_prompt.getDescription(), Configuration.getEmail(), ncd_prompt.getName(), ncd_prompt.getTitle(), ncd_prompt.getBase(), null);
         }
         else {
-        Gatherer.c_man.createCollection(ncd_prompt.getDescription(), Gatherer.config.getEmail(), ncd_prompt.getName(), ncd_prompt.getTitle(), null, ncm_prompt.getSets());
+        Gatherer.c_man.createCollection(ncd_prompt.getDescription(), Configuration.getEmail(), ncd_prompt.getName(), ncd_prompt.getTitle(), null, ncm_prompt.getSets());
         }
         // Now that the collection specific settings are loaded we can set the 'view extracted metadata' property
         // do we want to have this in here???
-        //Gatherer.config.set("general.view_extracted_metadata", Configuration.COLLECTION_SPECIFIC, true);
+        //Configuration.set("general.view_extracted_metadata", Configuration.COLLECTION_SPECIFIC, true);
         ncd_prompt.dispose();
         ncd_prompt = null;
@@ -1026 +1026 @@
         if (mirror_pos != -1) {
         if (ready) {
-            tab_pane.setEnabledAt(mirror_pos, Gatherer.config.get("workflow.mirror", false));
+            tab_pane.setEnabledAt(mirror_pos, Configuration.get("workflow.mirror", false));
         }
         else {
-            tab_pane.setEnabledAt(mirror_pos, Gatherer.config.get("workflow.mirror", true));
+            tab_pane.setEnabledAt(mirror_pos, Configuration.get("workflow.mirror", true));
         }
         }
         if (enrich_pos != -1) {
-        tab_pane.setEnabledAt(enrich_pos, ready && Gatherer.config.get("workflow.enrich", false));
+        tab_pane.setEnabledAt(enrich_pos, ready && Configuration.get("workflow.enrich", false));
         }
         if (design_pos != -1) {
-        tab_pane.setEnabledAt(design_pos, ready && Gatherer.config.get("workflow.design", false) && Gatherer.config.getMode() > Configuration.ASSISTANT_MODE);
+        tab_pane.setEnabledAt(design_pos, ready && Configuration.get("workflow.design", false) && Configuration.getMode() > Configuration.ASSISTANT_MODE);
         }
         if (create_pos != -1) {
-        tab_pane.setEnabledAt(create_pos, ready && Gatherer.config.get("workflow.create", false));
+        tab_pane.setEnabledAt(create_pos, ready && Configuration.get("workflow.create", false));
         }
         if (export_pos != -1) {
-        tab_pane.setEnabledAt(export_pos, ready && Gatherer.config.get("workflow.export", false));
+        tab_pane.setEnabledAt(export_pos, ready && Configuration.get("workflow.export", false));
         }
     }

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

@@ -226 +226 @@
         collection_tree.setModel(collection);
         collection_tree.repaint();
-        collection_filter.setBackground(Gatherer.config.getColor("coloring.collection_heading_background", false));
+        collection_filter.setBackground(Configuration.getColor("coloring.collection_heading_background", false));
     }
     else {
@@ -238 +238 @@
     collection_tree.setEnabled(ready);
     collection_filter.setEnabled(ready);
-    collection_filter.setEditable(Gatherer.config.getMode() > Configuration.LIBRARIAN_MODE);
+    collection_filter.setEditable(Configuration.getMode() > Configuration.LIBRARIAN_MODE);
     Dictionary.registerTooltip(collection_filter.getComboBox(), "Collection.Filter_Tooltip");
 
     // Change the label at the top of collection tree.
-    setEnabled(collection_label, ready, Gatherer.config.getColor("coloring.collection_heading_foreground", false), Gatherer.config.getColor("coloring.collection_heading_background", false));
+    setEnabled(collection_label, ready, Configuration.getColor("coloring.collection_heading_foreground", false), Configuration.getColor("coloring.collection_heading_background", false));
     // Ensure that this tree view of the collection record set is synchronized with any others.
     collection_tree_sync.add(collection_tree);
@@ -269 +269 @@
     workspace_label = new JLabel();
     workspace_label.setOpaque(true);
-    workspace_label.setBackground(Gatherer.config.getColor("coloring.workspace_heading_background", false));
-    workspace_label.setForeground(Gatherer.config.getColor("coloring.workspace_heading_foreground", false));
+    workspace_label.setBackground(Configuration.getColor("coloring.workspace_heading_background", false));
+    workspace_label.setForeground(Configuration.getColor("coloring.workspace_heading_foreground", false));
     Dictionary.registerText(workspace_label, "Collection.Workspace");
 
@@ -282 +282 @@
     workspace_tree.addTreeSelectionListener(file_queue);
     workspace_tree.putClientProperty("JTree.lineStyle", "Angled");
-    workspace_tree.setBackgroundNonSelectionColor(Gatherer.config.getColor("coloring.workspace_tree_background", false));
-    workspace_tree.setTextNonSelectionColor(Gatherer.config.getColor("coloring.workspace_tree_foreground", false));
-    workspace_tree.setBackgroundSelectionColor(Gatherer.config.getColor("coloring.workspace_selection_background", false));
-    workspace_tree.setTextSelectionColor(Gatherer.config.getColor("coloring.workspace_selection_foreground", false));
+    workspace_tree.setBackgroundNonSelectionColor(Configuration.getColor("coloring.workspace_tree_background", false));
+    workspace_tree.setTextNonSelectionColor(Configuration.getColor("coloring.workspace_tree_foreground", false));
+    workspace_tree.setBackgroundSelectionColor(Configuration.getColor("coloring.workspace_selection_background", false));
+    workspace_tree.setTextSelectionColor(Configuration.getColor("coloring.workspace_selection_foreground", false));
     workspace_tree.setRootVisible(false);
 
@@ -291 +291 @@
 
     workspace_filter = Gatherer.g_man.getFilter(workspace_tree);
-    workspace_filter.setBackground(Gatherer.config.getColor("coloring.workspace_heading_background", false));
-    workspace_filter.setEditable(Gatherer.config.getMode() > Configuration.LIBRARIAN_MODE);
+    workspace_filter.setBackground(Configuration.getColor("coloring.workspace_heading_background", false));
+    workspace_filter.setEditable(Configuration.getMode() > Configuration.LIBRARIAN_MODE);
     Dictionary.registerTooltip(workspace_filter.getComboBox(), "Collection.Filter_Tooltip");
 
@@ -324 +324 @@
     collection_tree.addTreeExpansionListener(Gatherer.g_man.foa_listener);
     collection_tree.putClientProperty("JTree.lineStyle", "Angled");
-    collection_tree.setBackgroundNonSelectionColor(Gatherer.config.getColor("coloring.collection_tree_background", false));
-    collection_tree.setTextNonSelectionColor(Gatherer.config.getColor("coloring.collection_tree_foreground", false));
-    collection_tree.setBackgroundSelectionColor(Gatherer.config.getColor("coloring.collection_selection_background", false));
-    collection_tree.setTextSelectionColor(Gatherer.config.getColor("coloring.collection_selection_foreground", false));
+    collection_tree.setBackgroundNonSelectionColor(Configuration.getColor("coloring.collection_tree_background", false));
+    collection_tree.setTextNonSelectionColor(Configuration.getColor("coloring.collection_tree_foreground", false));
+    collection_tree.setBackgroundSelectionColor(Configuration.getColor("coloring.collection_selection_background", false));
+    collection_tree.setTextSelectionColor(Configuration.getColor("coloring.collection_selection_foreground", false));
     collection_tree.setRootVisible(false);
     //collection_tree.setRootVisible(true);
@@ -335 +335 @@
     collection_filter = Gatherer.g_man.getFilter(collection_tree);
     if(collection != null) {
-        collection_filter.setBackground(Gatherer.config.getColor("coloring.collection_heading_background", false));
+        collection_filter.setBackground(Configuration.getColor("coloring.collection_heading_background", false));
     }
     else {
@@ -877 +877 @@
         content_pane.add(button_pane, BorderLayout.SOUTH);
         // Display
-        Dimension screen_size = Gatherer.config.screen_size;
+        Dimension screen_size = Configuration.screen_size;
         setLocation((screen_size.width - DIALOG_SIZE.width) / 2, (screen_size.height - DIALOG_SIZE.height) / 2);
         show();

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

@@ -41 +41 @@
 import java.io.*;
 import javax.swing.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
@@ -100 +101 @@
     JTextField name_field = new JTextField(name);
     name_field.setEditable(false);
-    name_field.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+    name_field.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
 
     JPanel person_pane = new JPanel();
@@ -108 +109 @@
     JTextField person_field = new JTextField(getValue("User"));
     person_field.setEditable(false);
-    person_field.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+    person_field.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
 
     JPanel machine_pane = new JPanel();
@@ -116 +117 @@
     JTextField machine_field = new JTextField(getValue("Machine"));
     machine_field.setEditable(false);
-    machine_field.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+    machine_field.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
 
     JPanel created_pane = new JPanel();
@@ -124 +125 @@
     JTextField created_field = new JTextField(getValue("Date"));
     created_field.setEditable(false);
-    created_field.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+    created_field.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
 
     JLabel central_label = new JLabel();

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

@@ -41 +41 @@
 import javax.swing.*;
 import javax.swing.event.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
@@ -255 +256 @@
     help.add(help_general);
     help.add(new JSeparator());
-    if (Gatherer.config.get("workflow.browse", true)) {
+    if (Configuration.get("workflow.browse", true)) {
         help.add(help_browse);
     }
-    if (Gatherer.config.get("workflow.mirror", true)) {
+    if (Configuration.get("workflow.mirror", true)) {
         help.add(help_mirror);
     }
-    if (Gatherer.config.get("workflow.gather", true)) {
+    if (Configuration.get("workflow.gather", true)) {
         help.add(help_collect);
     }
-    if (Gatherer.config.get("workflow.enrich", true)) {
+    if (Configuration.get("workflow.enrich", true)) {
         help.add(help_metaedit);
     }
-    if (Gatherer.config.get("workflow.design", true)) {
+    if (Configuration.get("workflow.design", true)) {
         help.add(help_design);
     }
-    if (Gatherer.config.get("workflow.export", true)) {
+    if (Configuration.get("workflow.export", true)) {
         help.add(help_export);
     }
-    if (Gatherer.config.get("workflow.create", true)) {
+    if (Configuration.get("workflow.create", true)) {
         help.add(help_build);
     }
-    if (Gatherer.config.get("workflow.preview", true)) {
+    if (Configuration.get("workflow.preview", true)) {
         help.add(help_preview);
     }

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

@@ -31 +31 @@
 import java.io.File;
 import javax.swing.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
@@ -105 +106 @@
     JTextField filename_field = new JTextField(Utility.trimCenter(file.getAbsolutePath(), 120));
     filename_field.setEditable(false);
-    filename_field.setFont(Gatherer.config.getFont("general.tooltip_font", false));
-    filename_field.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+    filename_field.setFont(Configuration.getFont("general.tooltip_font", false));
+    filename_field.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
     
     JLabel element_label = new JLabel();
@@ -112 +113 @@
     JTextField element_field = new JTextField(element); 
     element_field.setEditable(false);
-    element_field.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+    element_field.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
 
     JLabel current_value_label = new JLabel();
@@ -118 +119 @@
     JTextField current_value_field = new JTextField(current_value);
     current_value_field.setEditable(false);
-    current_value_field.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+    current_value_field.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
 
     JLabel new_value_label = new JLabel();
@@ -124 +125 @@
     JTextField new_value_field = new JTextField(new_value); // , (type == ADD_PROMPT || type == UPDATE_PROMPT));
     new_value_field.setEditable(false);
-    new_value_field.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+    new_value_field.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
 
     JPanel buttons_pane = new JPanel();

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

@@ -4 +4 @@
 import java.awt.*;
 import javax.swing.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.metadata.MetadataElement;
@@ -32 +33 @@
         MetadataElement metadata_element = (MetadataElement) value;
 
-        String interface_language_code = Gatherer.config.getLanguage();
+        String interface_language_code = Configuration.getLanguage();
         String metadata_element_display = "";
 

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

@@ -6 +6 @@
 import java.util.*;
 import javax.swing.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
@@ -106 +107 @@
 
     // Display
-    Dimension screen_size = Gatherer.config.screen_size;
+    Dimension screen_size = Configuration.screen_size;
     dialog.setLocation((screen_size.width - DIALOG_SIZE.width) / 2, (screen_size.height - DIALOG_SIZE.height) / 2);
     on_screen = dialog;
@@ -161 +162 @@
     {
         MetadataSet metadata_set = (MetadataSet) value;
-        String interface_language_code = Gatherer.config.getLanguage();
+        String interface_language_code = Configuration.getLanguage();
         String metadata_set_name = MetadataTools.getMetadataSetAttribute(metadata_set, "Name", interface_language_code, "en");
         setText(metadata_set_name);

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

@@ -6 +6 @@
 import javax.swing.*;
 import javax.swing.table.DefaultTableCellRenderer;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.metadata.MetadataElement;
@@ -60 +61 @@
     // Background
     if (isSelected) {
-        renderer.setBackground(Gatherer.config.getColor("coloring.workspace_heading_background", true));
+        renderer.setBackground(Configuration.getColor("coloring.workspace_heading_background", true));
     }
     else {
         if (column <= 1) {
-        renderer.setBackground(Gatherer.config.getColor("coloring.collection_heading_background", true));
+        renderer.setBackground(Configuration.getColor("coloring.collection_heading_background", true));
         }
         else {
-        renderer.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", true));
+        renderer.setBackground(Configuration.getColor("coloring.collection_tree_background", true));
         }
     }
@@ -78 +79 @@
     // We set a tooltip over the element column containing the definition of the element
     if (value instanceof MetadataElement) {
-        String interface_language_code = Gatherer.config.getLanguage();
+        String interface_language_code = Configuration.getLanguage();
         String metadata_element_definition = MetadataTools.getMetadataElementAttribute((MetadataElement) value, "definition", interface_language_code, "en");
         if (metadata_element_definition != null) {

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

@@ -90 +90 @@
     list_scroll = getter.getDownloadJobList();
 
-    current_mode = Gatherer.config.getMode();
+    current_mode = Configuration.getMode();
     // String user_dir = System.getProperty("user.dir"); // ****
     // System.err.println("**** user dir = "+user_dir);
@@ -210 +210 @@
     }
     // Lets see what warning message we should display, if any.
-    String wget_version_str = Gatherer.config.getWGetVersion();
+    String wget_version_str = Configuration.getWGetVersion();
     if(wget_version_str.equals(StaticStrings.NO_WGET_STR)) {
         // If there was no WGet available then downloading is disabled entirely

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

@@ -34 +34 @@
 import javax.swing.event.*;
 import javax.swing.text.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
@@ -53 +54 @@
     File collection_directory;
     if (Gatherer.GS3) {
-        collection_directory = new File(Utility.getCollectDir(Gatherer.config.gsdl3_path, Gatherer.config.site_name));
+        collection_directory = new File(Utility.getCollectDir(Configuration.gsdl3_path, Configuration.site_name));
     } else {
-        collection_directory = new File(Utility.getCollectDir(Gatherer.config.gsdl_path));
+        collection_directory = new File(Utility.getCollectDir(Configuration.gsdl_path));
     }
     File children[] = collection_directory.listFiles();
@@ -104 +105 @@
     // need to modify this to base a coll on any collection from any site
     if (Gatherer.GS3) {
-        File sites_dir = new File(Utility.getSitesDir(Gatherer.config.gsdl3_path));
+        File sites_dir = new File(Utility.getSitesDir(Configuration.gsdl3_path));
         File [] sites = sites_dir.listFiles();
         for (int i=0; i<sites.length; i++) {
-        File collect_dir = new File(Utility.getCollectDir(Gatherer.config.gsdl3_path, sites[i].getName()));
+        File collect_dir = new File(Utility.getCollectDir(Configuration.gsdl3_path, sites[i].getName()));
         if (collect_dir.exists()) {
             addCollectionsToModel(base_collection_model, collect_dir, sites[i].getName());
@@ -113 +114 @@
         }
     } else {
-       File gsdl_collection_directory = new File(Utility.getCollectDir(Gatherer.config.gsdl_path));
+       File gsdl_collection_directory = new File(Utility.getCollectDir(Configuration.gsdl_path));
        addCollectionsToModel(base_collection_model, gsdl_collection_directory, null);
     }
@@ -142 +143 @@
     Dictionary.setText(description_label, "NewCollectionPrompt.Collection_Description");
     description = new JTextArea();
-    description.setBackground(Gatherer.config.getColor("coloring.editable_background", false));
-    description.setForeground(Gatherer.config.getColor("coloring.editable_foreground", false));
+    description.setBackground(Configuration.getColor("coloring.editable_background", false));
+    description.setForeground(Configuration.getColor("coloring.editable_foreground", false));
     description.setRows(5);
     Dictionary.setTooltip(description, "CDM.General.Collection_Extra_Tooltip");
@@ -205 +206 @@
     content_pane.add(bottom_pane, BorderLayout.SOUTH);
     // Final dialog setup & positioning.
-    Dimension screen_size = Gatherer.config.screen_size;
+    Dimension screen_size = Configuration.screen_size;
     setLocation((screen_size.width - SIZE.width) / 2, (screen_size.height - SIZE.height) / 2);
     setVisible(true);
@@ -271 +272 @@
     File collection_directory;
     if (Gatherer.GS3) {
-        collection_directory = new File(Utility.getCollectDir(Gatherer.config.gsdl3_path, Gatherer.config.site_name));
+        collection_directory = new File(Utility.getCollectDir(Configuration.gsdl3_path, Configuration.site_name));
     } else {
-        collection_directory = new File(Utility.getCollectDir(Gatherer.config.gsdl_path));
+        collection_directory = new File(Utility.getCollectDir(Configuration.gsdl_path));
     }
 
@@ -334 +335 @@
     }
     public void keyPressed(KeyEvent event) {
-        component1.setForeground(Gatherer.config.getColor("coloring.editable_foreground", false));
-        component1.setBackground(Gatherer.config.getColor("coloring.editable_background", false));
+        component1.setForeground(Configuration.getColor("coloring.editable_foreground", false));
+        component1.setBackground(Configuration.getColor("coloring.editable_background", false));
         if(component2 != null) {
-        component2.setForeground(Gatherer.config.getColor("coloring.editable_foreground", false));
-        component2.setBackground(Gatherer.config.getColor("coloring.editable_background", false));
+        component2.setForeground(Configuration.getColor("coloring.editable_foreground", false));
+        component2.setBackground(Configuration.getColor("coloring.editable_background", false));
         }
     }

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

@@ -33 +33 @@
 import javax.swing.*;
 import javax.swing.event.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
@@ -105 +106 @@
     Dictionary.setText(elements_list_label, "NewCollectionPrompt.Metadata_Elements");
     elements_list = new JList();
-    elements_list.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
-    elements_list.setForeground(Gatherer.config.getColor("coloring.collection_tree_foreground", false));
-    elements_list.setSelectionBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
-    elements_list.setSelectionForeground(Gatherer.config.getColor("coloring.collection_tree_foreground", false));
+    elements_list.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
+    elements_list.setForeground(Configuration.getColor("coloring.collection_tree_foreground", false));
+    elements_list.setSelectionBackground(Configuration.getColor("coloring.collection_tree_background", false));
+    elements_list.setSelectionForeground(Configuration.getColor("coloring.collection_tree_foreground", false));
 
     JPanel button_pane = new JPanel();
@@ -153 +154 @@
 
     // Show
-    Dimension screen_size = Gatherer.config.screen_size;
+    Dimension screen_size = Configuration.screen_size;
     setLocation((screen_size.width - size.width) / 2, (screen_size.height - size.height) / 2);
     setVisible(true);

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

@@ -41 +41 @@
 import java.io.*;
 import javax.swing.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
@@ -82 +83 @@
     Dictionary.setText(destination_label, "NewFolderPrompt.Destination_Name");
     JTextField destination_textfield = new JTextField(node.getFile().getName());
-    destination_textfield.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+    destination_textfield.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
     destination_textfield.setEditable(false);
     

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

@@ -43 +43 @@
 import javax.swing.event.*;
 import javax.swing.text.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
@@ -70 +71 @@
     // Creation
     JPanel content_pane = (JPanel) getContentPane();
-    content_pane.setBackground(Gatherer.config.getColor("coloring.collection_heading_background", false));
+    content_pane.setBackground(Configuration.getColor("coloring.collection_heading_background", false));
     JPanel center_pane = new JPanel();
     center_pane.setOpaque(false);
@@ -81 +82 @@
     Dictionary.setText(name_label, "MEM.Name");
     name_field = new JTextField();
-    name_field.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
-    name_field.setForeground(Gatherer.config.getColor("coloring.collection_tree_foreground", false));
-    name_field.setSelectionColor(Gatherer.config.getColor("coloring.collection_selection_background", false));
-    name_field.setSelectedTextColor(Gatherer.config.getColor("coloring.collection_selection_foreground", false));
+    name_field.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
+    name_field.setForeground(Configuration.getColor("coloring.collection_tree_foreground", false));
+    name_field.setSelectionColor(Configuration.getColor("coloring.collection_selection_background", false));
+    name_field.setSelectedTextColor(Configuration.getColor("coloring.collection_selection_foreground", false));
     Dictionary.setTooltip(name_field, "MEM.Set_Name_Tooltip");
     
@@ -94 +95 @@
     Dictionary.setText(namespace_label, "MEM.Namespace");
     namespace_field = new JTextField();
-    namespace_field.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
-    namespace_field.setForeground(Gatherer.config.getColor("coloring.collection_tree_foreground", false));
-    namespace_field.setSelectionColor(Gatherer.config.getColor("coloring.collection_selection_background", false));
-    namespace_field.setSelectedTextColor(Gatherer.config.getColor("coloring.collection_selection_foreground", false));
+    namespace_field.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
+    namespace_field.setForeground(Configuration.getColor("coloring.collection_tree_foreground", false));
+    namespace_field.setSelectionColor(Configuration.getColor("coloring.collection_selection_background", false));
+    namespace_field.setSelectedTextColor(Configuration.getColor("coloring.collection_selection_foreground", false));
     Dictionary.setTooltip(namespace_field, "MEM.Set_Namespace_Tooltip");
 
@@ -143 +144 @@
     content_pane.add(button_pane, BorderLayout.SOUTH);
     
-    setLocation((Gatherer.config.screen_size.width - ADD_SET_SIZE.width) / 2, (Gatherer.config.screen_size.height - ADD_SET_SIZE.height) / 2);
+    setLocation((Configuration.screen_size.width - ADD_SET_SIZE.width) / 2, (Configuration.screen_size.height - ADD_SET_SIZE.height) / 2);
     setVisible(true);
     }

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

@@ -124 +124 @@
     }
     ArrayList build_arguments = new ArrayList();
-    int current_mode = Gatherer.config.getMode();
+    int current_mode = Configuration.getMode();
     int total_build_argument_count = build_options.getBuildArgumentCount();       
     for(int i = 0; i < total_build_argument_count; i++) {
@@ -142 +142 @@
         pane = new JPanel();
         pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
-        pane.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+        pane.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
         int argument_count = build_arguments.size();
         // If in any of the higher detail modes, and assuming we don't want super phat argument controls, we better ensure there is a minimum number or lines in the grid layout
@@ -184 +184 @@
     }
     ArrayList import_arguments = new ArrayList();
-    int current_mode = Gatherer.config.getMode();
+    int current_mode = Configuration.getMode();
     int total_import_argument_count = build_options.getImportArgumentCount();       
     for(int i = 0; i < total_import_argument_count; i++) {
@@ -202 +202 @@
         pane = new JPanel();
         pane.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
-        pane.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+        pane.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
         int argument_count = import_arguments.size();
         // If in any of the higher detail modes, and assuming we don't want super phat argument controls, we better ensure there is a minimum number or lines in the grid layout
@@ -392 +392 @@
         String tooltip = Utility.formatHTMLWidth("<html>" + argument.getDescription() + "</html>", 60);
         // Because of the dynamic order of component creation/connection/layout, we can't really follow that pattern here.
-        setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+        setBackground(Configuration.getColor("coloring.collection_tree_background", false));
         setBorder(BorderFactory.createEmptyBorder(2,0,2,0));
         setLayout(new BorderLayout());

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

@@ -190 +190 @@
     program_label.setPreferredSize(LABEL_SIZE);
     Dictionary.registerText(program_label, "Preferences.Connection.ProgramCommand");
-    program_field = new JTextField(Gatherer.config.getPreviewCommand());
+    program_field = new JTextField(Configuration.getPreviewCommand());
     program_field.setCaretPosition(0);
     Dictionary.registerTooltip(program_field, "Preferences.Connection.ProgramCommand_Tooltip");
@@ -198 +198 @@
     library_path_label = new JLabel();
     library_path_label.setPreferredSize(LABEL_SIZE);
-    library_path_field = new JTextField(Gatherer.config.getString("general.exec_address", true));
+    library_path_field = new JTextField(Configuration.getString("general.exec_address", true));
     library_path_field.setCaretPosition(0);
     if (Gatherer.GS3) {
@@ -228 +228 @@
         servlet_combobox = new JComboBox();
         // try to locate and select the current site
-        String this_site = Gatherer.config.site_name;
+        String this_site = Configuration.site_name;
         for(int b = 0; b < site_combobox.getItemCount(); b++) {
         String entry = (String) site_combobox.getItemAt(b);
@@ -252 +252 @@
         servlet_combobox.setEnabled(true);
         // try to locate and select the current servlet
-        String this_servlet = Gatherer.config.getServletPath();
+        String this_servlet = Configuration.getServletPath();
         for(int b = 0; b < servlet_combobox.getItemCount(); b++) {
             String entry = (String) servlet_combobox.getItemAt(b);
@@ -264 +264 @@
     }
     
-    boolean currently_enabled = Gatherer.config.get("general.use_proxy", true);
+    boolean currently_enabled = Configuration.get("general.use_proxy", true);
     // Creation
     JPanel connection_pane = new JPanel();
@@ -277 +277 @@
     proxy_host_label.setPreferredSize(LABEL_SIZE);
     Dictionary.registerText(proxy_host_label, "Preferences.Connection.Proxy_Host");
-    proxy_host_field = new JTextField(Gatherer.config.getString("general.proxy_host", true));
+    proxy_host_field = new JTextField(Configuration.getString("general.proxy_host", true));
     proxy_host_field.setEnabled(currently_enabled);
     Dictionary.registerTooltip(proxy_host_field, "Preferences.Connection.Proxy_Host_Tooltip");
@@ -285 +285 @@
     proxy_port_label.setPreferredSize(LABEL_SIZE);
     Dictionary.registerText(proxy_port_label, "Preferences.Connection.Proxy_Port");
-    String port_value = Gatherer.config.getString("general.proxy_port", true);
+    String port_value = Configuration.getString("general.proxy_port", true);
     if(port_value.length() > 0) {
        proxy_port_field = new JSpinner(new SpinnerNumberModel((new Integer(port_value)).intValue(), 0, 65535, 1));
@@ -414 +414 @@
     email_label.setPreferredSize(LABEL_SIZE);
     Dictionary.registerText(email_label, "Preferences.General.Email");
-    email_field = new EmailField(Gatherer.config.getColor("coloring.error_background", false));
-    email_field.setText(Gatherer.config.getEmail());
+    email_field = new EmailField(Configuration.getColor("coloring.error_background", false));
+    email_field.setText(Configuration.getEmail());
     Dictionary.registerTooltip(email_field, "Preferences.General.Email_Tooltip");
 
@@ -421 +421 @@
     view_extracted_metadata_checkbox = new JCheckBox();
     view_extracted_metadata_checkbox.setSelected(false);
-    if (Gatherer.config.get("general.view_extracted_metadata", Configuration.COLLECTION_SPECIFIC)) {
+    if (Configuration.get("general.view_extracted_metadata", Configuration.COLLECTION_SPECIFIC)) {
         view_extracted_metadata_checkbox.setSelected(true);
     }
@@ -429 +429 @@
     show_file_size_checkbox = new JCheckBox();
     show_file_size_checkbox.setSelected(false);
-    if (Gatherer.config.get("general.show_file_size", Configuration.COLLECTION_SPECIFIC)) {
+    if (Configuration.get("general.show_file_size", Configuration.COLLECTION_SPECIFIC)) {
         show_file_size_checkbox.setSelected(true);
     }
@@ -442 +442 @@
     Dictionary.registerTooltip(language_combobox, "Preferences.General.Interface_Language_Tooltip");
     // Try to locate and select the current language
-    String language_code = Gatherer.config.getLanguage();
+    String language_code = Configuration.getLanguage();
     for(int b = 0; b < language_combobox.getItemCount(); b++) {
         DictionaryEntry entry = (DictionaryEntry) language_combobox.getItemAt(b);
@@ -497 +497 @@
     mode_description_textarea.setWrapStyleWord(true);
     // Determine which value is already selected
-    switch(Gatherer.config.getMode()) {
+    switch(Configuration.getMode()) {
     case Configuration.ASSISTANT_MODE:
         assistant_mode_radio_button.setSelected(true);
@@ -540 +540 @@
     private JPanel createWarningPreferences() {
     // Retrieve all of the warning preferences settings.
-    HashMap warning_preferences = Gatherer.config.getAll("warning\\..*", true);
+    HashMap warning_preferences = Configuration.getAll("warning\\..*", true);
     warning_preferences_check_list = new CheckList(false);
     for(Iterator keys = warning_preferences.keySet().iterator(); keys.hasNext(); ) {
@@ -580 +580 @@
 
     workflow_mirror = new JCheckBox();
-    workflow_mirror.setSelected(Gatherer.config.get("workflow.mirror", false));
+    workflow_mirror.setSelected(Configuration.get("workflow.mirror", false));
     workflow_mirror.setPreferredSize(ROW_SIZE);
     Dictionary.registerText(workflow_mirror, "Preferences.Workflow.Mirror");
 
     workflow_gather = new JCheckBox();
-    workflow_gather.setSelected(Gatherer.config.get("workflow.gather", false));
+    workflow_gather.setSelected(Configuration.get("workflow.gather", false));
     workflow_gather.setPreferredSize(ROW_SIZE);
     Dictionary.registerText(workflow_gather, "Preferences.Workflow.Gather");
 
     workflow_enrich = new JCheckBox();
-    workflow_enrich.setSelected(Gatherer.config.get("workflow.enrich", false));
+    workflow_enrich.setSelected(Configuration.get("workflow.enrich", false));
     workflow_enrich.setPreferredSize(ROW_SIZE);
     Dictionary.registerText(workflow_enrich, "Preferences.Workflow.Enrich");
 
     workflow_design = new JCheckBox();
-    workflow_design.setSelected(Gatherer.config.get("workflow.design", false));
+    workflow_design.setSelected(Configuration.get("workflow.design", false));
     workflow_design.setPreferredSize(ROW_SIZE);
     Dictionary.registerText(workflow_design, "Preferences.Workflow.Design");
 
     workflow_export = new JCheckBox();
-    workflow_export.setSelected(Gatherer.config.get("workflow.export", false));
+    workflow_export.setSelected(Configuration.get("workflow.export", false));
     workflow_export.setPreferredSize(ROW_SIZE);
     Dictionary.registerText(workflow_export, "Preferences.Workflow.Export");
 
     workflow_create = new JCheckBox();
-    workflow_create.setSelected(Gatherer.config.get("workflow.create", false));
+    workflow_create.setSelected(Configuration.get("workflow.create", false));
     workflow_create.setPreferredSize(ROW_SIZE);
     Dictionary.registerText(workflow_create, "Preferences.Workflow.Create");
@@ -620 +620 @@
     checklist_pane.setLayout(new BoxLayout(checklist_pane, BoxLayout.Y_AXIS));
     checklist_pane.add(title_label);
-    if (Gatherer.config.get("workflow.mirror", true)) {
+    if (Configuration.get("workflow.mirror", true)) {
         checklist_pane.add(workflow_mirror);
     }
-    if (Gatherer.config.get("workflow.gather", true)) {
+    if (Configuration.get("workflow.gather", true)) {
         checklist_pane.add(workflow_gather);
     }
-    if (Gatherer.config.get("workflow.enrich", true)) {
+    if (Configuration.get("workflow.enrich", true)) {
         checklist_pane.add(workflow_enrich);
     }
-    if (Gatherer.config.get("workflow.design", true)) {
+    if (Configuration.get("workflow.design", true)) {
         checklist_pane.add(workflow_design);
     }
-    if (Gatherer.config.get("workflow.export", true)) {
+    if (Configuration.get("workflow.export", true)) {
         checklist_pane.add(workflow_export);
     }
-    if (Gatherer.config.get("workflow.create", true)) {
+    if (Configuration.get("workflow.create", true)) {
         checklist_pane.add(workflow_create);
     }
@@ -665 +665 @@
         program_str = program_str + " %1";
         }
-        Gatherer.config.setPreviewCommand(program_str);
+        Configuration.setPreviewCommand(program_str);
 
         String library_path_string = library_path_field.getText();
-        Gatherer.config.setString("general.exec_address", true, library_path_string);
+        Configuration.setString("general.exec_address", true, library_path_string);
         if (!library_path_string.equals("")) {
         try {
-            Gatherer.config.exec_address = new URL(library_path_string);
+            Configuration.exec_address = new URL(library_path_string);
         }
         catch (MalformedURLException error) {
@@ -679 +679 @@
         boolean site_changed = false;
         if (Gatherer.GS3) {
-        String current_site = Gatherer.config.site_name;
+        String current_site = Configuration.site_name;
         String new_site =(String)site_combobox.getSelectedItem() ;
         if (!new_site.equals(current_site)) {
             site_changed = true;
         }
-        Gatherer.config.setSiteAndServlet(new_site, (String)servlet_combobox.getSelectedItem());
+        Configuration.setSiteAndServlet(new_site, (String)servlet_combobox.getSelectedItem());
         }
         
-        Gatherer.config.set("general.use_proxy", true, use_proxy_checkbox.isSelected());
-        Gatherer.config.setString("general.proxy_host", true, proxy_host_field.getText());
-        Gatherer.config.setString("general.proxy_port", true, proxy_port_field.getValue() + "");
+        Configuration.set("general.use_proxy", true, use_proxy_checkbox.isSelected());
+        Configuration.setString("general.proxy_host", true, proxy_host_field.getText());
+        Configuration.setString("general.proxy_port", true, proxy_port_field.getValue() + "");
         Gatherer.setProxy();
 
         // General preferences
-        Gatherer.config.setEmail(email_field.getText());
-
-        Gatherer.config.set("general.show_file_size", Configuration.COLLECTION_SPECIFIC, show_file_size_checkbox.isSelected());
+        Configuration.setEmail(email_field.getText());
+
+        Configuration.set("general.show_file_size", Configuration.COLLECTION_SPECIFIC, show_file_size_checkbox.isSelected());
         // Force both workspace and collection trees to redraw
         if (Gatherer.g_man != null) {
@@ -702 +702 @@
         }
 
-        Gatherer.config.set("general.view_extracted_metadata", Configuration.COLLECTION_SPECIFIC, view_extracted_metadata_checkbox.isSelected());
+        Configuration.set("general.view_extracted_metadata", Configuration.COLLECTION_SPECIFIC, view_extracted_metadata_checkbox.isSelected());
         Gatherer.g_man.enrich_pane.valueChanged((TreeSelectionEvent) null); // Refresh metadata table
 
-        String current_lang = Gatherer.config.getLanguage();
+        String current_lang = Configuration.getLanguage();
         String new_lang = ((DictionaryEntry)language_combobox.getSelectedItem()).getLocale().getLanguage();
         if (!current_lang.equals(new_lang)) {
-        Gatherer.config.setLocale("general.locale", Configuration.GENERAL_SETTING, ((DictionaryEntry)language_combobox.getSelectedItem()).getLocale());
+        Configuration.setLocale("general.locale", Configuration.GENERAL_SETTING, ((DictionaryEntry)language_combobox.getSelectedItem()).getLocale());
         // delete the plugins and classifiers.dat files
         PlugInManager.clearPlugInCache();
@@ -715 +715 @@
 
         // Mode preferences
-        int current_mode = Gatherer.config.getMode();
+        int current_mode = Configuration.getMode();
         int new_mode;
         if(assistant_mode_radio_button.isSelected()) {
@@ -731 +731 @@
         // If there has been a change in modes, update the config, and also inform the persistant gui views that have a need to know
         if(new_mode != current_mode) {
-        Gatherer.config.setMode(new_mode);
+        Configuration.setMode(new_mode);
         Collection collection = Gatherer.c_man.getCollection();
         if (collection != null) {
@@ -741 +741 @@
         for(int i = 0; i < warning_preferences_check_list.getEntryCount(); i++) {
         Entry entry = warning_preferences_check_list.get(i);
-        Gatherer.config.set(entry.getProperty(), true, entry.isSelected());
+        Configuration.set(entry.getProperty(), true, entry.isSelected());
         }
 
@@ -751 +751 @@
 
         // Workflow preferences
-        // Gatherer.config.set("workflow.mirror", false, workflow_mirror.isSelected());
-        // Gatherer.config.set("workflow.gather", false, workflow_gather.isSelected());
-        // Gatherer.config.set("workflow.enrich", false, workflow_enrich.isSelected());
-        // Gatherer.config.set("workflow.design", false, workflow_design.isSelected());
-        // Gatherer.config.set("workflow.export", false, workflow_export.isSelected());
-        // Gatherer.config.set("workflow.create", false, workflow_create.isSelected());
+        // Configuration.set("workflow.mirror", false, workflow_mirror.isSelected());
+        // Configuration.set("workflow.gather", false, workflow_gather.isSelected());
+        // Configuration.set("workflow.enrich", false, workflow_enrich.isSelected());
+        // Configuration.set("workflow.design", false, workflow_design.isSelected());
+        // Configuration.set("workflow.export", false, workflow_export.isSelected());
+        // Configuration.set("workflow.create", false, workflow_create.isSelected());
         // Gatherer.g_man.workflowUpdate("Mirror", workflow_mirror.isSelected());
         // Gatherer.g_man.workflowUpdate("Gather", workflow_gather.isSelected());
         // Gatherer.g_man.workflowUpdate("Enrich", workflow_enrich.isSelected());
-        // Gatherer.g_man.workflowUpdate("Design", (workflow_design.isSelected() && Gatherer.config.getMode() > Configuration.ASSISTANT_MODE));
+        // Gatherer.g_man.workflowUpdate("Design", (workflow_design.isSelected() && Configuration.getMode() > Configuration.ASSISTANT_MODE));
         // Gatherer.g_man.workflowUpdate("Export", workflow_export.isSelected());
         // Gatherer.g_man.workflowUpdate("Create", workflow_create.isSelected());
 
         // Always save configuration changes immediately (in case the GLI crashes)
-        Gatherer.config.save();
+        Configuration.save();
 
         // Hide dialog
@@ -903 +903 @@
     public void actionPerformed(ActionEvent event) {
         boolean enabled = use_proxy_checkbox.isSelected();
-        Gatherer.config.set("general.use_proxy", true, enabled);
+        Configuration.set("general.use_proxy", true, enabled);
         // Fortunately this is already driven by the event thread.
         proxy_host_field.setEnabled(enabled);

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

@@ -45 +45 @@
 import javax.swing.filechooser.*;
 import javax.swing.table.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
@@ -81 +82 @@
 
     JPanel content_pane = (JPanel) getContentPane();
-    content_pane.setBackground(Gatherer.config.getColor("coloring.collection_heading_background", false));
+    content_pane.setBackground(Configuration.getColor("coloring.collection_heading_background", false));
 
     JTextArea instructions_area = new JTextArea();

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

@@ -33 +33 @@
 import javax.swing.*;
 import javax.swing.event.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
@@ -138 +139 @@
     content_pane.add(button_pane, BorderLayout.SOUTH);
 
-    Dimension screen_size = Gatherer.config.screen_size;
+    Dimension screen_size = Configuration.screen_size;
     setLocation((screen_size.width - SIZE.width) / 2, (screen_size.height - SIZE.height) / 2);
     screen_size = null;
@@ -210 +211 @@
     public GS3CollectionListModel() {
         data = new TreeSet();
-        File sites_folder = new File(Utility.getSitesDir(Gatherer.config.gsdl3_path));
+        File sites_folder = new File(Utility.getSitesDir(Configuration.gsdl3_path));
         File sites[] = sites_folder.listFiles();
         for (int s=0; s<sites.length; s++) {
         String site_name = sites[s].getName();
         System.err.println("found site "+site_name);
-        File collect_folder = new File(Utility.getCollectDir(Gatherer.config.gsdl3_path, site_name) );
+        File collect_folder = new File(Utility.getCollectDir(Configuration.gsdl3_path, site_name) );
         if (!collect_folder.exists()) {
             continue;
@@ -267 +268 @@
         File collect_folder;
         if (Gatherer.GS3) {
-        collect_folder = new File(Utility.getCollectDir(Gatherer.config.gsdl3_path, Gatherer.config.site_name) );
+        collect_folder = new File(Utility.getCollectDir(Configuration.gsdl3_path, Configuration.site_name) );
         } else {
-        collect_folder = new File(Utility.getCollectDir(Gatherer.config.gsdl_path));
+        collect_folder = new File(Utility.getCollectDir(Configuration.gsdl_path));
         }
         if (!collect_folder.exists()) {

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

@@ -184 +184 @@
     boolean bad_value = false;
     if(event.getSource() == ok_button) {
-        if(affected_property != null && Gatherer.config != null) {
+        if(affected_property != null && Configuration.self != null) {
         String value = value_field.getText();
         if(value.length() > 0) {
@@ -192 +192 @@
            if(!bad_value) {
               // Store the value of the property
-              Gatherer.config.setString(affected_property, true, value_field.getText());
+              Configuration.setString(affected_property, true, value_field.getText());
            }
         }
@@ -201 +201 @@
     }
     if(!bad_value) {
-        if(Gatherer.config != null) {
+        if (Configuration.self != null) {
         // Store the state of the show message checkbox.
-        Gatherer.config.set(full_property, true, !show_check.isSelected());
+        Configuration.set(full_property, true, !show_check.isSelected());
         }
         // Done.
@@ -230 +230 @@
 
     public int display() {
-    if(Gatherer.config == null || Gatherer.config.get(full_property, false)) {
+    if (Configuration.self == null || Configuration.get(full_property, false)) {
         setVisible(true);
     }

trunk/gli/src/org/greenstone/gatherer/gui/metaaudit/AutofilterDialog.java

@@ -41 +41 @@
 import java.util.*;
 import javax.swing.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
@@ -274 +275 @@
     content_pane.add(lower_pane, BorderLayout.SOUTH);
 
-    Dimension screen_size = Gatherer.config.screen_size;
+    Dimension screen_size = Configuration.screen_size;
     setLocation((screen_size.width - SIZE.width) / 2, (screen_size.height - SIZE.height) / 2);
     screen_size = null;

trunk/gli/src/org/greenstone/gatherer/gui/metaaudit/MetaAuditFrame.java

@@ -42 +42 @@
 import javax.swing.event.*;
 import javax.swing.tree.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
@@ -133 +134 @@
     content_pane.add(button_pane, BorderLayout.SOUTH);
           
-    Dimension screen_size = Gatherer.config.screen_size;
+    Dimension screen_size = Configuration.screen_size;
     setLocation((screen_size.width - SIZE.width) / 2, (screen_size.height - SIZE.height) / 2);
     screen_size = null;

trunk/gli/src/org/greenstone/gatherer/gui/table/GTableModel.java

@@ -367 +367 @@
             if (!element.toString().startsWith("hidden.")) {
             // Only process extracted metadata if the user has specified to
-            if(!element.getNamespace().equals(Utility.EXTRACTED_METADATA_NAMESPACE) || Gatherer.config.get("general.view_extracted_metadata", Configuration.COLLECTION_SPECIFIC)) {
+            if(!element.getNamespace().equals(Utility.EXTRACTED_METADATA_NAMESPACE) || Configuration.get("general.view_extracted_metadata", Configuration.COLLECTION_SPECIFIC)) {
                 // If a piece of metadata is at folder level, display the warning
                 if (!metadatum.isFileLevel()) {

trunk/gli/src/org/greenstone/gatherer/gui/table/TableCellRenderer.java

@@ -41 +41 @@
 import javax.swing.*;
 import javax.swing.table.DefaultTableCellRenderer;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Gatherer;
-import org.greenstone.gatherer.gui.table.GTableModel;
 import org.greenstone.gatherer.msm.ElementWrapper;
 import org.greenstone.gatherer.msm.Metadata;
@@ -88 +88 @@
     if(column <= 1) {
         if(isSelected) {
-        renderer.setBackground(Gatherer.config.getColor("coloring.workspace_heading_background", true));
+        renderer.setBackground(Configuration.getColor("coloring.workspace_heading_background", true));
         }
         else {
-        renderer.setBackground(Gatherer.config.getColor("coloring.collection_heading_background", true));
+        renderer.setBackground(Configuration.getColor("coloring.collection_heading_background", true));
         }
     }
     else {
         if(isSelected) {
-        renderer.setBackground(Gatherer.config.getColor("coloring.workspace_heading_background", true));
+        renderer.setBackground(Configuration.getColor("coloring.workspace_heading_background", true));
         }
         else {
-        renderer.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", true));
+        renderer.setBackground(Configuration.getColor("coloring.collection_tree_background", true));
         }
     }

trunk/gli/src/org/greenstone/gatherer/gui/tree/DragTreeCellRenderer.java

@@ -77 +77 @@
 
         String new_value = null;
-        if(Gatherer.config.get("general.show_file_size", Configuration.COLLECTION_SPECIFIC) && node.getFile() != null && !node.getAllowsChildren()) {
+        if(Configuration.get("general.show_file_size", Configuration.COLLECTION_SPECIFIC) && node.getFile() != null && !node.getAllowsChildren()) {
         new_value = node.toString() + StaticStrings.SPACE_CHARACTER + StaticStrings.LBRACKET_CHARACTER + Utility.formatFileLength(node.getFile().length()) + StaticStrings.RBRACKET_CHARACTER;
         }

trunk/gli/src/org/greenstone/gatherer/gui/tree/WorkspaceTree.java

@@ -4 +4 @@
 import java.util.Enumeration;
 import javax.swing.tree.TreePath;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.file.FileNode;
@@ -49 +50 @@
     if (refresh_reason == WorkspaceTree.LIBRARY_CONTENTS_CHANGED) {
         Gatherer.println("...Reason: library contents changed.");
-        String collect_directory_str = Gatherer.config.gsdl_path + Utility.COL_DIR;
+        String collect_directory_str = Configuration.gsdl_path + Utility.COL_DIR;
         refreshEveryNodeShowingFolder(collect_directory_str);
         WorkspaceTreeModel.refreshGreenstoneCollectionsNode();

trunk/gli/src/org/greenstone/gatherer/mem/MEMNode.java

@@ -151 +151 @@
             File collect_path;
             if (Gatherer.GS3) {
-                collect_path = new File(Utility.getCollectDir(Gatherer.config.gsdl3_path, Gatherer.config.site_name));
+                collect_path = new File(Utility.getCollectDir(Configuration.gsdl3_path, Configuration.site_name));
             }  else {
-                collect_path = new File(Utility.getCollectDir(Gatherer.config.gsdl_path));
+                collect_path = new File(Utility.getCollectDir(Configuration.gsdl_path));
             }
             File current_path = source_path;

trunk/gli/src/org/greenstone/gatherer/mem/MetadataEditorManager.java

@@ -44 +44 @@
 import javax.swing.text.*;
 import javax.swing.tree.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
@@ -153 +154 @@
     super(Gatherer.g_man);
     this.dialog_options = new String[2];
-    this.screen_size = Gatherer.config.screen_size;
+    this.screen_size = Configuration.screen_size;
     this.self = this;
 
@@ -167 +168 @@
 
     JPanel content_pane = (JPanel) getContentPane();
-    content_pane.setBackground(Gatherer.config.getColor("coloring.collection_heading_background", false));
+    content_pane.setBackground(Configuration.getColor("coloring.collection_heading_background", false));
           
     JPanel upper_pane = new JPanel();
@@ -180 +181 @@
     mds_tree.setCellRenderer(new MEMTreeCellRenderer());
     mds_tree.setRootVisible(false);
-    mds_tree.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
-    mds_tree.setForeground(Gatherer.config.getColor("coloring.collection_tree_foreground", false));
-    mds_tree.setSelectionColor(Gatherer.config.getColor("coloring.collection_selection_background", false));
-    mds_tree.setSelectedTextColor(Gatherer.config.getColor("coloring.collection_selection_foreground", false));
+    mds_tree.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
+    mds_tree.setForeground(Configuration.getColor("coloring.collection_tree_foreground", false));
+    mds_tree.setSelectionColor(Configuration.getColor("coloring.collection_selection_background", false));
+    mds_tree.setSelectedTextColor(Configuration.getColor("coloring.collection_selection_foreground", false));
     // We may have been asked to select a cetain initial set
     if(set != null) {
@@ -219 +220 @@
     set_attributes_pane.setOpaque(false);
     set_attributes_scroll = new JScrollPane();
-    set_attributes_scroll.getViewport().setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+    set_attributes_scroll.getViewport().setBackground(Configuration.getColor("coloring.collection_tree_background", false));
     set_attributes_scroll.setOpaque(true);
     set_attributes = new SmarterTable();
     set_attributes.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
-    set_attributes.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
-    set_attributes.setForeground(Gatherer.config.getColor("coloring.collection_tree_foreground", false));
-    set_attributes.setHeadingBackground(Gatherer.config.getColor("coloring.collection_heading_background", false));
-    set_attributes.setHeadingForeground(Gatherer.config.getColor("coloring.collection_heading_foreground", false));
+    set_attributes.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
+    set_attributes.setForeground(Configuration.getColor("coloring.collection_tree_foreground", false));
+    set_attributes.setHeadingBackground(Configuration.getColor("coloring.collection_heading_background", false));
+    set_attributes.setHeadingForeground(Configuration.getColor("coloring.collection_heading_foreground", false));
     set_attributes.setOpaque(false);
-    set_attributes.setSelectionColor(Gatherer.config.getColor("coloring.collection_selection_background", false));
-    set_attributes.setSelectedTextColor(Gatherer.config.getColor("coloring.collection_selection_foreground", false));
+    set_attributes.setSelectionColor(Configuration.getColor("coloring.collection_selection_background", false));
+    set_attributes.setSelectedTextColor(Configuration.getColor("coloring.collection_selection_foreground", false));
     set_attributes.getSelectionModel().setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
           
@@ -250 +251 @@
     element_attributes_pane.setOpaque(false);
     element_attributes_scroll = new JScrollPane();
-    element_attributes_scroll.getViewport().setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+    element_attributes_scroll.getViewport().setBackground(Configuration.getColor("coloring.collection_tree_background", false));
     element_attributes_scroll.setOpaque(true);
     element_attributes = new SmarterTable();
     element_attributes.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
-    element_attributes.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
-    element_attributes.setForeground(Gatherer.config.getColor("coloring.collection_tree_foreground", false));
-    element_attributes.setHeadingBackground(Gatherer.config.getColor("coloring.collection_heading_background", false));
-    element_attributes.setHeadingForeground(Gatherer.config.getColor("coloring.collection_heading_foreground", false));
-    element_attributes.setSelectionColor(Gatherer.config.getColor("coloring.collection_selection_background", false));
-    element_attributes.setSelectedTextColor(Gatherer.config.getColor("coloring.collection_selection_foreground", false));
+    element_attributes.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
+    element_attributes.setForeground(Configuration.getColor("coloring.collection_tree_foreground", false));
+    element_attributes.setHeadingBackground(Configuration.getColor("coloring.collection_heading_background", false));
+    element_attributes.setHeadingForeground(Configuration.getColor("coloring.collection_heading_foreground", false));
+    element_attributes.setSelectionColor(Configuration.getColor("coloring.collection_selection_background", false));
+    element_attributes.setSelectedTextColor(Configuration.getColor("coloring.collection_selection_foreground", false));
     element_attributes.getSelectionModel().setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
 
@@ -266 +267 @@
     element_values_pane.setOpaque(false);
     element_values = new SmarterTree();
-    element_values.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
-    element_values.setForeground(Gatherer.config.getColor("coloring.collection_tree_foreground", false));
+    element_values.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
+    element_values.setForeground(Configuration.getColor("coloring.collection_tree_foreground", false));
     element_values.setRootVisible(false);
-    element_values.setSelectionColor(Gatherer.config.getColor("coloring.collection_selection_background", false));
-    element_values.setSelectedTextColor(Gatherer.config.getColor("coloring.collection_selection_foreground", false));
+    element_values.setSelectionColor(Configuration.getColor("coloring.collection_selection_background", false));
+    element_values.setSelectedTextColor(Configuration.getColor("coloring.collection_selection_foreground", false));
 
     JPanel element_novalues_pane = new JPanel();
@@ -290 +291 @@
     profile_attributes_pane.setOpaque(false);
     profile_attributes_scroll = new JScrollPane();
-    profile_attributes_scroll.getViewport().setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+    profile_attributes_scroll.getViewport().setBackground(Configuration.getColor("coloring.collection_tree_background", false));
     profile_attributes_scroll.setOpaque(true);
     profile_attributes = new SmarterTable();
     profile_attributes.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
-    profile_attributes.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
-    profile_attributes.setForeground(Gatherer.config.getColor("coloring.collection_tree_foreground", false));
-    profile_attributes.setHeadingBackground(Gatherer.config.getColor("coloring.collection_heading_background", false));
-    profile_attributes.setHeadingForeground(Gatherer.config.getColor("coloring.collection_heading_foreground", false));
-    profile_attributes.setSelectionColor(Gatherer.config.getColor("coloring.collection_selection_background", false));
-    profile_attributes.setSelectedTextColor(Gatherer.config.getColor("coloring.collection_selection_foreground", false));
+    profile_attributes.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
+    profile_attributes.setForeground(Configuration.getColor("coloring.collection_tree_foreground", false));
+    profile_attributes.setHeadingBackground(Configuration.getColor("coloring.collection_heading_background", false));
+    profile_attributes.setHeadingForeground(Configuration.getColor("coloring.collection_heading_foreground", false));
+    profile_attributes.setSelectionColor(Configuration.getColor("coloring.collection_selection_background", false));
+    profile_attributes.setSelectedTextColor(Configuration.getColor("coloring.collection_selection_foreground", false));
     profile_attributes.getSelectionModel().setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
 
@@ -642 +643 @@
         // Creation
         JPanel content_pane = (JPanel) getContentPane();
-        content_pane.setBackground(Gatherer.config.getColor("coloring.collection_heading_background", false));
+        content_pane.setBackground(Configuration.getColor("coloring.collection_heading_background", false));
         JPanel upper_pane = new JPanel();
         upper_pane.setOpaque(false);
@@ -675 +676 @@
 
         JTextArea v_text_area = (JTextArea) value.getTextComponent();
-        v_text_area.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
-        v_text_area.setForeground(Gatherer.config.getColor("coloring.collection_tree_foreground", false));
-        v_text_area.setSelectionColor(Gatherer.config.getColor("coloring.collection_selection_background", false));
-        v_text_area.setSelectedTextColor(Gatherer.config.getColor("coloring.collection_selection_foreground", false));
+        v_text_area.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
+        v_text_area.setForeground(Configuration.getColor("coloring.collection_tree_foreground", false));
+        v_text_area.setSelectionColor(Configuration.getColor("coloring.collection_selection_background", false));
+        v_text_area.setSelectedTextColor(Configuration.getColor("coloring.collection_selection_foreground", false));
         Dictionary.setTooltip(v_text_area, "MEM.Attribute_Value_Tooltip");
 
@@ -727 +728 @@
         content_pane.add(center_pane, BorderLayout.CENTER);
 
-        setLocation((Gatherer.config.screen_size.width - ADD_OR_EDIT_ATTRIBUTE_SIZE.width) / 2, (Gatherer.config.screen_size.height - ADD_OR_EDIT_ATTRIBUTE_SIZE.height) / 2);
+        setLocation((Configuration.screen_size.width - ADD_OR_EDIT_ATTRIBUTE_SIZE.width) / 2, (Configuration.screen_size.height - ADD_OR_EDIT_ATTRIBUTE_SIZE.height) / 2);
     }
     /** Any implementation of ActionListener must include this method so that we can be informed when an action as occured on our registered component, allowing us to add a new attribute to the selected set or element.
@@ -1047 +1048 @@
         // Creation
         JPanel content_pane = (JPanel) getContentPane();
-        content_pane.setBackground(Gatherer.config.getColor("coloring.collection_heading_background", false));
+        content_pane.setBackground(Configuration.getColor("coloring.collection_heading_background", false));
         JPanel center_pane = new JPanel();
         center_pane.setOpaque(false);
@@ -1065 +1066 @@
         Dictionary.setText(name_label, "MEM.Name");
         name_field = new NonWhitespaceField();
-        name_field.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
-        name_field.setForeground(Gatherer.config.getColor("coloring.collection_tree_foreground", false));
-        name_field.setSelectionColor(Gatherer.config.getColor("coloring.collection_selection_background", false));
-        name_field.setSelectedTextColor(Gatherer.config.getColor("coloring.collection_selection_foreground", false));
+        name_field.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
+        name_field.setForeground(Configuration.getColor("coloring.collection_tree_foreground", false));
+        name_field.setSelectionColor(Configuration.getColor("coloring.collection_selection_background", false));
+        name_field.setSelectedTextColor(Configuration.getColor("coloring.collection_selection_foreground", false));
         Dictionary.setTooltip(name_field, "MEM.Element_Name_Tooltip");
 
@@ -1112 +1113 @@
         content_pane.add(button_pane, BorderLayout.SOUTH);
 
-        setLocation((Gatherer.config.screen_size.width - ADD_ELEMENT_SIZE.width) / 2, (Gatherer.config.screen_size.height - ADD_ELEMENT_SIZE.height) / 2);
+        setLocation((Configuration.screen_size.width - ADD_ELEMENT_SIZE.width) / 2, (Configuration.screen_size.height - ADD_ELEMENT_SIZE.height) / 2);
     }
 
@@ -1126 +1127 @@
         if(!current_set.containsElement(name_str)) {
             // Add it,
-            String language_code = Gatherer.config.getLanguage();
+            String language_code = Configuration.getLanguage();
             ElementWrapper element = current_set.addElement(name_str, language_code);
             // Then update the tree
@@ -1187 +1188 @@
         // Creation
         JPanel content_pane = (JPanel) getContentPane();
-        content_pane.setBackground(Gatherer.config.getColor("coloring.collection_heading_background", false));
+        content_pane.setBackground(Configuration.getColor("coloring.collection_heading_background", false));
         JPanel center_pane = new JPanel();
         center_pane.setOpaque(false);
@@ -1202 +1203 @@
         Dictionary.setText(name_label, "MEM.Name");
         name_field = new JTextField();
-        name_field.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
-        name_field.setForeground(Gatherer.config.getColor("coloring.collection_tree_foreground", false));
-        name_field.setSelectionColor(Gatherer.config.getColor("coloring.collection_selection_background", false));
-        name_field.setSelectedTextColor(Gatherer.config.getColor("coloring.collection_selection_foreground", false));
+        name_field.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
+        name_field.setForeground(Configuration.getColor("coloring.collection_tree_foreground", false));
+        name_field.setSelectionColor(Configuration.getColor("coloring.collection_selection_background", false));
+        name_field.setSelectedTextColor(Configuration.getColor("coloring.collection_selection_foreground", false));
         Dictionary.setTooltip(name_field, "MEM.Profile_Name_Tooltip"); 
 
@@ -1248 +1249 @@
         content_pane.add(button_pane, BorderLayout.SOUTH);
 
-        setLocation((Gatherer.config.screen_size.width - ADD_FILE_SIZE.width) / 2, (Gatherer.config.screen_size.height - ADD_FILE_SIZE.height) / 2);
+        setLocation((Configuration.screen_size.width - ADD_FILE_SIZE.width) / 2, (Configuration.screen_size.height - ADD_FILE_SIZE.height) / 2);
     }
     /** Any implementation of ActionListener must include this method so that we can be informed when an action as occured on our registered component, allowing us to
@@ -1305 +1306 @@
         // Creation
         JPanel content_pane = (JPanel) getContentPane();
-        content_pane.setBackground(Gatherer.config.getColor("coloring.collection_heading_background", false));
+        content_pane.setBackground(Configuration.getColor("coloring.collection_heading_background", false));
         JPanel center_pane = new JPanel();
         center_pane.setOpaque(false);
@@ -1316 +1317 @@
         Dictionary.setText(namespace_label, "MEM.Namespace");
         namespace_field = TransformCharacterTextField.createNamespaceTextField();
-        namespace_field.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
-        namespace_field.setForeground(Gatherer.config.getColor("coloring.collection_tree_foreground", false));
-        namespace_field.setSelectionColor(Gatherer.config.getColor("coloring.collection_selection_background", false));
-        namespace_field.setSelectedTextColor(Gatherer.config.getColor("coloring.collection_selection_foreground", false));
+        namespace_field.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
+        namespace_field.setForeground(Configuration.getColor("coloring.collection_tree_foreground", false));
+        namespace_field.setSelectionColor(Configuration.getColor("coloring.collection_selection_background", false));
+        namespace_field.setSelectedTextColor(Configuration.getColor("coloring.collection_selection_foreground", false));
         Dictionary.setTooltip(namespace_field, "MEM.Set_Namespace_Tooltip");
 
@@ -1326 +1327 @@
         Dictionary.setText(name_label, "MEM.Name");
         name_field = new JTextField();
-        name_field.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
-        name_field.setForeground(Gatherer.config.getColor("coloring.collection_tree_foreground", false));
-        name_field.setSelectionColor(Gatherer.config.getColor("coloring.collection_selection_background", false));
-        name_field.setSelectedTextColor(Gatherer.config.getColor("coloring.collection_selection_foreground", false));
+        name_field.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
+        name_field.setForeground(Configuration.getColor("coloring.collection_tree_foreground", false));
+        name_field.setSelectionColor(Configuration.getColor("coloring.collection_selection_background", false));
+        name_field.setSelectedTextColor(Configuration.getColor("coloring.collection_selection_foreground", false));
         Dictionary.setTooltip(name_field, "MEM.Set_Name_Tooltip");
 
@@ -1371 +1372 @@
         content_pane.add(button_pane, BorderLayout.SOUTH);
 
-        setLocation((Gatherer.config.screen_size.width - ADD_SET_SIZE.width) / 2, (Gatherer.config.screen_size.height - ADD_SET_SIZE.height) / 2);
+        setLocation((Configuration.screen_size.width - ADD_SET_SIZE.width) / 2, (Configuration.screen_size.height - ADD_SET_SIZE.height) / 2);
     }
     /** Any implementation of ActionListener must include this method so that we can be informed when an action as occured on our registered component, allowing us to
@@ -1434 +1435 @@
         // Create
         JPanel content_pane = (JPanel) getContentPane();
-        content_pane.setBackground(Gatherer.config.getColor("coloring.collection_heading_background", false));
+        content_pane.setBackground(Configuration.getColor("coloring.collection_heading_background", false));
         JPanel center_pane = new JPanel();
         center_pane.setOpaque(false);
@@ -1445 +1446 @@
         Dictionary.setText(subject_tree_label, "MEM.Subject");
         subject_tree = new SmarterTree();
-        subject_tree.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
-        subject_tree.setForeground(Gatherer.config.getColor("coloring.collection_tree_foreground", false));
-        subject_tree.setSelectionColor(Gatherer.config.getColor("coloring.collection_selection_background", false));
-        subject_tree.setSelectedTextColor(Gatherer.config.getColor("coloring.collection_selection_foreground", false));
+        subject_tree.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
+        subject_tree.setForeground(Configuration.getColor("coloring.collection_tree_foreground", false));
+        subject_tree.setSelectionColor(Configuration.getColor("coloring.collection_selection_background", false));
+        subject_tree.setSelectedTextColor(Configuration.getColor("coloring.collection_selection_foreground", false));
         JPanel value_pane = new JPanel();
         value_pane.setOpaque(false);
@@ -1455 +1456 @@
         Dictionary.setText(value_label, "MEM.Value"); 
         value = new JTextArea();
-        value.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
-        value.setForeground(Gatherer.config.getColor("coloring.collection_tree_foreground", false));
-        value.setSelectionColor(Gatherer.config.getColor("coloring.collection_selection_background", false));
-        value.setSelectedTextColor(Gatherer.config.getColor("coloring.collection_selection_foreground", false));
+        value.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
+        value.setForeground(Configuration.getColor("coloring.collection_tree_foreground", false));
+        value.setSelectionColor(Configuration.getColor("coloring.collection_selection_background", false));
+        value.setSelectedTextColor(Configuration.getColor("coloring.collection_selection_foreground", false));
         Dictionary.setTooltip(value, "MEM.Value_Tooltip");
 
@@ -1502 +1503 @@
         content_pane.add(inner_pane, BorderLayout.CENTER);
         content_pane.add(button_pane, BorderLayout.SOUTH);
-        setLocation((Gatherer.config.screen_size.width - ADD_OR_EDIT_VALUE_SIZE.width) / 2, (Gatherer.config.screen_size.height - ADD_OR_EDIT_VALUE_SIZE.height) / 2);
+        setLocation((Configuration.screen_size.width - ADD_OR_EDIT_VALUE_SIZE.width) / 2, (Configuration.screen_size.height - ADD_OR_EDIT_VALUE_SIZE.height) / 2);
     }
     /** Any implementation of ActionListener must include this method so that we can be informed when an action as occured on our registered component, allowing us to add a new metadata value to the assigned values tree.

trunk/gli/src/org/greenstone/gatherer/metadata/MetadataAuditTableModel.java

@@ -129 +129 @@
 
         // Get the extracted metadata for this file, if desired
-        if (Gatherer.config.get("general.view_extracted_metadata", Configuration.COLLECTION_SPECIFIC) == true) {
+        if (Configuration.get("general.view_extracted_metadata", Configuration.COLLECTION_SPECIFIC) == true) {
             current_file_metadata.addAll(DocXMLFileManager.getMetadataExtractedFromFile(current_file));
         }

trunk/gli/src/org/greenstone/gatherer/metadata/MetadataElement.java

@@ -29 +29 @@
 
 import java.io.File;
-import org.greenstone.gatherer.Gatherer;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.util.XMLTools;
 import org.w3c.dom.*;
@@ -101 +101 @@
     public String getDisplayName()
     {
-    String metadata_element_display_name = MetadataTools.getMetadataElementAttribute(this, "identifier", Gatherer.config.getLanguage(), "en");
+    String metadata_element_display_name = MetadataTools.getMetadataElementAttribute(this, "identifier", Configuration.getLanguage(), "en");
     if (metadata_element_display_name != null) {
         return getNamespace() + "." + metadata_element_display_name;

trunk/gli/src/org/greenstone/gatherer/metadata/MetadataValueTableModel.java

@@ -178 +178 @@
 
         // Get the extracted metadata for this file, if desired
-        if (Gatherer.config.get("general.view_extracted_metadata", Configuration.COLLECTION_SPECIFIC) == true) {
+        if (Configuration.get("general.view_extracted_metadata", Configuration.COLLECTION_SPECIFIC) == true) {
             ArrayList extracted_metadata = DocXMLFileManager.getMetadataExtractedFromFile(current_file);
             for (int k = 0; k < extracted_metadata.size(); k++) {

trunk/gli/src/org/greenstone/gatherer/msm/ExportMDSPrompt.java

@@ -42 +42 @@
 import javax.swing.*;
 import javax.swing.filechooser.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
@@ -201 +202 @@
     content_pane.add(button_pane, BorderLayout.SOUTH);
     // Display
-    Dimension screen_size = Gatherer.config.screen_size;
+    Dimension screen_size = Configuration.screen_size;
     setLocation((screen_size.width - getSize().width) / 2, (screen_size.height - getSize().height) / 2);
     }

trunk/gli/src/org/greenstone/gatherer/msm/GreenstoneArchiveParser.java

@@ -189 +189 @@
         MetadataSet extracted_mds = Gatherer.c_man.msm.getSet(Utility.EXTRACTED_METADATA_NAMESPACE);
         if (extracted_mds != null) {
-        element = extracted_mds.addElement(name, Gatherer.config.getLanguage());
+        element = extracted_mds.addElement(name, Configuration.getLanguage());
         }
     }

trunk/gli/src/org/greenstone/gatherer/msm/MSMPrompt.java

@@ -43 +43 @@
 import javax.swing.*;
 import javax.swing.event.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
@@ -101 +102 @@
     progress.setStringPainted(true);
 
-    screen_size = Gatherer.config.screen_size;
+    screen_size = Configuration.screen_size;
     }
 
@@ -686 +687 @@
     JPanel control_pane = new JPanel();
     JTextArea instructions = new JTextArea();
-    instructions.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+    instructions.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
     instructions.setEditable(false);
     instructions.setLineWrap(true);
@@ -698 +699 @@
     Dictionary.setText(original_label, "MSMPrompt.Select_Element_Original");
     JTextField original = new JTextField(name);
-    original.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+    original.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
     original.setEditable(false);
 
@@ -878 +879 @@
         Element element = mds.getElement(name);
         if (element == null) {
-        result = mds.addElement(name, Gatherer.config.getLanguage());
+        result = mds.addElement(name, Configuration.getLanguage());
         }
         else {

trunk/gli/src/org/greenstone/gatherer/msm/MSMUtils.java

@@ -39 +39 @@
 import java.io.*;
 import java.util.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.cdm.CommandTokenizer;
@@ -379 +380 @@
      */
     static public String getDescription(Element element) {
-    String language_code_str = Gatherer.config.getLanguage();
+    String language_code_str = Configuration.getLanguage();
     StringBuffer description = new StringBuffer(StaticStrings.EMPTY_STR);
     description.append(getElementAttribute(element, StaticStrings.DEFINITION_VALUE, language_code_str));
@@ -532 +533 @@
      */
     static final public String getIdentifier(Element element) {
-    String identifier = getElementAttribute(element, StaticStrings.IDENTIFIER_VALUE, Gatherer.config.getLanguage());
+    String identifier = getElementAttribute(element, StaticStrings.IDENTIFIER_VALUE, Configuration.getLanguage());
     // Failing the above we return the nodes name instead.
     if(identifier == null || identifier.length() == 0) {

trunk/gli/src/org/greenstone/gatherer/msm/MetadataSet.java

@@ -41 +41 @@
 import java.util.*;
 import org.apache.xerces.dom.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
@@ -294 +295 @@
      */
     public String getDescription() {
-    if(current_language_code != null && !Gatherer.config.getLanguage().equals(current_language_code)) {
+    if(current_language_code != null && !Configuration.getLanguage().equals(current_language_code)) {
         description = null;
     }
@@ -391 +392 @@
      */
     public String getName() {
-    if(current_language_code != null && !Gatherer.config.getLanguage().equals(current_language_code)) {
+    if(current_language_code != null && !Configuration.getLanguage().equals(current_language_code)) {
         name = null;
     }
@@ -537 +538 @@
 
     // Determine the language code.
-    current_language_code = Gatherer.config.getLanguage();
+    current_language_code = Configuration.getLanguage();
 
     ///ystem.err.println("Searching for the " + element_name + " in " + current_language_code);

trunk/gli/src/org/greenstone/gatherer/msm/MetadataSetManager.java

@@ -359 +359 @@
         MetadataSet mds = (MetadataSet)mds_hashtable.get(keys.nextElement());
         if((!mds.getNamespace().equals(Utility.EXTRACTED_METADATA_NAMESPACE) && !mds.getNamespace().equals(HIDDEN)) 
-           || (mds.getNamespace().equals(Utility.EXTRACTED_METADATA_NAMESPACE) && (Gatherer.config.get("general.view_extracted_metadata", Configuration.COLLECTION_SPECIFIC) || force_extracted)) 
+           || (mds.getNamespace().equals(Utility.EXTRACTED_METADATA_NAMESPACE) && (Configuration.get("general.view_extracted_metadata", Configuration.COLLECTION_SPECIFIC) || force_extracted)) 
            || (mds.getNamespace().equals(Utility.EXTRACTED_METADATA_NAMESPACE) && mds.getNamespace().equals(HIDDEN) && all)) {
         NodeList set_elements = mds.getElements();

trunk/gli/src/org/greenstone/gatherer/shell/GBuildProgressMonitor.java

@@ -217 +217 @@
             state = BUILD;
             // Produce a lower detail message if required
-            if(Gatherer.config.getMode() <= threshold && !stop) {
+            if(Configuration.getMode() <= threshold && !stop) {
             queue.add(new GShellEvent(event.getSource(), 0, event.getType(), Dictionary.get("GShell.Build.BuildBegun1"), event.getStatus()));
             }
@@ -237 +237 @@
             if(value.equals(COMPRESSTEXT_VALUE)) {
             state = COMPRESSTEXT;
-            if(Gatherer.config.getMode() <= threshold) {
+            if(Configuration.getMode() <= threshold) {
                 queue.add(new GShellEvent(event.getSource(), 0, event.getType(), Dictionary.get("GShell.Build.CompressText"), event.getStatus()));
             }
@@ -243 +243 @@
             else if(value.equals(INDEX_VALUE)) {
             state = INDEX;
-            if(Gatherer.config.getMode() <= threshold) {
+            if(Configuration.getMode() <= threshold) {
                 String args[] = new String[1];
                 args[0] = element.getAttribute(SOURCE_ATTRIBUTE);
@@ -252 +252 @@
             else if(value.equals(CREATEINFODATA_VALUE)) {
             state = CREATEINFODATA;
-            if(Gatherer.config.getMode() <= threshold) {
+            if(Configuration.getMode() <= threshold) {
                 queue.add(new GShellEvent(event.getSource(), 0, event.getType(), Dictionary.get("GShell.Build.InfoDatabase"), event.getStatus()));
             }
@@ -258 +258 @@
             else if(value.equals(PHIND_VALUE)) {
             state = PHIND;
-            if(Gatherer.config.getMode() <= threshold) {
+            if(Configuration.getMode() <= threshold) {
                 queue.add(new GShellEvent(event.getSource(), 0, event.getType(), Dictionary.get("GShell.Build.Phind"), event.getStatus()));
             }
@@ -264 +264 @@
             else if(value.equals(CREATINGAUXILARY_VALUE)) {
             state = CREATINGAUXILARY;
-            if(Gatherer.config.getMode() <= threshold) {
+            if(Configuration.getMode() <= threshold) {
                 queue.add(new GShellEvent(event.getSource(), 0, event.getType(), Dictionary.get("GShell.Build.Auxilary"), event.getStatus()));
             }
@@ -280 +280 @@
             setValue(MAX);
             state = BASE;
-            if(Gatherer.config.getMode() <= threshold) {
+            if(Configuration.getMode() <= threshold) {
             queue.add(new GShellEvent(event.getSource(), 0, event.getType(), Dictionary.get("GShell.Build.BuildComplete1"), event.getStatus()));
             }
@@ -470 +470 @@
     }
     // If we are dealing with lower detail modes then veto any other messages. We do this here as the progress monitors are garuenteed to recieve this message before anything else
-    else if(Gatherer.config.getMode() <= threshold) {
+    else if(Configuration.getMode() <= threshold) {
         event.veto();
     }

trunk/gli/src/org/greenstone/gatherer/shell/GImportProgressMonitor.java

@@ -222 +222 @@
             showing_string = false;
         }
-        if(Gatherer.config.getMode() <= threshold) {
+        if(Configuration.getMode() <= threshold) {
             queue.add(new GShellEvent(event.getSource(), 0, event.getType(), Dictionary.get("GShell.Import.ImportBegun1"), event.getStatus()));
         }
@@ -241 +241 @@
         ///ystem.err.println("#FileProcessing");
         // If we are at lower mode settings fire a new 'dumbed down' event
-        if(Gatherer.config.getMode() <= threshold) {
+        if(Configuration.getMode() <= threshold) {
             String args[] = new String[2];
             args[0] = element.getAttribute(NAME_ATTRIBUTE);
@@ -251 +251 @@
         // processing error
         else if (name.equals(PROCESSINGERROR_ELEMENT)) {
-        if(Gatherer.config.getMode() <= threshold) {
+        if(Configuration.getMode() <= threshold) {
             String args[] = new String[1];
             args[0] = element.getAttribute(NAME_ATTRIBUTE);
@@ -260 +260 @@
         // unrecognised file
         else if (name.equals(NONRECOGNISEDFILE_ELEMENT)) {
-        if(Gatherer.config.getMode() <= threshold) {
+        if(Configuration.getMode() <= threshold) {
             String args[] = new String[1];
             args[0] =element.getAttribute(NAME_ATTRIBUTE);
@@ -269 +269 @@
         // unprocessed file
         else if (name.equals(NONPROCESSEDFILE_ELEMENT)) {
-        if(Gatherer.config.getMode() <= threshold) {
+        if(Configuration.getMode() <= threshold) {
             String args[] = new String[1];
             args[0] =element.getAttribute(NAME_ATTRIBUTE);          
@@ -281 +281 @@
         setValue(next_progress_value);
         // If we are at lower mode settings fire a new 'dumbed down' event
-        if(Gatherer.config.getMode() <= threshold) {
+        if(Configuration.getMode() <= threshold) {
             queue.add(new GShellEvent(event.getSource(), 0, event.getType(), Dictionary.get("GShell.Import.ImportComplete1"), event.getStatus()));
             String considered_str = element.getAttribute(CONSIDERED_ATTRIBUTE);
@@ -361 +361 @@
         }
     } // GLI output
-    else if(Gatherer.config.getMode() <= threshold) {
+    else if(Configuration.getMode() <= threshold) {
         event.veto();
     }

trunk/gli/src/org/greenstone/gatherer/shell/GShell.java

@@ -473 +473 @@
         Utility.upload_url_zip(col_name,"etc");
 
-        String col_dir = Utility.getCollectionDir(Gatherer.config.gsdl_path, col_name);
+        String col_dir = Utility.getCollectionDir(Configuration.gsdl_path, col_name);
         File img_dir = new File(Utility.getImagesDir(col_dir));
         if (img_dir.exists()) {
@@ -654 +654 @@
     
     // If we were cancelled, and we are lower details modes, fire off one last message.
-    if(status == CANCELLED && Gatherer.config.getMode() <= Configuration.SYSTEMS_MODE) {
+    if(status == CANCELLED && Configuration.getMode() <= Configuration.SYSTEMS_MODE) {
         GShellEvent current_event = new GShellEvent(this, 0, type, Dictionary.get("GShell.Build.BuildCancelled"), status);
         Object[] concerned = listeners.getListenerList();

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

@@ -46 +46 @@
 import org.apache.xerces.parsers.*;
 import org.apache.xml.serialize.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
@@ -498 +499 @@
 
     if (Gatherer.GS3) {
-        this_col_dir = getCollectionDir(Gatherer.config.gsdl3_path, Gatherer.config.site_name, col_name);
+        this_col_dir = getCollectionDir(Configuration.gsdl3_path, Configuration.site_name, col_name);
     } else {
-        this_col_dir = getCollectionDir(Gatherer.config.gsdl_path, col_name);
+        this_col_dir = getCollectionDir(Configuration.gsdl_path, col_name);
         
     }
@@ -584 +585 @@
     static public String getHelpFolder() {
 
-    String help_folder = "help/" + Gatherer.config.getLanguage() + "/";
+    String help_folder = "help/" + Configuration.getLanguage() + "/";
 
     // Try in the JAR/classes directory first
@@ -813 +814 @@
             
         // set up output stream for zip download
-        String col_dir = Utility.getCollectDir(Gatherer.config.gsdl_path);
+        String col_dir = Utility.getCollectDir(Configuration.gsdl_path);
         String zip_fname = col_dir + col_name + ".zip";
         FileOutputStream zip_fos = new FileOutputStream(zip_fname);
@@ -842 +843 @@
     final int maxBufferSize = 1024;
 
-    String col_dir = Utility.getCollectDir(Gatherer.config.gsdl_path);
+    String col_dir = Utility.getCollectDir(Configuration.gsdl_path);
     String zip_fname = col_dir + col_name + ".zip";
     String upload_cgi = Gatherer.cgiBase + "upload";
@@ -1027 +1028 @@
     static public void zipup(String col_name, String dir_or_file)
     {
-    String col_dir = Utility.getCollectDir(Gatherer.config.gsdl_path);
+    String col_dir = Utility.getCollectDir(Configuration.gsdl_path);
     int prefix_strip = col_dir.length();
 
@@ -1080 +1081 @@
     static public void unzip(String col_name)
     {
-    String col_dir = Utility.getCollectDir(Gatherer.config.gsdl_path);
+    String col_dir = Utility.getCollectDir(Configuration.gsdl_path);
     String zip_fname = col_dir + col_name + ".zip";
     int zip_mode = ZipFile.OPEN_READ | ZipFile.OPEN_DELETE;