Changeset 5593

Timestamp:

2003-10-07T15:35:23+13:00 (21 years ago)

Author:

mdewsnip

Message:

Changed calls to the Dictionary.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• Dictionary.java (modified) (7 diffs)
• GAuthenticator.java (modified) (1 diff)
• Gatherer.java (modified) (9 diffs)
• cdm/ArgumentConfiguration.java (modified) (4 diffs)
• cdm/ClassifierManager.java (modified) (10 diffs)
• cdm/FormatManager.java (modified) (1 diff)
• cdm/GeneralManager.java (modified) (2 diffs)
• cdm/IndexManager.java (modified) (5 diffs)
• cdm/MetadataSetView.java (modified) (1 diff)
• cdm/PlugInManager.java (modified) (7 diffs)
• cdm/SearchTypeManager.java (modified) (1 diff)
• cdm/SubcollectionManager.java (modified) (1 diff)
• cdm/TranslationView.java (modified) (1 diff)
• checklist/Entry.java (modified) (1 diff)
• collection/CollectionManager.java (modified) (17 diffs)
• collection/DeleteCollectionPrompt.java (modified) (1 diff)
• collection/Job.java (modified) (1 diff)
• collection/SaveCollectionTask.java (modified) (1 diff)
• file/FileManager.java (modified) (2 diffs)
• file/FileNode.java (modified) (2 diffs)
• file/FileQueue.java (modified) (14 diffs)
• file/FileSystemModel.java (modified) (1 diff)
• gui/AboutDialog.java (modified) (3 diffs)
• gui/CollectionPane.java (modified) (7 diffs)
• gui/CreatePane.java (modified) (2 diffs)
• gui/FileAssociationDialog.java (modified) (1 diff)
• gui/Filter.java (modified) (4 diffs)
• gui/GComboBox.java (modified) (1 diff)
• gui/GUIManager.java (modified) (4 diffs)
• gui/LockFileDialog.java (modified) (2 diffs)
• gui/MenuBar.java (modified) (2 diffs)
• gui/MetaEditPane.java (modified) (2 diffs)
• gui/MirrorPane.java (modified) (2 diffs)
• gui/NewCollectionDetailsPrompt.java (modified) (6 diffs)
• gui/NewFolderPrompt.java (modified) (2 diffs)
• gui/OpenCollectionDialog.java (modified) (3 diffs)
• gui/OptionsPane.java (modified) (1 diff)
• gui/Preferences.java (modified) (2 diffs)
• gui/WarningDialog.java (modified) (1 diff)
• gui/metaaudit/AutofilterDialog.java (modified) (2 diffs)
• gui/metaaudit/MetaAuditModel.java (modified) (1 diff)
• gui/table/GTableModel.java (modified) (1 diff)
• gui/tree/DragTree.java (modified) (1 diff)
• help/HelpFrame.java (modified) (1 diff)
• mem/MEMNode.java (modified) (1 diff)
• mem/MetadataEditorManager.java (modified) (20 diffs)
• msm/ExportMDSPrompt.java (modified) (1 diff)
• msm/GreenstoneArchiveParser.java (modified) (1 diff)
• msm/MDSFileFilter.java (modified) (1 diff)
• msm/MSMPrompt.java (modified) (7 diffs)
• msm/MetadataSet.java (modified) (2 diffs)
• msm/MetadataSetManager.java (modified) (1 diff)
• shell/GImportProgressMonitor.java (modified) (2 diffs)
• shell/GShell.java (modified) (4 diffs)
• util/DragTreeSelectionModel.java (modified) (3 diffs)
• util/Utility.java (modified) (3 diffs)

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

@@ -229 +229 @@
 
 
-    static public String newget(String key)
-    {
-    return self.get(key);
-    }
-
-
-    static public String newget(String key, String arg)
+    static public String get(String key)
+    {
+    return self.oldget(key);
+    }
+
+
+    static public String get(String key, String arg)
     {
     String[] args = new String[1];
     args[0] = arg;
-    return self.get(key, args);
-    }
-
-
-    static public String newget(String key, String[] args)
-    {
-    return self.get(key, args);
+    return self.oldget(key, args);
+    }
+
+
+    static public String get(String key, String[] args)
+    {
+    return self.oldget(key, args);
     }
 
@@ -255 +255 @@
      * @return A <strong>String</strong> which has been referenced by the key String and that either contains no argument fields, or has had the argument fields automatiically populated with formatting Strings of with argument String provided in the get call.
      */
-    public String get(String key) {
-    return get(key, (String[])null);
-    }
+    public String oldget(String key) {
+    return oldget(key, (String[])null);
+    }
+
     /**
      * @deprecated
      * Convienence method with transforms the second string argument into a string array. */
-    public String get(String key, String arg) {
+    public String oldget(String key, String arg) {
     String[] args = new String[1];
     args[0] = arg;
-    return get(key, args);
+    return oldget(key, args);
     }
 
@@ -273 +274 @@
      * @return A <strong>String</strong> which has been referenced by the key String and that either contains no argument fields, or has had the argument fields automatiically populated with formatting Strings of with argument String provided in the get call.
      */
-    public String get(String key, String args[]) {
+    public String oldget(String key, String args[]) {
     if(key_list != null) {
         synchronized(this) {
@@ -310 +311 @@
             f_subargs[0] = "Arial";
             }
-            complete = complete + get("Farg" + arg_num, f_subargs);
+            complete = complete + oldget("Farg" + arg_num, f_subargs);
         }
         }
@@ -452 +453 @@
 
         if (details.has_text) {
-        text = self.get(details.text_key, details.text_args);
+        text = self.oldget(details.text_key, details.text_args);
         }
         if (details.has_tooltip) {
-        tooltip = self.get(details.tooltip_key, (String[]) null);
+        tooltip = self.oldget(details.tooltip_key, (String[]) null);
         }
     }
@@ -496 +497 @@
 
     /**
-     * @deprecated
-     * Register a tab pane component. */
+     * Register a tab pane component. This will be deprecated eventually. */
     static public void register(JTabbedPane component)
     {
-    if(component != null) {
+    if (component != null) {
         String[] args = new String[component.getTabCount()];
 
         // Iterate through the tabbed panes tabs, updating values and recording the original key of each item in args.
-        for(int i = 0; i < args.length; i++) {
+        for (int i = 0; i < args.length; i++) {
         if (args[i] == null) {
             args[i] = component.getTitleAt(i);
         }
-        String value = self.get(args[i], (String[])null);
-        String tooltip = self.get(args[i] + "_Tooltip", (String[])null);
-        JTabbedPaneChangeTask task = new JTabbedPaneChangeTask(component, args[i], i, value, tooltip);
+        String value = self.oldget(args[i], (String[]) null);
+        String tooltip = self.oldget(args[i] + "_Tooltip", (String[]) null);
+        JTabbedPaneChangeTask task = new JTabbedPaneChangeTask(component, i, value, tooltip);
         SwingUtilities.invokeLater(task);
         }
@@ -520 +520 @@
     static private class JTabbedPaneChangeTask
     implements Runnable {
-    protected String key;
-    protected String value;
+
+    private JTabbedPane component;
     private int index;
-    private JTabbedPane component;
+    private String value;
     private String tooltip;
 
-    public JTabbedPaneChangeTask(JTabbedPane component, String key, int index, String value, String tooltip) {
-        this.key = key;
-        this.value = value;
+    public JTabbedPaneChangeTask(JTabbedPane component, int index, String value, String tooltip) {
         this.component = component;
         this.index = index;
+        this.value = value;
         this.tooltip = tooltip;
     }
+
     public void run() {
         component.setTitleAt(index, value);
-        if(!tooltip.equals(key+"_Tooltip")) {
-        component.setToolTipTextAt(index, tooltip);
-        }
-        else {
-        component.setToolTipTextAt(index, null);
-        }
+        component.setToolTipTextAt(index, tooltip);
     }
     }

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

@@ -72 +72 @@
     protected PasswordAuthentication getPasswordAuthentication() {
     // Component definition.
-    dialog = new JDialog (Gatherer.g_man, Dictionary.newget("GAuthenticator.Title"), true);
+    dialog = new JDialog (Gatherer.g_man, Dictionary.get("GAuthenticator.Title"), true);
     dialog.setModal(true);
     dialog.setSize(SIZE);

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

@@ -366 +366 @@
     }
     else {
-        JOptionPane.showMessageDialog(g_man, Dictionary.newget("General.Outstanding_Processes"), Dictionary.newget("General.Outstanding_Processes_Title"), JOptionPane.ERROR_MESSAGE);
+        JOptionPane.showMessageDialog(g_man, Dictionary.get("General.Outstanding_Processes"), Dictionary.get("General.Outstanding_Processes_Title"), JOptionPane.ERROR_MESSAGE);
         g_man.hide();
     }
@@ -586 +586 @@
     dialog.dispose();
     dialog = null;
-    ///ystem.out.println(Dictionary.newget("General.Missing_EXEC"));
+    ///ystem.out.println(Dictionary.get("General.Missing_EXEC"));
     }
 
@@ -596 +596 @@
     dialog.dispose();
     dialog = null;
-    ///ystem.out.println(Dictionary.newget("General.Missing_GSDL"));
+    ///ystem.out.println(Dictionary.get("General.Missing_GSDL"));
     }
 
@@ -605 +605 @@
     dialog.dispose();
     dialog = null;
-    ///ystem.out.println(Dictionary.newget("General.Missing_PERL"));
+    ///ystem.out.println(Dictionary.get("General.Missing_PERL"));
     }
 
@@ -626 +626 @@
      */
     static public void printUsage(Dictionary dictionary) {
-    System.out.println(Dictionary.newget("General.Usage"));
+    System.out.println(Dictionary.get("General.Usage"));
     }
 
@@ -735 +735 @@
             ///ystem.err.print(".");
             if(attempt_count == 60) {
-                try_again = JOptionPane.showConfirmDialog(Gatherer.g_man, Dictionary.newget("Server.QuitTimeOut"), Dictionary.newget("General.Warning"), JOptionPane.YES_NO_OPTION);
+                try_again = JOptionPane.showConfirmDialog(Gatherer.g_man, Dictionary.get("Server.QuitTimeOut"), Dictionary.get("General.Warning"), JOptionPane.YES_NO_OPTION);
             }
             else {
@@ -798 +798 @@
             while(gsdlsite_cfg.getURL() != null && try_again == JOptionPane.YES_OPTION) {
             if(attempt_count == 60) {
-                try_again = JOptionPane.showConfirmDialog(Gatherer.g_man, Dictionary.newget("Server.QuitTimeOut"), Dictionary.newget("General.Warning"), JOptionPane.YES_NO_OPTION);
+                try_again = JOptionPane.showConfirmDialog(Gatherer.g_man, Dictionary.get("Server.QuitTimeOut"), Dictionary.get("General.Warning"), JOptionPane.YES_NO_OPTION);
             }
             else {
@@ -809 +809 @@
             }
             //if(gsdlsite_cfg.getURL() != null) {
-            //JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("Server.QuitManual"), Dictionary.newget("General.Error"), JOptionPane.ERROR_MESSAGE);
+            //JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("Server.QuitManual"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
             //}
         }
@@ -822 +822 @@
         // If the local server is still running then our changed values will get overwritten.
         if(gsdlsite_cfg.getURL() != null) {
-        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("Server.QuitFailed"), Dictionary.newget("General.Error"), JOptionPane.ERROR_MESSAGE);
+        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("Server.QuitFailed"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
         }
         gsdlsite_cfg = null;

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

@@ -540 +540 @@
                 String args[] = new String[1];
                 args[0] = argument.getName();
-                JOptionPane.showMessageDialog(self, Dictionary.newget("CDM.ArgumentConfiguration.Required_Argument", args), Dictionary.newget("CDM.ArgumentConfiguration.Error_Title"), JOptionPane.ERROR_MESSAGE);
+                JOptionPane.showMessageDialog(self, Dictionary.get("CDM.ArgumentConfiguration.Required_Argument", args), Dictionary.get("CDM.ArgumentConfiguration.Error_Title"), JOptionPane.ERROR_MESSAGE);
                 args = null;
                 return false;
@@ -563 +563 @@
                 args[0] = argument.getName();
                 args[1] = result;
-                JOptionPane.showMessageDialog(self, Dictionary.newget("CDM.ArgumentConfiguration.Bad_Integer", args), Dictionary.newget("CDM.ArgumentConfiguration.Error_Title"), JOptionPane.ERROR_MESSAGE);
+                JOptionPane.showMessageDialog(self, Dictionary.get("CDM.ArgumentConfiguration.Bad_Integer", args), Dictionary.get("CDM.ArgumentConfiguration.Error_Title"), JOptionPane.ERROR_MESSAGE);
                 args = null;
                 return false;
@@ -573 +573 @@
                 String args[] = new String[1];
                 args[0] = argument.getName();
-                JOptionPane.showMessageDialog(self, Dictionary.newget("CDM.ArgumentConfiguration.Required_Argument", args), Dictionary.newget("CDM.ArgumentConfiguration.Error_Title"), JOptionPane.ERROR_MESSAGE);
+                JOptionPane.showMessageDialog(self, Dictionary.get("CDM.ArgumentConfiguration.Required_Argument", args), Dictionary.get("CDM.ArgumentConfiguration.Error_Title"), JOptionPane.ERROR_MESSAGE);
                 args = null;
                 return false;
@@ -612 +612 @@
                 String args[] = new String[1];
                 args[0] = argument.getName();
-                JOptionPane.showMessageDialog(self, Dictionary.newget("CDM.ArgumentConfiguration.Required_Argument", args), Dictionary.newget("CDM.ArgumentConfiguration.Error_Title"), JOptionPane.ERROR_MESSAGE);
+                JOptionPane.showMessageDialog(self, Dictionary.get("CDM.ArgumentConfiguration.Required_Argument", args), Dictionary.get("CDM.ArgumentConfiguration.Error_Title"), JOptionPane.ERROR_MESSAGE);
                 return false;
             }

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

@@ -200 +200 @@
         if(index < 0) {
             String args[] = new String[2];
-            args[0] = Dictionary.newget("CDM.ClassifierManager.Classifier");
+            args[0] = Dictionary.get("CDM.ClassifierManager.Classifier");
             args[1] = classifier.getName();
-            JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("CDM.Move.At_Top", args), Dictionary.newget("CDM.Move.Title"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CDM.Move.At_Top", args), Dictionary.get("CDM.Move.Title"), JOptionPane.ERROR_MESSAGE);
             return;
         }
@@ -213 +213 @@
         if(index >= getSize()) {
             String args[] = new String[2];
-            args[0] = Dictionary.newget("CDM.ClassifierManager.Classifier_Str");
+            args[0] = Dictionary.get("CDM.ClassifierManager.Classifier_Str");
             args[1] = classifier.getName();
-            JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("CDM.Move.At_Bottom", args), Dictionary.newget("CDM.Move.Title"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CDM.Move.At_Bottom", args), Dictionary.get("CDM.Move.Title"), JOptionPane.ERROR_MESSAGE);
             return;
         }
@@ -337 +337 @@
         String classifier_name = getClassifierName(classifier);
         Gatherer.println("Zero length argument xml detected for: " + classifier_name);
-        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("CDM.ClassifierManager.Classifier_XML_Parse_Failed", classifier_name), Dictionary.newget("General.Error"), JOptionPane.ERROR_MESSAGE);
+        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CDM.ClassifierManager.Classifier_XML_Parse_Failed", classifier_name), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
         classifier_name = null;
         }
@@ -370 +370 @@
         if(files != null) {
         // Create a progress indicator.
-        ParsingProgress progress = new ParsingProgress(Dictionary.newget("CDM.ClassifierManager.Parsing.Title"), Dictionary.newget("CDM.ClassifierManager.Parsing.Message"), files.length);
+        ParsingProgress progress = new ParsingProgress(Dictionary.get("CDM.ClassifierManager.Parsing.Title"), Dictionary.get("CDM.ClassifierManager.Parsing.Message"), files.length);
         for(int i = 0; i < files.length; i++) {
             // We only want to check Perl Modules.
@@ -516 +516 @@
         // Create
         add = new JButton();
-        Dictionary.setBoth(add, "CDM.ClassifierManager.Add", "CDM.ClassifierManager.Add_Tooltip");
+        Dictionary.registerBoth(add, "CDM.ClassifierManager.Add", "CDM.ClassifierManager.Add_Tooltip");
         JPanel button_pane = new JPanel();
         JPanel central_pane = new JPanel();
         configure = new JButton();
         configure.setEnabled(false);
-        Dictionary.setBoth(configure, "CDM.ClassifierManager.Configure", "CDM.ClassifierManager.Configure_Tooltip");
+        Dictionary.registerBoth(configure, "CDM.ClassifierManager.Configure", "CDM.ClassifierManager.Configure_Tooltip");
         JPanel header_pane = new JPanel();
         instructions = new JTextArea();
@@ -528 +528 @@
         instructions.setRows(6);
         instructions.setWrapStyleWord(true);
-        Dictionary.setText(instructions, "CDM.ClassifierManager.Instructions");
+        Dictionary.registerText(instructions, "CDM.ClassifierManager.Instructions");
 
         classifier = new GComboBox(getAvailable());
@@ -537 +537 @@
         classifier.setTextNonSelectionColor(Gatherer.config.getColor("coloring.workspace_tree_foreground", false));
         classifier.setTextSelectionColor(Gatherer.config.getColor("coloring.collection_selection_foreground", false));
-        Dictionary.setTooltip(classifier, "CDM.ClassifierManager.Classifier_Tooltip");
+        Dictionary.registerTooltip(classifier, "CDM.ClassifierManager.Classifier_Tooltip");
 
         JLabel classifier_label = new JLabel();
-        Dictionary.setText(classifier_label, "CDM.ClassifierManager.Classifier");
+        Dictionary.registerText(classifier_label, "CDM.ClassifierManager.Classifier");
         classifier_list = new JList(model);
         classifier_list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
@@ -546 +546 @@
         classifier_list_label.setHorizontalAlignment(JLabel.CENTER);
         classifier_list_label.setOpaque(true);
-        Dictionary.setText(classifier_list_label, "CDM.ClassifierManager.Assigned");
+        Dictionary.registerText(classifier_list_label, "CDM.ClassifierManager.Assigned");
         JPanel classifier_list_pane = new JPanel();
         JPanel classifier_pane = new JPanel();
         remove = new JButton();
         remove.setEnabled(false);
-        Dictionary.setBoth(remove, "CDM.ClassifierManager.Remove", "CDM.ClassifierManager.Remove_Tooltip");
+        Dictionary.registerBoth(remove, "CDM.ClassifierManager.Remove", "CDM.ClassifierManager.Remove_Tooltip");
 
         JLabel title = new JLabel();
         title.setHorizontalAlignment(JLabel.CENTER);
         title.setOpaque(true);
-        Dictionary.setText(title, "CDM.ClassifierManager.Title");
+        Dictionary.registerText(title, "CDM.ClassifierManager.Title");
 
         JPanel temp = new JPanel(new BorderLayout());
@@ -635 +635 @@
 
         // Scope these mad bordering skillz.
-        temp.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createEmptyBorder(5,0,5,0), BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary.newget("CDM.ClassifierManager.Controls")), BorderFactory.createEmptyBorder(2,2,2,2))));
+        temp.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createEmptyBorder(5,0,5,0), BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary.get("CDM.ClassifierManager.Controls")), BorderFactory.createEmptyBorder(2,2,2,2))));
         temp.add(classifier_pane, BorderLayout.NORTH);
         temp.add(button_pane, BorderLayout.SOUTH);
@@ -712 +712 @@
             }
             else {
-                JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("CDM.ClassifierManager.Classifier_Exists"), Dictionary.newget("General.Error"), JOptionPane.ERROR_MESSAGE);
+                JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CDM.ClassifierManager.Classifier_Exists"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
             }
             }

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

@@ -369 +369 @@
         button_pane.add(remove_button);
 
-        center_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary.newget("CDM.FormatManager.Editing_Controls")), BorderFactory.createEmptyBorder(2,2,2,2)));
+        center_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary.get("CDM.FormatManager.Editing_Controls")), BorderFactory.createEmptyBorder(2,2,2,2)));
         center_pane.setLayout(new BorderLayout());
         center_pane.add(selection_pane, BorderLayout.NORTH);

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

@@ -356 +356 @@
      */
     public void setSelectedView(String type) {
-        type = Dictionary.newget(type);
+        type = Dictionary.get(type);
         for(int i = 0; i < root.getChildCount(); i++) {
         DesignNode child = (DesignNode) root.getChildAt(i);
@@ -379 +379 @@
      */
     public String toString() {
-        return Dictionary.newget("CDM.GUI." + (String)getUserObject());
+        return Dictionary.get("CDM.GUI." + (String)getUserObject());
     }
     }

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

@@ -107 +107 @@
     }
     else {
-        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("CDM.IndexManager.Index_Exists"), Dictionary.newget("General.Warning"), JOptionPane.WARNING_MESSAGE);
+        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CDM.IndexManager.Index_Exists"), Dictionary.get("General.Warning"), JOptionPane.WARNING_MESSAGE);
     }
     }
@@ -125 +125 @@
     }
     else {
-        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("CDM.IndexManager.Level_Exists"), Dictionary.newget("General.Warning"), JOptionPane.WARNING_MESSAGE);
+        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CDM.IndexManager.Level_Exists"), Dictionary.get("General.Warning"), JOptionPane.WARNING_MESSAGE);
     }
     }
@@ -587 +587 @@
         Dictionary.registerText(level_label, "CDM.IndexManager.Level");
         level_combobox = new JComboBox();
-        level_combobox.addItem(Dictionary.newget("CDM.IndexManager.Document"));
-        level_combobox.addItem(Dictionary.newget("CDM.IndexManager.Paragraph"));
-        level_combobox.addItem(Dictionary.newget("CDM.IndexManager.Section"));
+        level_combobox.addItem(Dictionary.get("CDM.IndexManager.Document"));
+        level_combobox.addItem(Dictionary.get("CDM.IndexManager.Paragraph"));
+        level_combobox.addItem(Dictionary.get("CDM.IndexManager.Section"));
         level_combobox.setEditable(false);
         Dictionary.registerTooltip(level_combobox, "CDM.IndexManager.Level_Tooltip");
@@ -800 +800 @@
         JLabel component = (JLabel) super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
         if(default_index != null && default_index.equals(value)) {
-            component.setText(component.getText() + " " + Dictionary.newget("CDM.IndexManager.Default_Index_Indicator"));
+            component.setText(component.getText() + " " + Dictionary.get("CDM.IndexManager.Default_Index_Indicator"));
         }
         return component;
@@ -1199 +1199 @@
         header_panel.add(new JScrollPane(instructions_textarea), BorderLayout.CENTER);
 
-        tabbed_pane.add(Dictionary.newget("CDM.IndexManager.MGPP.Indexes"), indexes_panel);
-        tabbed_pane.add(Dictionary.newget("CDM.IndexManager.MGPP.Levels"), levels_panel);
+        tabbed_pane.add(Dictionary.get("CDM.IndexManager.MGPP.Indexes"), indexes_panel);
+        tabbed_pane.add(Dictionary.get("CDM.IndexManager.MGPP.Levels"), levels_panel);
 
         setBorder(BorderFactory.createEmptyBorder(5,5,5,5));

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

@@ -195 +195 @@
         element_label.setHorizontalAlignment(JLabel.CENTER);
         element_label.setOpaque(true);
-        Dictionary.setText(element_label, "CDM.MetadataSetManager.Elements");
+        Dictionary.registerText(element_label, "CDM.MetadataSetManager.Elements");
         element_list = new JList();
         element_list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);

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

@@ -146 +146 @@
     }
     if(plugin.getName().equals(StaticStrings.ARCPLUG_STR) || plugin.getName().equals(StaticStrings.RECPLUG_STR)) {
-        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("CDM.Move.Fixed"), Dictionary.newget("CDM.Move.Title"), JOptionPane.ERROR_MESSAGE);
+        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CDM.Move.Fixed"), Dictionary.get("CDM.Move.Title"), JOptionPane.ERROR_MESSAGE);
         return;
     }
@@ -183 +183 @@
         if(index < 0) {
             String args[] = new String[2];
-            args[0] = Dictionary.newget("CDM.PlugInManager.PlugIn_Str");
+            args[0] = Dictionary.get("CDM.PlugInManager.PlugIn_Str");
             args[1] = plugin.getName();
-            JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("CDM.Move.At_Top", args), Dictionary.newget("CDM.Move.Title"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CDM.Move.At_Top", args), Dictionary.get("CDM.Move.Title"), JOptionPane.ERROR_MESSAGE);
             return;
         }
@@ -198 +198 @@
             String args[] = new String[1];
             args[0] = plugin.getName();
-            JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("CDM.Move.Cannot", args), Dictionary.newget("CDM.Move.Title"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CDM.Move.Cannot", args), Dictionary.get("CDM.Move.Title"), JOptionPane.ERROR_MESSAGE);
             // Still not going to move RecPlug or ArcPlug.
             return;
@@ -376 +376 @@
         String[] margs = new String[1];
         margs[0] = plugin_name;
-        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("CDM.PlugInManager.PlugIn_XML_Parse_Failed", margs), Dictionary.newget("General.Error"), JOptionPane.ERROR_MESSAGE);
+        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CDM.PlugInManager.PlugIn_XML_Parse_Failed", margs), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
         }
     }
@@ -413 +413 @@
     if(files != null) {
         // Create a progress indicator.
-        ParsingProgress progress = new ParsingProgress(Dictionary.newget("CDM.PlugInManager.Parsing.Title"), Dictionary.newget("CDM.PlugInManager.Parsing.Message"), files.length);
+        ParsingProgress progress = new ParsingProgress(Dictionary.get("CDM.PlugInManager.Parsing.Title"), Dictionary.get("CDM.PlugInManager.Parsing.Message"), files.length);
         for(int i = 0; i < files.length; i++) {
         // We only want to check Perl Modules.
@@ -696 +696 @@
          (BorderFactory.createEmptyBorder(5,0,5,0),
           BorderFactory.createCompoundBorder
-          (BorderFactory.createTitledBorder(Dictionary.newget("CDM.PlugInManager.Controls")),
+          (BorderFactory.createTitledBorder(Dictionary.get("CDM.PlugInManager.Controls")),
            BorderFactory.createEmptyBorder(2,2,2,2))));
 
@@ -771 +771 @@
             }
             else {
-            JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("CDM.PlugInManager.PlugIn_Exists"), Dictionary.newget("General.Error"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CDM.PlugInManager.PlugIn_Exists"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
             }
             base_plugin = null;

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

@@ -102 +102 @@
     if((direction && index < 0) || (!direction && index >= getSize())) {
         String args[] = new String[2];
-        args[0] = Dictionary.newget("CDM.SearchTypeManager.SearchType");
+        args[0] = Dictionary.get("CDM.SearchTypeManager.SearchType");
         args[1] = search_type.toString();
         String message = null;
         if (direction) {
-        message = Dictionary.newget("CDM.Move.At_Top", args);
+        message = Dictionary.get("CDM.Move.At_Top", args);
         }
         else {
-        message = Dictionary.newget("CDM.Move.At_Bottom", args);
-        }
-        JOptionPane.showMessageDialog(Gatherer.g_man, message, Dictionary.newget("CDM.Move.Title"), JOptionPane.ERROR_MESSAGE);
+        message = Dictionary.get("CDM.Move.At_Bottom", args);
+        }
+        JOptionPane.showMessageDialog(Gatherer.g_man, message, Dictionary.get("CDM.Move.Title"), JOptionPane.ERROR_MESSAGE);
         return;
     }

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

@@ -311 +311 @@
         subcollection_pane.add(button_pane, BorderLayout.SOUTH);
 
-        tabbed_pane.addTab(Dictionary.newget("CDM.SubcollectionManager.Subcollection_Controls"), subcollection_pane);
-        tabbed_pane.addTab(Dictionary.newget("CDM.SubcollectionManager.Subindex_Controls"), (JPanel) CollectionDesignManager.subcollectionindex_manager.getControls());
-        tabbed_pane.addTab(Dictionary.newget("CDM.SubcollectionManager.Language_Controls"), (JPanel) CollectionDesignManager.language_manager.getControls());
+        tabbed_pane.addTab(Dictionary.get("CDM.SubcollectionManager.Subcollection_Controls"), subcollection_pane);
+        tabbed_pane.addTab(Dictionary.get("CDM.SubcollectionManager.Subindex_Controls"), (JPanel) CollectionDesignManager.subcollectionindex_manager.getControls());
+        tabbed_pane.addTab(Dictionary.get("CDM.SubcollectionManager.Language_Controls"), (JPanel) CollectionDesignManager.language_manager.getControls());
 
         border_pane.setBorder(BorderFactory.createEmptyBorder(0,5,5,5));

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

@@ -520 +520 @@
         }
         public String getColumnName(int column) {
-        return Dictionary.newget("CDM.TranslationManager.Column_Name_" + column);
+        return Dictionary.get("CDM.TranslationManager.Column_Name_" + column);
         }
 

trunk/gli/src/org/greenstone/gatherer/checklist/Entry.java

@@ -28 +28 @@
         MetadataSet set = (MetadataSet) object;
         // Build tooltip
-        StringBuffer tip = new StringBuffer(Dictionary.newget("NewCollectionPrompt.Set_Contains"));
+        StringBuffer tip = new StringBuffer(Dictionary.get("NewCollectionPrompt.Set_Contains"));
         tip.append(":\n");
         for(int i = 0; i < set.size(); i++) {

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

@@ -229 +229 @@
     try {
         // Create a progress monitor.
-        ProgressMonitor progress = new ProgressMonitor(Gatherer.g_man, Dictionary.newget("CollectionManager.Creating_New"), "mkcol.pl", 0, 7);
+        ProgressMonitor progress = new ProgressMonitor(Gatherer.g_man, Dictionary.get("CollectionManager.Creating_New"), "mkcol.pl", 0, 7);
         // Create the new collection.
         makeCollection(description, email, name, title);
@@ -241 +241 @@
         gcache_dir.mkdirs();
         if(progress != null) {
-        progress.setNote(Dictionary.newget("CollectionManager.Gcache_Created"));
+        progress.setNote(Dictionary.get("CollectionManager.Gcache_Created"));
         }
 
@@ -249 +249 @@
         log_dir.mkdirs();
         if(progress != null) {
-        progress.setNote(Dictionary.newget("CollectionManager.Log_Created"));
+        progress.setNote(Dictionary.get("CollectionManager.Log_Created"));
         }
 
@@ -401 +401 @@
         String args[] = new String[1];
         args[0] = name;
-        progress.setNote(Dictionary.newget("CollectionManager.Session_Ready", args));
+        progress.setNote(Dictionary.get("CollectionManager.Session_Ready", args));
         progress.close();
     }
@@ -584 +584 @@
         return collection.getTitle();
     }
-    return Dictionary.newget("Collection.No_Collection");
+    return Dictionary.get("Collection.No_Collection");
     }
 
@@ -616 +616 @@
     // Create and add Greenstone collections node.
     // Starting at the collection directory of gsdl...
-    FileNode world_root = new FileNode(Dictionary.newget("Tree.World"));
+    FileNode world_root = new FileNode(Dictionary.get("Tree.World"));
     world_root.unmap();
     workspace_root.insert(world_root);
@@ -625 +625 @@
     if(roots != null) {
         FileNode file_root;
-        String name = Dictionary.newget("Tree.Root");
+        String name = Dictionary.get("Tree.Root");
         if(roots.length == 1) {
         file_root = new FileNode(roots[0], name);
@@ -652 +652 @@
         String[] args = new String[1];
         args[0] = home_folder.getName();
-        FileNode home_folder_node = new FileNode(home_folder, Dictionary.newget("Tree.Home", args));
+        FileNode home_folder_node = new FileNode(home_folder, Dictionary.get("Tree.Home", args));
         workspace_root.insert(home_folder_node);
     }
@@ -659 +659 @@
     if(Gatherer.config.get("workflow.mirror", false)) {
         // Add Public workspace
-        FileNode public_root = new FileNode(new File(Utility.CACHE_DIR), Dictionary.newget("Tree.Public"));
+        FileNode public_root = new FileNode(new File(Utility.CACHE_DIR), Dictionary.get("Tree.Public"));
         workspace_root.insert(public_root);
         // Add Private workspace if a collection has been loaded.
         if(ready()) {
-        FileNode private_root = new FileNode(new File(getCollectionCache()), Dictionary.newget("Tree.Private"));
+        FileNode private_root = new FileNode(new File(getCollectionCache()), Dictionary.get("Tree.Private"));
         workspace_root.insert(private_root);
         }
@@ -761 +761 @@
         File metadata_directory = new File(collection_directory, Utility.META_DIR);
         if(!metadata_directory.exists()) {
-            JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("CollectionManager.Old_Collection", args2), Dictionary.newget("General.Warning"), JOptionPane.INFORMATION_MESSAGE);
+            JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CollectionManager.Old_Collection", args2), Dictionary.get("General.Warning"), JOptionPane.INFORMATION_MESSAGE);
         }
         // Normal GLI collection
@@ -793 +793 @@
                 String[] args = new String[1];
                 args[0] = name;
-                Gatherer.println(Dictionary.newget("CollectionManager.Loading_Successful", args));
+                Gatherer.println(Dictionary.get("CollectionManager.Loading_Successful", args));
                 // Now we need to hook up classes that depend on messages from the metadata set manager to keep their content fresh.
                 collection.msm.addMSMListener(this);
@@ -806 +806 @@
                 // There is obviously no existing collection present.
                 Gatherer.printStackTrace(error);
-                JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("CollectionManager.Cannot_Open", args2), Dictionary.newget("General.Error"), JOptionPane.ERROR_MESSAGE);
+                JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CollectionManager.Cannot_Open", args2), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
             }
             }
@@ -813 +813 @@
         }
         else {
-        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("CollectionManager.File_Not_Found", args2), Dictionary.newget("General.Error"), JOptionPane.ERROR_MESSAGE);
+        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CollectionManager.File_Not_Found", args2), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
         }
         collection_directory = null;
     }
     else {
-        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("CollectionManager.Not_Col_File", args2), Dictionary.newget("General.Error"), JOptionPane.ERROR_MESSAGE);
+        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CollectionManager.Not_Col_File", args2), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
         Gatherer.println("Not a Gatherer Collection.");
     }
@@ -939 +939 @@
         workspace_model = null;
         Gatherer.g_man.collectionChanged(ready());
-        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("CollectionManager.Preview_Ready"), Dictionary.newget("CollectionManager.Preview_Ready_Title"), JOptionPane.INFORMATION_MESSAGE);
+        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CollectionManager.Preview_Ready"), Dictionary.get("CollectionManager.Preview_Ready_Title"), JOptionPane.INFORMATION_MESSAGE);
     }
     else if(event.getStatus() == GShell.ERROR) {
-        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("CollectionManager.Preview_Ready_Failed"), Dictionary.newget("CollectionManager.Preview_Ready_Title"), JOptionPane.ERROR_MESSAGE);
+        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CollectionManager.Preview_Ready_Failed"), Dictionary.get("CollectionManager.Preview_Ready_Title"), JOptionPane.ERROR_MESSAGE);
         Gatherer.g_man.collectionChanged(ready()); 
     }
@@ -986 +986 @@
     FileNode greenstone_collections_node = null;
     int root_child_count = root.getChildCount();
-    String greenstone_collections_str = Dictionary.newget("Tree.World");
+    String greenstone_collections_str = Dictionary.get("Tree.World");
     for(int i = 0; greenstone_collections_node == null && i < root_child_count; i++) {
         TreeNode child = root.getChildAt(i);
@@ -1106 +1106 @@
         model.removeNodeFromParent(old);
                 // Create and insert new.
-        FileNode private_workspace = new FileNode(new File(getCollectionCache()), Dictionary.newget("Tree.Private"));
+        FileNode private_workspace = new FileNode(new File(getCollectionCache()), Dictionary.get("Tree.Private"));
         model.insertNodeInto(private_workspace, root, 2);
     }
@@ -1144 +1144 @@
 
         // Special case for build mode "all": replace index dir with building dir
-        if (build_mode == null || build_mode.equals(Dictionary.newget("CreatePane.Mode_All"))) {
+        if (build_mode == null || build_mode.equals(Dictionary.get("CreatePane.Mode_All"))) {
         // Remove the old index directory
         if (index_dir.exists()) {

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

@@ -199 +199 @@
     args[0] = collection.getName();
     if (success) {
-        JOptionPane.showMessageDialog(prompt,Dictionary.newget("DeleteCollectionPrompt.Successful_Delete", args),Dictionary.newget("DeleteCollectionPrompt.Successful_Title"),JOptionPane.INFORMATION_MESSAGE);
+        JOptionPane.showMessageDialog(prompt,Dictionary.get("DeleteCollectionPrompt.Successful_Delete", args),Dictionary.get("DeleteCollectionPrompt.Successful_Title"),JOptionPane.INFORMATION_MESSAGE);
     }
     else {
-        JOptionPane.showMessageDialog(prompt,Dictionary.newget("DeleteCollectionPrompt.Failed_Delete", args),Dictionary.newget("DeleteCollectionPrompt.Failed_Title"),JOptionPane.WARNING_MESSAGE);
+        JOptionPane.showMessageDialog(prompt,Dictionary.get("DeleteCollectionPrompt.Failed_Delete", args),Dictionary.get("DeleteCollectionPrompt.Failed_Title"),JOptionPane.WARNING_MESSAGE);
     }
     }

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

@@ -220 +220 @@
         int count = 0;
         while(count < 3 && (user_pass = (String) Gatherer.authentications.get(address)) == null) {
-        Authenticator.requestPasswordAuthentication(proxy_host, null, Integer.parseInt(proxy_port), "http://", Dictionary.newget("WGet.Prompt"), "HTTP");
+        Authenticator.requestPasswordAuthentication(proxy_host, null, Integer.parseInt(proxy_port), "http://", Dictionary.get("WGet.Prompt"), "HTTP");
         count++;
         }

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

@@ -110 +110 @@
     // Create progress monitor box. It will display itself as necessary.
     // WARNING: ProgressMonitors seem to be extremely dodgy, and are not recommended!
-    // ProgressMonitor spd = new ProgressMonitor(Gatherer.g_man, Dictionary.newget("SaveProgressDialog.Title", collection.getName()), null, 0, 100);
+    // ProgressMonitor spd = new ProgressMonitor(Gatherer.g_man, Dictionary.get("SaveProgressDialog.Title", collection.getName()), null, 0, 100);
     // spd.setMillisToDecideToPopup(100);
     // spd.setMillisToPopup(100);

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

@@ -77 +77 @@
         // If the source is the workspace then display an error message. Workspace is read only.
         if(source.toString().equals("Workspace")) {
-            JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("FileActions.Read_Only"), Dictionary.newget("General.Error"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("FileActions.Read_Only"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
             return;
         }
@@ -111 +111 @@
         //... check if it already exists.
         if(folder_file.exists()) {
-        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("FileActions.Folder_Already_Exists", name), Dictionary.newget("General.Error"), JOptionPane.ERROR_MESSAGE);
+        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("FileActions.Folder_Already_Exists", name), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
         }
         // Otherwise create it.

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

@@ -238 +238 @@
         children = new ArrayList();
         // Super Special Case: if the name of this node is the Tree.World string, then we actually map the collections installed in greenstone. The file in this case will actually by the collect directory of greenstone.
-        if(file == null && title.equals(Dictionary.newget("Tree.World"))) {
+        if(file == null && title.equals(Dictionary.get("Tree.World"))) {
         ///atherer.println("Map the 'Greenstone Collections' node.");
         // For each of the children directories, which are collections...
@@ -387 +387 @@
     public void unmap() {
     // You cannot unmap nodes that have no file basis.
-    if(file != null || title.equals(Dictionary.newget("Tree.World"))) {
+    if(file != null || title.equals(Dictionary.get("Tree.World"))) {
         ///atherer.println("Unmap: " + this);
         children = null;

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

@@ -90 +90 @@
     progress.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
     progress.setForeground(Gatherer.config.getColor("coloring.collection_tree_foreground", false));
-    progress.setString(Dictionary.newget("FileActions.No_Activity"));
+    progress.setString(Dictionary.get("FileActions.No_Activity"));
     progress.setStringPainted(true);
     args = null;
@@ -138 +138 @@
     public boolean calculateSize(FileNode[] files) {
     progress.reset();
-    progress.setString(Dictionary.newget("FileActions.Calculating_Size"));
+    progress.setString(Dictionary.get("FileActions.Calculating_Size"));
     progress.setIndeterminate(true);
     Vector remaining = new Vector();
@@ -155 +155 @@
         }
     }
-    progress.setString(Dictionary.newget("FileActions.No_Activity"));
+    progress.setString(Dictionary.get("FileActions.No_Activity"));
     progress.setIndeterminate(false);
     // Now we return if calculation was cancelled so that the FileManagers Task can skip the addJob phase correctly.
@@ -239 +239 @@
                 else {
                 ///atherer.println("Opps! This filename already exists. Give the user some options.");
-                Object[] options = { Dictionary.newget("General.Yes"), Dictionary.newget("FileActions.Yes_To_All"), Dictionary.newget("General.No"), Dictionary.newget("General.Cancel") };
-                int result = JOptionPane.showOptionDialog(Gatherer.g_man, Dictionary.newget("FileActions.File_Exists", target_file.getName()), Dictionary.newget("General.Warning"), JOptionPane.DEFAULT_OPTION, JOptionPane.WARNING_MESSAGE, null, options, options[0]);
+                Object[] options = { Dictionary.get("General.Yes"), Dictionary.get("FileActions.Yes_To_All"), Dictionary.get("General.No"), Dictionary.get("General.Cancel") };
+                int result = JOptionPane.showOptionDialog(Gatherer.g_man, Dictionary.get("FileActions.File_Exists", target_file.getName()), Dictionary.get("General.Warning"), JOptionPane.DEFAULT_OPTION, JOptionPane.WARNING_MESSAGE, null, options, options[0]);
                 switch(result) {
                 case 1: // Yes To All
@@ -273 +273 @@
                 if(job.type == FileJob.COPY) {
                 args[0] = Utility.formatPath("FileActions.Copying", source_file.getAbsolutePath(), file_status.getSize().width);
-                file_status.setText(Dictionary.newget("FileActions.Copying", args));
+                file_status.setText(Dictionary.get("FileActions.Copying", args));
                 }
                 else {
                 args[0] = Utility.formatPath("FileActions.Moving", source_file.getAbsolutePath(), file_status.getSize().width);
-                file_status.setText(Dictionary.newget("FileActions.Moving", args));
+                file_status.setText(Dictionary.get("FileActions.Moving", args));
                 }
                 args = null;
@@ -292 +292 @@
                     cancel_action = true;
                     // Show warning.
-                    JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("FileActions.File_Not_Found_Message", source_file.getName()), Dictionary.newget("FileActions.File_Not_Found_Title"), JOptionPane.ERROR_MESSAGE);
+                    JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("FileActions.File_Not_Found_Message", source_file.getName()), Dictionary.get("FileActions.File_Not_Found_Title"), JOptionPane.ERROR_MESSAGE);
                     // Force refresh of source folder.
                     source_model.refresh(new TreePath(((FileNode)origin_node.getParent()).getPath()));
@@ -300 +300 @@
                     cancel_action = true;
                     // Show warning.
-                    JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("FileActions.File_Already_Exists_Message", target_file.getName()), Dictionary.newget("FileActions.File_Already_Exists_Title"), JOptionPane.ERROR_MESSAGE);
+                    JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("FileActions.File_Already_Exists_Message", target_file.getName()), Dictionary.get("FileActions.File_Already_Exists_Title"), JOptionPane.ERROR_MESSAGE);
                     // Nothing else can be done by the Gatherer.
                 }
@@ -307 +307 @@
                     cancel_action = true;
                     // Show warning. The message body of the expection explains how much more space is required for this file copy.
-                    JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("FileActions.Insufficient_Space_Message", is_exception.getMessage()), Dictionary.newget("FileActions.Insufficient_Space_Title"), JOptionPane.ERROR_MESSAGE);
+                    JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("FileActions.Insufficient_Space_Message", is_exception.getMessage()), Dictionary.get("FileActions.Insufficient_Space_Title"), JOptionPane.ERROR_MESSAGE);
                     // Nothing else can be done by the Gatherer. In fact if we are really out of space I'm not even sure we can quit safely.
                 }
@@ -314 +314 @@
                     cancel_action = true;
                     // Show warning
-                    JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("FileActions.Unknown_File_Error_Message"), Dictionary.newget("FileActions.Unknown_File_Error_Title"), JOptionPane.ERROR_MESSAGE);
+                    JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("FileActions.Unknown_File_Error_Message"), Dictionary.get("FileActions.Unknown_File_Error_Title"), JOptionPane.ERROR_MESSAGE);
                     // Nothing else we can do.
                 }
@@ -321 +321 @@
                     cancel_action = true;
                     // Show warning
-                    JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("FileActions.Write_Not_Permitted_Message", target_file.getAbsolutePath()), Dictionary.newget("FileActions.Write_Not_Permitted_Title"), JOptionPane.ERROR_MESSAGE);
+                    JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("FileActions.Write_Not_Permitted_Message", target_file.getAbsolutePath()), Dictionary.get("FileActions.Write_Not_Permitted_Title"), JOptionPane.ERROR_MESSAGE);
                     // Nothing else we can do.
                 }
@@ -377 +377 @@
                 // Else inform the users that a directory already exists and files will be copied into it
                 //else {
-                //    JOptionPane.showMessageDialog(null, Dictionary.newget("Directory_Exists", target_file.toString()), Dictionary.newget("General.Warning"), JOptionPane.WARNING_MESSAGE);
+                //    JOptionPane.showMessageDialog(null, Dictionary.get("Directory_Exists", target_file.toString()), Dictionary.get("General.Warning"), JOptionPane.WARNING_MESSAGE);
                 //}
                 // Queue non-filtered child files for copying. If this directory already existed, the child records will have to generate the undo jobs, as we don't want to entirely delete this directory if it already existed.
@@ -400 +400 @@
                 cancel_action = true;
                 // Show warning.
-                JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("FileActions.File_Not_Found_Message", source_file.getName()), Dictionary.newget("FileActions.File_Not_Found_Title"), JOptionPane.ERROR_MESSAGE);
+                JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("FileActions.File_Not_Found_Message", source_file.getName()), Dictionary.get("FileActions.File_Not_Found_Title"), JOptionPane.ERROR_MESSAGE);
                 // Force refresh of source folder.
                 source_model.refresh(new TreePath(((FileNode)origin_node.getParent()).getPath()));
@@ -456 +456 @@
                 String args[] = new String[1];
                 args[0] = "" + (queue.size() + 1) + "";
-                //job_status.setText(Dictionary.newget("Jobs", args));
+                //job_status.setText(Dictionary.get("Jobs", args));
                 args[0] = Utility.formatPath("FileActions.Deleting", source_file.getAbsolutePath(), file_status.getSize().width);
-                file_status.setText(Dictionary.newget("FileActions.Deleting", args));
+                file_status.setText(Dictionary.get("FileActions.Deleting", args));
                 args = null;
 
@@ -592 +592 @@
             }
             // Reset status area
-            //job_status.setText(Dictionary.newget("No_Selection"));
-            file_status.setText(Dictionary.newget("FileActions.No_Activity"));
+            //job_status.setText(Dictionary.get("No_Selection"));
+            file_status.setText(Dictionary.get("FileActions.No_Activity"));
             progress.reset();
-            progress.setString(Dictionary.newget("FileActions.No_Activity"));
+            progress.setString(Dictionary.get("FileActions.No_Activity"));
             yes_to_all = false;
             completed_folder_mappings.clear();

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

@@ -112 +112 @@
         FileNode node = (FileNode) path.getLastPathComponent();
         // If this error node is a dummy node (ie has no associated file) we can't unmap it, so we iterate through its children refreshing each in turn. The exception being Greenstone Collections, as it is a dummy node but we can map/unmap it
-        if(node.getFile() == null && !node.toString().equals(Dictionary.newget("Tree.World"))) {
+        if(node.getFile() == null && !node.toString().equals(Dictionary.get("Tree.World"))) {
         for(int i = 0; i < node.getChildCount(); i++) {
             FileNode child = (FileNode) node.getChildAt(i);

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

@@ -59 +59 @@
 
     public AboutDialog(JFrame parent) {
-    super(parent, Dictionary.newget("AboutDialog.Title"), true);
+    super(parent, Dictionary.get("AboutDialog.Title"), true);
     this.self = this;
     setSize(SIZE);
@@ -71 +71 @@
     JLabel title_one_label = new JLabel();
     Dictionary.setText(title_one_label, "AboutDialog.Title_One");
-    JLabel title_two_label = new JLabel(Utility.PROGRAM_NAME + " " + Utility.PROGRAM_VERSION + " " + Dictionary.newget("AboutDialog.Date"));
+    JLabel title_two_label = new JLabel(Utility.PROGRAM_NAME + " " + Utility.PROGRAM_VERSION + " " + Dictionary.get("AboutDialog.Date"));
     JLabel title_three_label = new JLabel();
     Dictionary.setText(title_three_label, "AboutDialog.Title_Two");
@@ -113 +113 @@
 
     // Build text content
-    text.append(Dictionary.newget("AboutDialog.Java_Req"));
+    text.append(Dictionary.get("AboutDialog.Java_Req"));
     text.append("\n");
-    text.append(Dictionary.newget("AboutDialog.Java_Req_One"));
+    text.append(Dictionary.get("AboutDialog.Java_Req_One"));
     text.append("\n");
-    text.append(Dictionary.newget("AboutDialog.Java_Req_Two"));
+    text.append(Dictionary.get("AboutDialog.Java_Req_Two"));
     text.append("\n\n");
-    text.append("*****" + Dictionary.newget("AboutDialog.Acknowledgement") + "*****");
+    text.append("*****" + Dictionary.get("AboutDialog.Acknowledgement") + "*****");
     text.append("\n\n");
-    text.append(Dictionary.newget("AboutDialog.Item0"));
+    text.append(Dictionary.get("AboutDialog.Item0"));
     text.append("\n\n");
-    text.append(Dictionary.newget("AboutDialog.Item1"));
+    text.append(Dictionary.get("AboutDialog.Item1"));
     text.append("\n\n");
-    text.append(Dictionary.newget("AboutDialog.Item2"));
+    text.append(Dictionary.get("AboutDialog.Item2"));
     text.append("\n\n");
-    text.append(Dictionary.newget("AboutDialog.Item3"));
+    text.append(Dictionary.get("AboutDialog.Item3"));
     text.append("\n\n");
-    text.append("*****" + Dictionary.newget("AboutDialog.Thanks") + "*****");
+    text.append("*****" + Dictionary.get("AboutDialog.Thanks") + "*****");
     text.append("\n\n");
-    text.append(Dictionary.newget("AboutDialog.Item4"));
+    text.append(Dictionary.get("AboutDialog.Item4"));
     text.append("\n\n");
-    text.append(Dictionary.newget("AboutDialog.Item5"));
+    text.append(Dictionary.get("AboutDialog.Item5"));
     text.append("\n\n");
-    text.append(Dictionary.newget("AboutDialog.Item6"));
+    text.append(Dictionary.get("AboutDialog.Item6"));
     text.append("\n\n");
-    text.append(Dictionary.newget("AboutDialog.Item7"));
+    text.append(Dictionary.get("AboutDialog.Item7"));
     text.append("\n\n");
-    text.append(Dictionary.newget("AboutDialog.Item8"));
+    text.append(Dictionary.get("AboutDialog.Item8"));
     text.setCaretPosition(0);
 

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

@@ -199 +199 @@
         FileNode node = (FileNode) collection_tree.getModel().getRoot();
         Gatherer.f_man.newFolder(collection_tree, node);
-        //JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("FileActions.No_Parent_For_New_Folder"), Dictionary.newget("General.Error"), JOptionPane.ERROR_MESSAGE);
+        //JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("FileActions.No_Parent_For_New_Folder"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
         }
     }
@@ -228 +228 @@
     else {
         String args[] = new String[1];
-        args[0] = Dictionary.newget("Collection.No_Collection");
+        args[0] = Dictionary.get("Collection.No_Collection");
         Dictionary.registerText(collection_label, "Collection.Collection", args);
         args = null;
@@ -305 +305 @@
 
     args = new String[1];
-    args[0] = Dictionary.newget("Collection.No_Collection");
+    args[0] = Dictionary.get("Collection.No_Collection");
     collection_label = new JLabel();
     collection_label.setOpaque(true);
@@ -557 +557 @@
             String[] args = new String[1];
             args[0] = collection_tree.getSelectionDetails();
-            show_metaaudit = new JMenuItem(Dictionary.newget("Menu.Metadata_View", args), KeyEvent.VK_V);
+            show_metaaudit = new JMenuItem(Dictionary.get("Menu.Metadata_View", args), KeyEvent.VK_V);
             show_metaaudit.addActionListener(this);
             add(show_metaaudit);
         }
         if(tree == collection_tree && node != null && node.getFile() != null && node.getFile().isDirectory() && !node.isReadOnly()) {
-            new_folder = new JMenuItem(Dictionary.newget("CollectionPopupMenu.New_Folder"), KeyEvent.VK_N);
+            new_folder = new JMenuItem(Dictionary.get("CollectionPopupMenu.New_Folder"), KeyEvent.VK_N);
             new_folder.addActionListener(this);
             add(new_folder);
@@ -568 +568 @@
         }
         if(node == null || (node != null && !node.isReadOnly())) {
-            delete = new JMenuItem(Dictionary.newget("CollectionPopupMenu.Delete"), KeyEvent.VK_D);
+            delete = new JMenuItem(Dictionary.get("CollectionPopupMenu.Delete"), KeyEvent.VK_D);
             delete.addActionListener(this);
             add(delete);
@@ -575 +575 @@
             String node_name = node.toString();
             FileNode root = (FileNode) tree.getModel().getRoot();
-            if(!node_name.equals(Dictionary.newget("Tree.World")) && !node_name.equals(Dictionary.newget("Tree.Root")) && !node_name.equals(Dictionary.newget("Tree.Public")) && !node_name.equals(Dictionary.newget("Tree.Private"))) {
+            if(!node_name.equals(Dictionary.get("Tree.World")) && !node_name.equals(Dictionary.get("Tree.Root")) && !node_name.equals(Dictionary.get("Tree.Public")) && !node_name.equals(Dictionary.get("Tree.Private"))) {
             // You can unmap 1st level nodes.
             if(root.getIndex(node) != -1) {
-                unmap = new JMenuItem(Dictionary.newget("MappingPrompt.Unmap"), KeyEvent.VK_U);
+                unmap = new JMenuItem(Dictionary.get("MappingPrompt.Unmap"), KeyEvent.VK_U);
                 unmap.addActionListener(this);
                 add(unmap);
@@ -584 +584 @@
             // Or map any other level directories.
             else {
-                map = new JMenuItem(Dictionary.newget("MappingPrompt.Map"), KeyEvent.VK_M);
+                map = new JMenuItem(Dictionary.get("MappingPrompt.Map"), KeyEvent.VK_M);
                 map.addActionListener(this);
                 add(map);

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

@@ -246 +246 @@
 
     JPanel options_area = new JPanel();
-    options_area.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createEmptyBorder(5,5,5,5), BorderFactory.createTitledBorder(Dictionary.newget("CreatePane.Options_Title"))));
+    options_area.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createEmptyBorder(5,5,5,5), BorderFactory.createTitledBorder(Dictionary.get("CreatePane.Options_Title"))));
     options_area.setLayout(new BorderLayout());
     options_area.add(left, BorderLayout.WEST);
@@ -475 +475 @@
 
         // Create tree.
-        building = new OptionTreeNode(Dictionary.newget("CreatePane.Build"));
-        building.setToolTipText(Dictionary.newget("CreatePane.Build_Tooltip"));
-        importing = new OptionTreeNode(Dictionary.newget("CreatePane.Import"));
-        importing.setToolTipText(Dictionary.newget("CreatePane.Import_Tooltip"));
-        log = new OptionTreeNode(Dictionary.newget("CreatePane.Log"));
-        log.setToolTipText(Dictionary.newget("CreatePane.Log_Tooltip"));
-        options = new OptionTreeNode(Dictionary.newget("CreatePane.Options"));
+        building = new OptionTreeNode(Dictionary.get("CreatePane.Build"));
+        building.setToolTipText(Dictionary.get("CreatePane.Build_Tooltip"));
+        importing = new OptionTreeNode(Dictionary.get("CreatePane.Import"));
+        importing.setToolTipText(Dictionary.get("CreatePane.Import_Tooltip"));
+        log = new OptionTreeNode(Dictionary.get("CreatePane.Log"));
+        log.setToolTipText(Dictionary.get("CreatePane.Log_Tooltip"));
+        options = new OptionTreeNode(Dictionary.get("CreatePane.Options"));
 
         model = new DefaultTreeModel(options);

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

@@ -255 +255 @@
     public void actionPerformed(ActionEvent event) {
         JFileChooser chooser = new JFileChooser(new File(Utility.BASE_DIR));
-        chooser.setDialogTitle(Dictionary.newget("FileAssociationDialog.Browse_Title"));
-        chooser.setFileFilter(new ExtensionFileFilter(".bat", Dictionary.newget("FileAssociationDialog.Batch_File")));
-        chooser.setFileFilter(new ExtensionFileFilter(".com", Dictionary.newget("FileAssociationDialog.Command_File")));
-        chooser.setFileFilter(new ExtensionFileFilter(".exe", Dictionary.newget("FileAssociationDialog.Executable_File")));
+        chooser.setDialogTitle(Dictionary.get("FileAssociationDialog.Browse_Title"));
+        chooser.setFileFilter(new ExtensionFileFilter(".bat", Dictionary.get("FileAssociationDialog.Batch_File")));
+        chooser.setFileFilter(new ExtensionFileFilter(".com", Dictionary.get("FileAssociationDialog.Command_File")));
+        chooser.setFileFilter(new ExtensionFileFilter(".exe", Dictionary.get("FileAssociationDialog.Executable_File")));
         chooser.setAcceptAllFileFilterUsed(true);
         int return_val = chooser.showOpenDialog(null);

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

@@ -101 +101 @@
     for(int i = 0; i < DEFAULTS.length; i++) {
         try {
-        Entry entry = new Entry(Dictionary.newget("Filter." + i), Pattern.compile(DEFAULTS[i]));
+        Entry entry = new Entry(Dictionary.get("Filter." + i), Pattern.compile(DEFAULTS[i]));
         combobox.add(entry);
         }
@@ -238 +238 @@
             ///ystem.err.println("Filter = " + temp_str);
             // Ignore any string which matches a predefined filter, starting with All Files.
-            if(temp_str.equals(Dictionary.newget("Filter.All_Files"))) {
+            if(temp_str.equals(Dictionary.get("Filter.All_Files"))) {
             }
             // HTM & HTML
-            else if(temp_str.equals(Dictionary.newget("Filter.0"))) {
+            else if(temp_str.equals(Dictionary.get("Filter.0"))) {
             }
             // XML
-            else if(temp_str.equals(Dictionary.newget("Filter.1"))) {
+            else if(temp_str.equals(Dictionary.get("Filter.1"))) {
             }
             // Text files
-            else if(temp_str.equals(Dictionary.newget("Filter.2"))) {
+            else if(temp_str.equals(Dictionary.get("Filter.2"))) {
             }
             // Images
-            else if(temp_str.equals(Dictionary.newget("Filter.3"))) {
+            else if(temp_str.equals(Dictionary.get("Filter.3"))) {
             }
             else {
@@ -273 +273 @@
         catch (PatternSyntaxException error) {
         if(first) {
-            JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("Filter.Invalid_Pattern"), Dictionary.newget("General.Error"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("Filter.Invalid_Pattern"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
         }
         }
@@ -318 +318 @@
         }
         else if (pattern == null) {
-        result = Dictionary.newget("Filter.All_Files");
+        result = Dictionary.get("Filter.All_Files");
         }
         else {

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

@@ -67 +67 @@
     public GComboBox(ComboBoxModel model) {
     super(model);
+    init();
+    }
+
+    public GComboBox(Gatherer gatherer) {
+    super();
     init();
     }

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

@@ -148 +148 @@
     thread_group = bob.getThreadGroup();
     // Set up some other UI stuff. (fonts handled in Gatherer.main())
-    UIManager.put("FileChooser.lookInLabelText", Dictionary.newget("SaveCollectionBox.Look_In"));
-    UIManager.put("FileChooser.filesOfTypeLabelText", Dictionary.newget("SaveCollectionBox.Files_Of_Type"));
-    UIManager.put("FileChooser.fileNameLabelText", Dictionary.newget("SaveCollectionBox.File_Name"));
+    UIManager.put("FileChooser.lookInLabelText", Dictionary.get("SaveCollectionBox.Look_In"));
+    UIManager.put("FileChooser.filesOfTypeLabelText", Dictionary.get("SaveCollectionBox.Files_Of_Type"));
+    UIManager.put("FileChooser.fileNameLabelText", Dictionary.get("SaveCollectionBox.File_Name"));
     }
     /** Any implementation of <i>ActionListener</i> must include this method so that we can be informed when an action has occured. In this case we are listening to actions from the menu-bar, and should react appropriately.
@@ -369 +369 @@
     }
     else {
-        this.setTitle(Utility.PROGRAM_NAME + ": " + Dictionary.newget("Collection.No_Collection"));
+        this.setTitle(Utility.PROGRAM_NAME + ": " + Dictionary.get("Collection.No_Collection"));
     }
     // Now is a good time to force a garbage collect.
@@ -389 +389 @@
         }
         else {
-        this.setTitle(Utility.PROGRAM_NAME + ": " + Dictionary.newget("Collection.No_Collection"));
+        this.setTitle(Utility.PROGRAM_NAME + ": " + Dictionary.get("Collection.No_Collection"));
         }
         // Pretty corner icon
@@ -539 +539 @@
     public void setTabEnabled(String rawname, boolean state) {
     // Retrieve the dictionary based name.
-    String name = Dictionary.newget("GUI." + rawname);
+    String name = Dictionary.get("GUI." + rawname);
     int index = tab_pane.indexOfTab(name);
     // Of course we may not have this tab available.

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

@@ -31 +31 @@
 
     public LockFileDialog(JFrame parent, String name, File lock_file) {
-    super(parent, Dictionary.newget("LockFileDialog.Title"), true);
+    super(parent, Dictionary.get("LockFileDialog.Title"), true);
     setSize(SIZE);
     setJMenuBar(new SimpleMenuBar("openingacollection"));
@@ -167 +167 @@
     }
     else {
-        value = Dictionary.newget("LockFileDialog.Error");
+        value = Dictionary.get("LockFileDialog.Error");
     }
     return value;

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

@@ -231 +231 @@
     Dictionary.registerText(metadata_export, "Menu.Metadata_Export");
 
-    metadata_view = new MagicMenuItem(Dictionary.newget("Menu.Metadata_View") + " " + Dictionary.newget("FileActions.No_Selection"), KeyEvent.VK_A);
+    metadata_view = new MagicMenuItem(Dictionary.get("Menu.Metadata_View") + " " + Dictionary.get("FileActions.No_Selection"), KeyEvent.VK_A);
     metadata_view.addActionListener(Gatherer.g_man);    
 
@@ -371 +371 @@
     ///ystem.err.println("**** Set suffix: " + metaaudit_suffix);
     if(metaaudit_suffix == null) {
-        metadata_view.setText(Dictionary.newget("Menu.Metadata_View") + " " + Dictionary.newget("FileActions.No_Selection"));
+        metadata_view.setText(Dictionary.get("Menu.Metadata_View") + " " + Dictionary.get("FileActions.No_Selection"));
         metadata_view.setEnabled(false);
     }
     else {
         ///ystem.err.println("Set metadata view suffix: " + metaaudit_suffix);
-        metadata_view.setText(Dictionary.newget("Menu.Metadata_View") + " " + metaaudit_suffix);
+        metadata_view.setText(Dictionary.get("Menu.Metadata_View") + " " + metaaudit_suffix);
         metadata_view.setEnabled(true);
     }

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

@@ -324 +324 @@
         collection_label.setBackground(Color.lightGray);
         collection_label.setForeground(Color.black);
-        collection_tree.setModel(new DefaultTreeModel(new DefaultMutableTreeNode(Dictionary.newget("Collection.No_Collection"))));
+        collection_tree.setModel(new DefaultTreeModel(new DefaultMutableTreeNode(Dictionary.get("Collection.No_Collection"))));
     }
 
@@ -930 +930 @@
         String[] args = new String[1];
         args[0] = collection_tree.getSelectionDetails();
-        JMenuItem show_metaaudit = new JMenuItem(Dictionary.newget("Menu.Metadata_View", args), KeyEvent.VK_V);
+        JMenuItem show_metaaudit = new JMenuItem(Dictionary.get("Menu.Metadata_View", args), KeyEvent.VK_V);
         show_metaaudit.addActionListener(this);
         add(show_metaaudit);

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

@@ -171 +171 @@
     button_pane.add(download_button);
 
-    edit_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createEmptyBorder(2,0,0,0), BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary.newget("Mirroring.Download_Controls")), BorderFactory.createEmptyBorder(2,2,2,2))));
+    edit_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createEmptyBorder(2,0,0,0), BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary.get("Mirroring.Download_Controls")), BorderFactory.createEmptyBorder(2,2,2,2))));
     edit_pane.setLayout(new BorderLayout());
     edit_pane.add(details_pane, BorderLayout.CENTER);
@@ -204 +204 @@
         }
         catch(MalformedURLException error) {
-        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("Mirroring.Invalid_URL"), Dictionary.newget("Mirroring.Invalid_URL__Title"), JOptionPane.ERROR_MESSAGE);
+        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("Mirroring.Invalid_URL"), Dictionary.get("Mirroring.Invalid_URL__Title"), JOptionPane.ERROR_MESSAGE);
         }
         if(url != null) {

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

@@ -74 +74 @@
     // Sort the result.
     Collections.sort(base_collection_model);
-    base_collection_model.add(0, new Item(null, Dictionary.newget("NewCollectionPrompt.NewCollection")));
+    base_collection_model.add(0, new Item(null, Dictionary.get("NewCollectionPrompt.NewCollection")));
 
     // Creation
@@ -298 +298 @@
         title_final = title.getText();
         if(title_final.length() == 0) {
-        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("NewCollectionPrompt.Title_Error"), Dictionary.newget("NewCollectionPrompt.Error"), JOptionPane.ERROR_MESSAGE);
+        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("NewCollectionPrompt.Title_Error"), Dictionary.get("NewCollectionPrompt.Error"), JOptionPane.ERROR_MESSAGE);
         title.setForeground(Gatherer.config.getColor("coloring.error_foreground", false));
         title.setBackground(Gatherer.config.getColor("coloring.error_background", false));
@@ -310 +310 @@
         for(int i = 0; children != null && i < children.length; i++) {
             if(children[i].getName().equals(name_final)) {
-            JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("NewCollectionPrompt.Name_Error"), Dictionary.newget("NewCollectionPrompt.Error"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("NewCollectionPrompt.Name_Error"), Dictionary.get("NewCollectionPrompt.Error"), JOptionPane.ERROR_MESSAGE);
             file.setForeground(Gatherer.config.getColor("coloring.error_foreground", false));
             file.setBackground(Gatherer.config.getColor("coloring.error_background", false));
@@ -318 +318 @@
         }
         else {
-        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("NewCollectionPrompt.Name_Error"), Dictionary.newget("NewCollectionPrompt.Error"), JOptionPane.ERROR_MESSAGE);
+        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("NewCollectionPrompt.Name_Error"), Dictionary.get("NewCollectionPrompt.Error"), JOptionPane.ERROR_MESSAGE);
         file.setForeground(Gatherer.config.getColor("coloring.error_foreground", false));
         file.setBackground(Gatherer.config.getColor("coloring.error_background", false));
@@ -325 +325 @@
         email_final = address.getText() + "@" + host.getText();
         if(email_final.length() == 0 || email_final.startsWith("@") || email_final.endsWith("@")) {
-        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("NewCollectionPrompt.Email_Error"), Dictionary.newget("NewCollectionPrompt.Error"), JOptionPane.ERROR_MESSAGE);
+        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("NewCollectionPrompt.Email_Error"), Dictionary.get("NewCollectionPrompt.Error"), JOptionPane.ERROR_MESSAGE);
         address.setForeground(Gatherer.config.getColor("coloring.error_foreground", false));
         address.setBackground(Gatherer.config.getColor("coloring.error_background", false));
@@ -334 +334 @@
         description_final = description.getText();
         if(description_final.length() == 0) {
-        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("NewCollectionPrompt.Description_Error"), Dictionary.newget("NewCollectionPrompt.Error"), JOptionPane.ERROR_MESSAGE);
+        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("NewCollectionPrompt.Description_Error"), Dictionary.get("NewCollectionPrompt.Error"), JOptionPane.ERROR_MESSAGE);
         description.setForeground(Gatherer.config.getColor("coloring.error_foreground", false));
         description.setBackground(Gatherer.config.getColor("coloring.error_background", false));

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

@@ -21 +21 @@
 
     public NewFolderPrompt(FileNode node) {
-    super(Gatherer.g_man, Dictionary.newget("NewFolderPrompt.Title"), true);
+    super(Gatherer.g_man, Dictionary.get("NewFolderPrompt.Title"), true);
     this.node = node;
     }
@@ -79 +79 @@
     {
     File file = node.getFile();
-    String default_name = Dictionary.newget("NewFolderPrompt.Default_Folder_Name");
+    String default_name = Dictionary.get("NewFolderPrompt.Default_Folder_Name");
     File temp_file = new File(file, default_name);
     int count = 1;

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

@@ -65 +65 @@
     // Other initialization
     setAcceptAllFileFilterUsed(false);
-    setDialogTitle(Dictionary.newget("OpenCollectionDialog.Title"));
+    setDialogTitle(Dictionary.get("OpenCollectionDialog.Title"));
     setFileFilter(new GathererFilter());
     setFileSystemView(new GathererFileSystemView());
@@ -190 +190 @@
     // The description of this filter
     public String getDescription() {
-        return Dictionary.newget("OpenCollectionDialog.Collection");
+        return Dictionary.get("OpenCollectionDialog.Collection");
     }
     }
@@ -241 +241 @@
         if (file.getName().endsWith(".col")) {
         if (!lockExists(file)) {
-            description = Dictionary.newget("OpenCollectionDialog.Normal_Collection");
+            description = Dictionary.get("OpenCollectionDialog.Normal_Collection");
         }
         else {
-            description = Dictionary.newget("OpenCollectionDialog.Locked_Collection");
+            description = Dictionary.get("OpenCollectionDialog.Locked_Collection");
         }
         }

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

@@ -541 +541 @@
         switch (success) {
         case SUCCESSFUL:
-            d.append(Dictionary.newget("OptionsPane.Successful"));
+            d.append(Dictionary.get("OptionsPane.Successful"));
             break;
         case UNSUCCESSFUL:
-            d.append(Dictionary.newget("OptionsPane.Unsuccessful"));
+            d.append(Dictionary.get("OptionsPane.Unsuccessful"));
             break;
         case CANCELLED:
-            d.append(Dictionary.newget("OptionsPane.Cancelled"));
+            d.append(Dictionary.get("OptionsPane.Cancelled"));
             break;
         default:
-            d.append(Dictionary.newget("OptionsPane.Unknown"));
+            d.append(Dictionary.get("OptionsPane.Unknown"));
         }
         display = d.toString();

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

@@ -270 +270 @@
         String value = (String) warning_preferences.get(property);
         // Remove 'warning.'
-        String title = Dictionary.newget(property.substring(8) + ".Title");
+        String title = Dictionary.get(property.substring(8) + ".Title");
         Entry entry = new Entry(title, value.equalsIgnoreCase(TRUE));
         entry.setProperty(property);
@@ -533 +533 @@
         Gatherer.dictionary.changeDictionary(entry.getLocale());
         // Display message
-        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("Preferences.General.Restart_Required"), Dictionary.newget("Preferences.General.Restart_Required"), JOptionPane.WARNING_MESSAGE);
+        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("Preferences.General.Restart_Required"), Dictionary.get("Preferences.General.Restart_Required"), JOptionPane.WARNING_MESSAGE);
         }
     }

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

@@ -183 +183 @@
     }
     else {
-        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("WarningDialog.Invalid_Value"), Dictionary.newget("General.Error"), JOptionPane.ERROR_MESSAGE);
+        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("WarningDialog.Invalid_Value"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
     }
     }

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

@@ -169 +169 @@
     Dictionary.setText(order_label, "Autofilter.Order");
     order = new JComboBox();
-    order.addItem(Dictionary.newget("Autofilter.Ascending"));
-    order.addItem(Dictionary.newget("Autofilter.Descending"));
+    order.addItem(Dictionary.get("Autofilter.Ascending"));
+    order.addItem(Dictionary.get("Autofilter.Descending"));
     Dictionary.setTooltip(order, "Autofilter.Order_Tooltip");
 
     // Assign values to method comboboxes.
     for(int i = 0; i < Autofilter.METHOD_LIST.length; i++) {
-        first_method.addItem(Dictionary.newget("Autofilter." + Autofilter.METHOD_LIST[i]));
-        second_method.addItem(Dictionary.newget("Autofilter." + Autofilter.METHOD_LIST[i]));
+        first_method.addItem(Dictionary.get("Autofilter." + Autofilter.METHOD_LIST[i]));
+        second_method.addItem(Dictionary.get("Autofilter." + Autofilter.METHOD_LIST[i]));
     }
     JPanel button_pane = new JPanel();
@@ -242 +242 @@
     custom_pane.add(second_pane);
 
-    control.add(Dictionary.newget("Autofilter.Filter_By_Value"), value_pane);
-    control.add(Dictionary.newget("Autofilter.Custom_Filter"), custom_pane);
+    control.add(Dictionary.get("Autofilter.Filter_By_Value"), value_pane);
+    control.add(Dictionary.get("Autofilter.Custom_Filter"), custom_pane);
 
     button_pane.setBorder(BorderFactory.createEmptyBorder(5,0,0,0));

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

@@ -77 +77 @@
     String result;
     if(column == 0) {
-        result = Dictionary.newget("AuditTable.File");
+        result = Dictionary.get("AuditTable.File");
     }
     else {

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

@@ -63 +63 @@
     private ModelBuilder builder = null;
 
-    static final private String[] COLUMN_NAMES = {"", Dictionary.newget("Metadata.Element"),  Dictionary.newget("Metadata.Value")};
+    static final private String[] COLUMN_NAMES = {"", Dictionary.get("Metadata.Element"),  Dictionary.get("Metadata.Value")};
 
 

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

@@ -222 +222 @@
         }
         else {
-        String title = getSelectionCount() + Dictionary.newget("Tree.Files");
+        String title = getSelectionCount() + Dictionary.get("Tree.Files");
         label = new JLabel(title, ((DefaultTreeCellRenderer)getCellRenderer()).getClosedIcon(), JLabel.CENTER);
         title = null;

trunk/gli/src/org/greenstone/gatherer/help/HelpFrame.java

@@ -78 +78 @@
     view = new CalHTMLPane(new CalHTMLPreferences(), new Observer(), "Help Pages");
 
-    HelpItem rootNode = new HelpItem(Dictionary.newget("Help.Contents"), "<null>");
+    HelpItem rootNode = new HelpItem(Dictionary.get("Help.Contents"), "<null>");
     model = new ContentsModel(rootNode);
     contents = new JTree((DefaultTreeModel) model);

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

@@ -161 +161 @@
         }
         v = null;
-                // Add the profile set.
-        children.add(new MEMNode(PROFILER, Dictionary.newget("MEM.Profiles"), this));
+        // Add the profile set.
+        children.add(new MEMNode(PROFILER, Dictionary.get("MEM.Profiles"), this));
         break;
     case SET: // Add the elements as children

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

@@ -143 +143 @@
     this.self = this;
 
-    dialog_options[0] = Dictionary.newget("General.OK");
-    dialog_options[1] = Dictionary.newget("General.Cancel");
+    dialog_options[0] = Dictionary.get("General.OK");
+    dialog_options[1] = Dictionary.get("General.Cancel");
 
     // Creation
@@ -386 +386 @@
     set_attributes_scroll.setViewportView(set_attributes);
 
-    set_attributes_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary.newget("MEM.Attributes")), BorderFactory.createEmptyBorder(2,2,2,2)));
+    set_attributes_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary.get("MEM.Attributes")), BorderFactory.createEmptyBorder(2,2,2,2)));
     set_attributes_pane.setLayout(new BorderLayout());
     set_attributes_pane.add(set_attributes_scroll, BorderLayout.CENTER);
         
-    set_details_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary.newget("MEM.Set_Details")), BorderFactory.createEmptyBorder(2,2,2,2)));
+    set_details_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary.get("MEM.Set_Details")), BorderFactory.createEmptyBorder(2,2,2,2)));
     set_details_pane.setLayout(new BorderLayout());
     //set_details_pane.add(set_name_pane, BorderLayout.NORTH);
@@ -401 +401 @@
     element_attributes_scroll.setViewportView(element_attributes);
 
-    element_attributes_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary.newget("MEM.Attributes")), BorderFactory.createEmptyBorder(2,2,2,2)));
+    element_attributes_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary.get("MEM.Attributes")), BorderFactory.createEmptyBorder(2,2,2,2)));
     element_attributes_pane.setLayout(new BorderLayout());
     element_attributes_pane.add(element_attributes_scroll, BorderLayout.CENTER);
           
-    element_values_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary.newget("MEM.Values")), BorderFactory.createEmptyBorder(2,2,2,2)));
+    element_values_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary.get("MEM.Values")), BorderFactory.createEmptyBorder(2,2,2,2)));
     //element_values_pane.setLayout(new BorderLayout());
     //element_values_pane.add(new JScrollPane(element_values), BorderLayout.CENTER);
@@ -416 +416 @@
     element_inner_pane.add(element_values_pane);
           
-    element_details_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary.newget("MEM.Element_Details")), BorderFactory.createEmptyBorder(2,2,2,2)));
+    element_details_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary.get("MEM.Element_Details")), BorderFactory.createEmptyBorder(2,2,2,2)));
     element_details_pane.setLayout(new BorderLayout());
     //element_details_pane.add(element_name_pane, BorderLayout.NORTH);
@@ -427 +427 @@
     profile_attributes_scroll.setViewportView(profile_attributes);
 
-    profile_attributes_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary.newget("MEM.Profiles")), BorderFactory.createEmptyBorder(2,2,2,2)));
+    profile_attributes_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary.get("MEM.Profiles")), BorderFactory.createEmptyBorder(2,2,2,2)));
     profile_attributes_pane.setLayout(new BorderLayout());
     profile_attributes_pane.add(profile_attributes_scroll, BorderLayout.CENTER);
 
-    profile_details_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary.newget("MEM.Profile_Details")), BorderFactory.createEmptyBorder(2,2,2,2)));
+    profile_details_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Dictionary.get("MEM.Profile_Details")), BorderFactory.createEmptyBorder(2,2,2,2)));
     profile_details_pane.setLayout(new BorderLayout());
     //profile_details_pane.add(profile_name_pane, BorderLayout.NORTH);
@@ -601 +601 @@
         JPanel center_pane = new JPanel();
         center_pane.setOpaque(false);
-        value = new ComboArea(Dictionary.newget("MEM.Values"), LABEL_SIZE);
+        value = new ComboArea(Dictionary.get("MEM.Values"), LABEL_SIZE);
         value.setOpaque(false);
 
@@ -885 +885 @@
         else {
         cont = false;
-        JOptionPane.showMessageDialog(self, Dictionary.newget("MEM.Attribute_Already_Exists"), Dictionary.newget("General.Error"), JOptionPane.ERROR_MESSAGE);
+        JOptionPane.showMessageDialog(self, Dictionary.get("MEM.Attribute_Already_Exists"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
         }
 
@@ -917 +917 @@
         else {
         cont = false;
-        JOptionPane.showMessageDialog(self, Dictionary.newget("MEM.Attribute_Already_Exists"), Dictionary.newget("General.Error"), JOptionPane.ERROR_MESSAGE);
+        JOptionPane.showMessageDialog(self, Dictionary.get("MEM.Attribute_Already_Exists"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
         }
 
@@ -1073 +1073 @@
         // Otherwise show an error message and do not proceed.
         else {
-            JOptionPane.showMessageDialog(self, Dictionary.newget("MEM.Element_Already_Exists"), Dictionary.newget("General.Error"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(self, Dictionary.get("MEM.Element_Already_Exists"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
         }
         name_str = null;
@@ -1092 +1092 @@
             // Warn the user that they can't do that dave.
             else {
-            JOptionPane.showMessageDialog(self, Dictionary.newget("MEM.Cannot_Add_Elements_To_Greenstone_MDS"), Dictionary.newget("General.Error"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(self, Dictionary.get("MEM.Cannot_Add_Elements_To_Greenstone_MDS"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
             }
         }
@@ -1201 +1201 @@
         // Otherwise warn the user and don't hide the prompt.
         else {
-            JOptionPane.showMessageDialog(self, Dictionary.newget("MEM.File_Already_Exists"), Dictionary.newget("General.Error"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(self, Dictionary.get("MEM.File_Already_Exists"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
         }
         name_str = null;
@@ -1329 +1329 @@
         // Otherwise show a warning.
         else {
-            JOptionPane.showMessageDialog(self, Dictionary.newget("MEM.Set_Already_Exists"), Dictionary.newget("General.Error"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(self, Dictionary.get("MEM.Set_Already_Exists"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
         }
         name_str = null;
@@ -1652 +1652 @@
     public void actionPerformed(ActionEvent event) {
         if(current_attribute != -1) {
-        int result = JOptionPane.showOptionDialog(self, Dictionary.newget("MEM.Confirm_Removal", Dictionary.newget("MEM.Attribute")), Dictionary.newget("MEM.Confirm_Removal_Title"), JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE, null, dialog_options, dialog_options[0]);
+        int result = JOptionPane.showOptionDialog(self, Dictionary.get("MEM.Confirm_Removal", Dictionary.get("MEM.Attribute")), Dictionary.get("MEM.Confirm_Removal_Title"), JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE, null, dialog_options, dialog_options[0]);
         // Remove this attribute
         if(result == 0) {
@@ -1700 +1700 @@
     public void actionPerformed(ActionEvent event) {
         if(current_element != null) {
-        int result = JOptionPane.showOptionDialog(self, Dictionary.newget("MEM.Confirm_Removal", Dictionary.newget("MEM.Element")), Dictionary.newget("MEM.Confirm_Removal_Title"), JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE, null, dialog_options, dialog_options[0]);
+        int result = JOptionPane.showOptionDialog(self, Dictionary.get("MEM.Confirm_Removal", Dictionary.get("MEM.Element")), Dictionary.get("MEM.Confirm_Removal_Title"), JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE, null, dialog_options, dialog_options[0]);
         // Remove this attribute
         if(result == 0) {
@@ -1728 +1728 @@
     public void actionPerformed(ActionEvent event) {
         if(current_collection_file != null) {
-        int result = JOptionPane.showOptionDialog(self, Dictionary.newget("MEM.Confirm_Removal", Dictionary.newget("MEM.File")), Dictionary.newget("MEM.Confirm_Removal_Title"), JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE, null, dialog_options, dialog_options[0]);
+        int result = JOptionPane.showOptionDialog(self, Dictionary.get("MEM.Confirm_Removal", Dictionary.get("MEM.File")), Dictionary.get("MEM.Confirm_Removal_Title"), JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE, null, dialog_options, dialog_options[0]);
         // Remove the current collection file profile from the profiler.
         if(result == 0) {
@@ -1753 +1753 @@
     public void actionPerformed(ActionEvent event) {
         if(current_set != null) {
-        int result = JOptionPane.showOptionDialog(self, Dictionary.newget("MEM.Confirm_Removal", Dictionary.newget("MEM.Set")), Dictionary.newget("MEM.Confirm_Removal_Title"), JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE, null, dialog_options, dialog_options[0]);
+        int result = JOptionPane.showOptionDialog(self, Dictionary.get("MEM.Confirm_Removal", Dictionary.get("MEM.Set")), Dictionary.get("MEM.Confirm_Removal_Title"), JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE, null, dialog_options, dialog_options[0]);
         // Remove the currently selected set
         if(result == 0) {
@@ -1778 +1778 @@
     public void actionPerformed(ActionEvent event) {
         if(current_value_node != null) {                 
-        int result = JOptionPane.showOptionDialog(self, Dictionary.newget("MEM.Confirm_Removal", Dictionary.newget("MEM.Value")), Dictionary.newget("MEM.Confirm_Removal_Title"), JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE, null, dialog_options, dialog_options[0]);
+        int result = JOptionPane.showOptionDialog(self, Dictionary.get("MEM.Confirm_Removal", Dictionary.get("MEM.Value")), Dictionary.get("MEM.Confirm_Removal_Title"), JOptionPane.DEFAULT_OPTION, JOptionPane.QUESTION_MESSAGE, null, dialog_options, dialog_options[0]);
         // Remove the current selected value
         if(result == 0) {
@@ -1909 +1909 @@
                 String action = Gatherer.c_man.msm.profiler.getAction(current_collection_file, source);
                 if (action == null) {
-                action = Dictionary.newget("MEM.Ignore");
+                action = Dictionary.get("MEM.Ignore");
                 }
                 attributes.add(new Attribute(source, action));
             }
-            atm = new AttributeTableModel(attributes, Dictionary.newget("MEM.Source"), Dictionary.newget("MEM.Target"), Dictionary.newget("MEM.Ignore"));
+            atm = new AttributeTableModel(attributes, Dictionary.get("MEM.Source"), Dictionary.get("MEM.Target"), Dictionary.get("MEM.Ignore"));
             //current_node.setModel(atm);
             }
@@ -1927 +1927 @@
             atm = current_node.getModel();
             if(atm == null) {
-            atm = new AttributeTableModel(current_element.getAttributes(), Dictionary.newget("MEM.Name"), Dictionary.newget("MEM.Language_Code"), Dictionary.newget("MEM.Value"), "");
+            atm = new AttributeTableModel(current_element.getAttributes(), Dictionary.get("MEM.Name"), Dictionary.get("MEM.Language_Code"), Dictionary.get("MEM.Value"), "");
             //current_node.setModel(atm);
             }
@@ -1965 +1965 @@
                 attribute = null;
             }
-            atm = new AttributeTableModel(attributes, Dictionary.newget("MEM.Name"), Dictionary.newget("MEM.Value"), "");
+            atm = new AttributeTableModel(attributes, Dictionary.get("MEM.Name"), Dictionary.get("MEM.Value"), "");
             //current_node.setModel(atm);
             temp = null;

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

@@ -221 +221 @@
         JFileChooser chooser = new JFileChooser(new File(Utility.METADATA_DIR));
         javax.swing.filechooser.FileFilter filter = new MDSFileFilter();
-        chooser.setApproveButtonText(Dictionary.newget("General.OK"));
+        chooser.setApproveButtonText(Dictionary.get("General.OK"));
         chooser.setFileFilter(filter);
         int returnVal = chooser.showSaveDialog(Gatherer.g_man);

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

@@ -82 +82 @@
             args[0] = document_directories[i].getName();
             args[1] = String.valueOf(count);
-            shell.fireMessage(GShell.IMPORT, shell.typeAsString(GShell.IMPORT) + "> " + Dictionary.newget("GShell.Extracted", args), GShell.OK);
+            shell.fireMessage(GShell.IMPORT, shell.typeAsString(GShell.IMPORT) + "> " + Dictionary.get("GShell.Extracted", args), GShell.OK);
             args = null;
             progress.increment();

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

@@ -51 +51 @@
      */
     public MDSFileFilter() {
-    description = Dictionary.newget("MSMPrompt.File_Filter_Description");
+    description = Dictionary.get("MSMPrompt.File_Filter_Description");
     }
 

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

@@ -109 +109 @@
     String args[] = new String[2];
     args[0] = mde_new.getAttribute("name");
-    args[1] = Dictionary.newget(reason);
-    JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("MSMPrompt.Add_Failed", args), Dictionary.newget("MSMPrompt.Add_Failed_Title"), JOptionPane.ERROR_MESSAGE);
+    args[1] = Dictionary.get(reason);
+    JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("MSMPrompt.Add_Failed", args), Dictionary.get("MSMPrompt.Add_Failed_Title"), JOptionPane.ERROR_MESSAGE);
     }
 
@@ -215 +215 @@
     JPanel current_pane = new JPanel();
     current_pane.setLayout(new BorderLayout());
-    current_pane.setBorder(BorderFactory.createTitledBorder(Dictionary.newget("MSMPrompt.Current_Values")));
+    current_pane.setBorder(BorderFactory.createTitledBorder(Dictionary.get("MSMPrompt.Current_Values")));
     JScrollPane scroll = new JScrollPane(cur_values);
     current_pane.add(scroll, BorderLayout.CENTER);
 
     JPanel new_pane = new JPanel();
-    new_pane.setBorder(BorderFactory.createTitledBorder(Dictionary.newget("MSMPrompt.New_Value")));
+    new_pane.setBorder(BorderFactory.createTitledBorder(Dictionary.get("MSMPrompt.New_Value")));
     new_pane.setLayout(new BorderLayout());
     JLabel new_att = new JLabel(MSMUtils.getValue(att_new));
@@ -349 +349 @@
         String opt_cur[] = MSMUtils.getOptionListDetails(mde_cur);
         String ass_cur[] = MSMUtils.getAssignedValuesDetails(mds_cur, mde_cur);
-        String details_cur = Dictionary.newget("MSMPrompt.Structural", str_cur);
+        String details_cur = Dictionary.get("MSMPrompt.Structural", str_cur);
         if(opt_cur != null) {
-        details_cur = details_cur + "\n" + Dictionary.newget("MSMPrompt.OptionList", opt_cur);
+        details_cur = details_cur + "\n" + Dictionary.get("MSMPrompt.OptionList", opt_cur);
         }
         if(ass_cur != null) {
-        details_cur = details_cur + "\n" + Dictionary.newget("MSMPrompt.AssignedValues", ass_cur);
+        details_cur = details_cur + "\n" + Dictionary.get("MSMPrompt.AssignedValues", ass_cur);
         }
         current_details.setText(details_cur);
@@ -376 +376 @@
     String opt_new[] = MSMUtils.getOptionListDetails(mde_new);
     String ass_new[] = MSMUtils.getAssignedValuesDetails(mds_new, mde_new);
-    String details_new = Dictionary.newget("MSMPrompt.Structural", str_new);
+    String details_new = Dictionary.get("MSMPrompt.Structural", str_new);
     if(opt_new != null) {
-        details_new = details_new + "\n" + Dictionary.newget("MSMPrompt.OptionList", opt_new);
+        details_new = details_new + "\n" + Dictionary.get("MSMPrompt.OptionList", opt_new);
     }
     if(ass_new != null) {
-        details_new = details_new + "\n" + Dictionary.newget("MSMPrompt.AssignedValues", ass_new);
+        details_new = details_new + "\n" + Dictionary.get("MSMPrompt.AssignedValues", ass_new);
     }
     new_details.setText(details_new);
@@ -564 +564 @@
     String args[] = new String[2];
     args[0] = mde_cur.getAttribute("name");
-    args[1] = Dictionary.newget(reason);
-    JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("MSMPrompt.Remove_Failed", args), Dictionary.newget("MSMPrompt.Remove_Failed_Title"), JOptionPane.ERROR_MESSAGE);
+    args[1] = Dictionary.get(reason);
+    JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("MSMPrompt.Remove_Failed", args), Dictionary.get("MSMPrompt.Remove_Failed_Title"), JOptionPane.ERROR_MESSAGE);
     }
 
@@ -577 +577 @@
     args[0] = mde_new.getAttribute("name");
     args[1] = new_name;
-    args[2] = Dictionary.newget(reason);
-    JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("MSMPrompt.Rename_Failed", args), Dictionary.newget("MSMPrompt.Rename_Failed_Title"), JOptionPane.ERROR_MESSAGE);
+    args[2] = Dictionary.get(reason);
+    JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("MSMPrompt.Rename_Failed", args), Dictionary.get("MSMPrompt.Rename_Failed_Title"), JOptionPane.ERROR_MESSAGE);
     }
 
@@ -883 +883 @@
     JComboBox set = new JComboBox();
     set.setBackground(Color.white);
-    set.addItem(Dictionary.newget("MSMPrompt.Select_Set_None"));
+    set.addItem(Dictionary.get("MSMPrompt.Select_Set_None"));
     Vector sets = manager.getSets();
     for(int i = sets.size() - 1; i >= 0; i--) {

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

@@ -341 +341 @@
                 // Failing all that set an error message
         if(description == null) {
-        description = Dictionary.newget("MSM.No_Description");
+        description = Dictionary.get("MSM.No_Description");
         }
     }
@@ -448 +448 @@
                 // Failing all that set an error message
         if(name == null) {
-        name = Dictionary.newget("MSM.No_Name");
+        name = Dictionary.get("MSM.No_Name");
         }
     }

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

@@ -548 +548 @@
     javax.swing.filechooser.FileFilter filter = new MDSFileFilter();
     chooser.setFileFilter(filter);
-    int returnVal = chooser.showDialog(Gatherer.g_man, Dictionary.newget("MSMPrompt.File_Import"));
+    int returnVal = chooser.showDialog(Gatherer.g_man, Dictionary.get("MSMPrompt.File_Import"));
     if(returnVal == JFileChooser.APPROVE_OPTION) {
         return importMDS(chooser.getSelectedFile(), true);

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

@@ -159 +159 @@
 
     public void saving() {
-    progress_bar.setString(Dictionary.newget("SaveProgressDialog.Title"));
+    progress_bar.setString(Dictionary.get("SaveProgressDialog.Title"));
     progress_bar.setValue(MAX / (10 * 2));
     }
@@ -174 +174 @@
      */
     public void start() {
-    progress_bar.setString(Dictionary.newget("FileActions.Calculating_Size"));
+    progress_bar.setString(Dictionary.get("FileActions.Calculating_Size"));
     progress_bar.setValue(MAX / 10);
     num_files = Gatherer.c_man.getCollection().getDocumentCount();

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

@@ -151 +151 @@
         }
         ///ystem.err.println("Command: " + command);
-        fireMessage(type, Dictionary.newget("GShell.Command") + ": " + command, status);
+        fireMessage(type, Dictionary.get("GShell.Command") + ": " + command, status);
                 
         Runtime rt = Runtime.getRuntime();
@@ -188 +188 @@
         if(prcs.exitValue() == 0) {
             status = OK;
-            fireMessage(type, typeAsString(type) + "> " + Dictionary.newget("GShell.Success"), status);
+            fireMessage(type, typeAsString(type) + "> " + Dictionary.get("GShell.Success"), status);
         }
         else {
             status = ERROR;
-            fireMessage(type, typeAsString(type) + "> " + Dictionary.newget("GShell.Failure"), status);
+            fireMessage(type, typeAsString(type) + "> " + Dictionary.get("GShell.Failure"), status);
         }
         }
@@ -210 +210 @@
     // If no error occured, and this was an import process we now extract any new metadata from the archive directory.
     if(status == OK && type == IMPORT) {
-        fireMessage(type, typeAsString(type) + "> " + Dictionary.newget("GShell.Parsing_Metadata_Start"), status);
+        fireMessage(type, typeAsString(type) + "> " + Dictionary.get("GShell.Parsing_Metadata_Start"), status);
         new GreenstoneArchiveParser(progress, this);
-        fireMessage(type, typeAsString(type) + "> " + Dictionary.newget("GShell.Parsing_Metadata_Complete"), status);
+        fireMessage(type, typeAsString(type) + "> " + Dictionary.get("GShell.Parsing_Metadata_Complete"), status);
     }
     // Tidy up.
@@ -292 +292 @@
     switch(type) {
     case BUILD:
-        name = Dictionary.newget("GShell.Build");
+        name = Dictionary.get("GShell.Build");
         break;
     case IMPORT:
-        name = Dictionary.newget("GShell.Import");
+        name = Dictionary.get("GShell.Import");
         break;
     case NEW:
-        name = Dictionary.newget("GShell.New");
+        name = Dictionary.get("GShell.New");
         break;
     default:
-        name = Dictionary.newget("GShell.Other");
+        name = Dictionary.get("GShell.Other");
     }
     return name;

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

@@ -114 +114 @@
         args[0] = String.valueOf(file_count);
         args[1] = String.valueOf(folder_count);
-        suffix = Dictionary.newget("FileActions.Selected", args);
+        suffix = Dictionary.get("FileActions.Selected", args);
         }
         else if(file_count > 1) {
         args = new String[1];
         args[0] = String.valueOf(file_count);
-        suffix = Dictionary.newget("FileActions.Files_And_Directory_Selected", args);
+        suffix = Dictionary.get("FileActions.Files_And_Directory_Selected", args);
         }
         else if(folder_count > 1) {
         args = new String[1];
         args[0] = String.valueOf(folder_count);
-        suffix = Dictionary.newget("FileActions.File_And_Directories_Selected", args);
+        suffix = Dictionary.get("FileActions.File_And_Directories_Selected", args);
         }
         else {
-        suffix = Dictionary.newget("FileActions.File_And_Directory_Selected");
+        suffix = Dictionary.get("FileActions.File_And_Directory_Selected");
         }
     }
@@ -134 +134 @@
         args = new String[1];
         args[0] = String.valueOf(file_count);
-        suffix = Dictionary.newget("FileActions.Files_Selected", args);
+        suffix = Dictionary.get("FileActions.Files_Selected", args);
         }
         else if(file_count == 1) {
-        suffix = Dictionary.newget("FileActions.File_Selected");
+        suffix = Dictionary.get("FileActions.File_Selected");
         }
     }
@@ -144 +144 @@
         args = new String[1];
         args[0] = String.valueOf(folder_count);
-        suffix = Dictionary.newget("FileActions.Directories_Selected", args);
+        suffix = Dictionary.get("FileActions.Directories_Selected", args);
         }
         else {
-        suffix = Dictionary.newget("FileActions.Directory_Selected");
+        suffix = Dictionary.get("FileActions.Directory_Selected");
         }
     }

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

@@ -485 +485 @@
      */
     static public String formatPath(String key, String raw, int width) {
-    JLabel label = new JLabel(Dictionary.newget(key, raw));
+    JLabel label = new JLabel(Dictionary.get(key, raw));
     int position = -1;
     while(label.getPreferredSize().width > width && (position = raw.indexOf(File.separator)) != -1) {
         raw = "..." + raw.substring(position + 1);
-        label.setText(Dictionary.newget(key, raw));
+        label.setText(Dictionary.get(key, raw));
     }
     if(raw.indexOf(File.separator) == -1 && raw.startsWith("...")) {
@@ -571 +571 @@
     int year = current.get(Calendar.YEAR);
 
-    return Dictionary.newget("Dates." + day_name) + " " + Dictionary.newget("Dates." + month_name) + " " + day + " " + year + " " + Utility.pad(String.valueOf(hour), 2, '0', true) + ":" + Utility.pad(String.valueOf(minute), 2, '0', true) + ":" + Utility.pad(String.valueOf(second), 2, '0', true);
+    return Dictionary.get("Dates." + day_name) + " " + Dictionary.get("Dates." + month_name) + " " + day + " " + year + " " + Utility.pad(String.valueOf(hour), 2, '0', true) + ":" + Utility.pad(String.valueOf(minute), 2, '0', true) + ":" + Utility.pad(String.valueOf(second), 2, '0', true);
     }
 
@@ -594 +594 @@
     ImageIcon image = null;
     try {
-        image = new ImageIcon(ClassLoader.getSystemResource("images/" + Dictionary.newget("Version") + "/" + filename));
+        image = new ImageIcon(ClassLoader.getSystemResource("images/" + Dictionary.get("Version") + "/" + filename));
     }
     catch(NullPointerException exception) {