Changeset 5529

Timestamp:

2003-09-24T16:09:13+12:00 (21 years ago)

Author:

mdewsnip

Message:

Further along the tooltip highway. Hacked up the Dictionary code, and are updating the classes to use the new code.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• Configuration.java (modified) (1 diff)
• Dictionary.java (modified) (18 diffs)
• cdm/GeneralManager.java (modified) (11 diffs)
• cdm/PlugInManager.java (modified) (18 diffs)
• gui/BrowsingPane.java (modified) (11 diffs)
• gui/CollectionPane.java (modified) (20 diffs)
• gui/GUIManager.java (modified) (3 diffs)
• gui/MetaEditPane.java (modified) (16 diffs)
• gui/MetaEditPrompt.java (modified) (6 diffs)
• gui/MirrorPane.java (modified) (7 diffs)

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

@@ -660 +660 @@
         JPanel pane = (JPanel) Gatherer.g_man.getContentPane();
         pane.updateUI();
-                // Also update all of the tabs according to workflow.
-        Gatherer.g_man.workflowUpdate("Browser", get("workflow.browse", false));
-        Gatherer.g_man.workflowUpdate("Mirroring", get("workflow.mirror", false));
-        Gatherer.g_man.workflowUpdate("Collection", get("workflow.gather", false));
-        Gatherer.g_man.workflowUpdate("MetaEdit", get("workflow.enrich", false));
-        Gatherer.g_man.workflowUpdate("Build", get("workflow.design", false));
+        // Also update all of the tabs according to workflow.
+        Gatherer.g_man.workflowUpdate("Hunt", get("workflow.browse", false));
+        Gatherer.g_man.workflowUpdate("Mirror", get("workflow.mirror", false));
+        Gatherer.g_man.workflowUpdate("Gather", get("workflow.gather", false));
+        Gatherer.g_man.workflowUpdate("Enrich", get("workflow.enrich", false));
+        Gatherer.g_man.workflowUpdate("Design", get("workflow.design", false));
         Gatherer.g_man.workflowUpdate("Export", get("workflow.export", false));
         Gatherer.g_man.workflowUpdate("Create", get("workflow.create", false));

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

@@ -36 +36 @@
  *########################################################################
  */
+import java.awt.Component;
 import java.io.*;
 import java.util.*;
@@ -42 +43 @@
 import javax.swing.text.*;
 import javax.swing.tree.*;
+import org.greenstone.gatherer.gui.GComboBox;
 import org.greenstone.gatherer.gui.border.TitledBorder;
 import org.greenstone.gatherer.util.DictionaryTreeNode;
@@ -192 +194 @@
     }
 
+
+    static public String newget(String key)
+    {
+    return self.get(key);
+    }
+
+
+    static public String newget(String key, String[] args)
+    {
+    return self.get(key, args);
+    }
+
+
     /** Overloaded to call get with both a key and an empty argument array.
-      * @param key A <strong>String</strong> which is mapped to a initial String within the ResourceBundle.
-      * @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.
-      */
+     * @param key A <strong>String</strong> which is mapped to a initial String within the ResourceBundle.
+     * @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);
@@ -219 +234 @@
     try {
         String initial = dictionary.getString(key);
-                // If the string contains arguments we have to insert them.
+        // If the string contains arguments we have to insert them.
         String complete = "";
-                // While we still have initial string left.
+        // While we still have initial string left.
         while(initial.length() > 0 && initial.indexOf('{') != -1 && initial.indexOf('}') != -1) {
         // Remove preamble
@@ -261 +276 @@
     }
     }
+
     /** Retrieve the two letter code of the current language we are using, according to the stored locale.
-      * @return A <strong>String</strong> containing the two letter ISO639 language code.
-      */
+     * @return A <strong>String</strong> containing the two letter ISO639 language code.
+     */
     public String getLanguage() {
     return locale.getLanguage();
     }
-    /** Register an abstract button component. */
-    public void register(AbstractButton component, String[] args, boolean already_registered) {
+
+
+    static public void setBoth(Component component, String text_key, String tooltip_key)
+    {
+    self.oldSetBoth(component, text_key, null, tooltip_key);
+    }
+
+
+    static public void setText(Component component, String text_key)
+    {
+    self.oldSetText(component, text_key, null);
+    }
+
+
+    static public void setText(Component component, String text_key, String[] args)
+    {
+    self.oldSetText(component, text_key, args);
+    }
+
+
+    static public void setTooltip(Component component, String tooltip_key)
+    {
+    self.oldSetTooltip(component, tooltip_key);
+    }
+
+
+    private void oldSetBoth(Component component, String text_key, String[] args, String tooltip_key)
+    {
+    oldSetText(component, text_key, args);
+    oldSetTooltip(component, tooltip_key);
+    }
+
+
+    private void oldSetText(Component component, String text_key, String[] args)
+    {
+    if (component != null) {
+        // Update the component's details
+        ComponentDetails details = (ComponentDetails) remove(component);
+        if (details == null) {
+        details = new ComponentDetails(true, text_key, args, false, null);
+        }
+        else {
+        details.has_text = true;
+        details.text_key = text_key;
+        details.text_args = args;
+        }
+        put(component, details);
+
+        // Update the component using the AWTEvent queue
+        RegisteredComponentUpdateTask task = new RegisteredComponentUpdateTask(component);
+        SwingUtilities.invokeLater(task);
+    }
+    }
+
+
+    private void oldSetTooltip(Component component, String tooltip_key)
+    {
+    if (component != null) {
+        // Update the component's details
+        ComponentDetails details = (ComponentDetails) remove(component);
+        if (details == null) {
+        details = new ComponentDetails(false, null, null, true, tooltip_key);
+        }
+        else {
+        details.has_tooltip = true;
+        details.tooltip_key = tooltip_key;
+        }
+        put(component, details);
+
+        // Update the component using the AWTEvent queue
+        RegisteredComponentUpdateTask task = new RegisteredComponentUpdateTask(component);
+        SwingUtilities.invokeLater(task);
+    }
+    }
+
+
+    private class ComponentDetails
+    {
+    public boolean has_text;
+    public String text_key;
+    public String[] text_args;
+    public boolean has_tooltip;
+    public String tooltip_key;
+
+    public ComponentDetails(boolean has_text, String text_key, String[] text_args,
+                boolean has_tooltip, String tooltip_key)
+    {
+        this.has_text = has_text;
+        this.text_key = text_key;
+        this.text_args = text_args;
+        this.has_tooltip = has_tooltip;
+        this.tooltip_key = tooltip_key;
+    }
+    }
+
+
+    private class RegisteredComponentUpdateTask
+    implements Runnable {
+
+    private Component component;
+    private ComponentDetails details;
+    private String text = null;
+    private String tooltip = null;
+
+    public RegisteredComponentUpdateTask(Component component)
+    {
+        this.component = component;
+        this.details = (ComponentDetails) get(component);
+
+        if (details.has_text) {
+        text = get(details.text_key, details.text_args);
+        }
+        if (details.has_tooltip) {
+        tooltip = get(details.tooltip_key, (String[]) null);
+        }
+    }
+
+
+    public void run()
+    {
+        // If the component has text
+        if (text != null) {
+        if (component instanceof AbstractButton) {
+            ((AbstractButton) component).setText(text);
+        }
+        else if (component instanceof JDialog) {
+            ((JDialog) component).setTitle(text);
+        }
+        else if (component instanceof JLabel) {
+            ((JLabel) component).setText(text);
+        }
+        else if (component instanceof JTextComponent) {
+            ((JTextComponent) component).setText(text);
+        }
+        else {
+            System.err.println("Unhandled component: " + component.getClass());
+        }
+        }
+
+        // If the component has a tooltip
+        if (tooltip != null) {
+        if (component instanceof JComponent) {
+            ((JComponent) component).setToolTipText(tooltip);
+        }
+        }
+    }
+    }
+
+
+    /**
+     * @deprecated
+     * Register an abstract button component */
+    public void register(AbstractButton component, String[] args, boolean already_registered)
+    {
     if(component != null) {
         // Determine the key
@@ -290 +458 @@
     }
     }
-    /** Register a combobox component. */
+
+    /**
+     * @deprecated
+     * Register a JCheckBox component */
+    public void register(JCheckBox component, String[] args, boolean already_registered)
+    {
+    }
+
+    /**
+     * @deprecated
+     * Register a combobox component. */
     public void register(JComboBox component, String[] args, boolean already_registered) {
     if(component != null) {
@@ -317 +495 @@
     }
     }
-    /** Register a dialog component. */
+
+    /**
+     * @deprecated
+     * Register a dialog component. */
     public void register(JDialog component, String[] args, boolean already_registered) {
     if(component != null) {
@@ -339 +520 @@
     }
     }
-    /** Register a frame component. */
+
+    /**
+     * @deprecated
+     * Register a frame component. */
     public void register(JFrame component, String[] args, boolean already_registered) {
     if(component != null) {
@@ -361 +545 @@
     }
     }
-    /** Register a label component. */
+
+    /**
+     * @deprecated
+     * Register a label component. */
     public void register(JLabel component, String[] args, boolean already_registered) {
     if(component != null) {
@@ -383 +570 @@
     }
     }
-    /** Register a tab pane component. */
+
+    /**
+     * @deprecated
+     * Register a tab pane component. */
     public void register(JTabbedPane component, String[] args, boolean already_registered) {
     if(component != null) {
@@ -407 +597 @@
     }
 
-    /** Register a text component. */
+    /**
+     * @deprecated
+     * Register a text component. */
     public void register(JTextComponent component, String[] args, boolean already_registered)
     {
@@ -433 +625 @@
     }
 
-    /** Register a tree component. */
+    /**
+     * @deprecated
+     * Register a tree component. */
     public void register(JTree component, String[] args, boolean already_registered) {
     if(component != null) {
@@ -457 +651 @@
     }
     }
-    /** Register a titled border component. */
+
+    /**
+     * @deprecated
+     * Register a titled border component. */
     public void register(TitledBorder component, String[] args, boolean already_registered) {
     if(component != null) {
@@ -479 +676 @@
     }
     }
+
     /** A get method called internally by components that have been previously been registered, which means that arg[index] is the original key value. Index is usually the last entry in the array, however this is not true for comboboxes, tabbed panes and trees. */
     private String get(String[] args, int index) {
     return get(args[index], args);
     }
+
 
     private abstract class ChangeTask
@@ -495 +694 @@
     }
     }
+
     /** Update the text and tooltip for this button. */
     private class AbstractButtonChangeTask
@@ -507 +707 @@
     public void run() {
         component.setText(value);
-        if(!tooltip.equals(key+"_Tooltip")) {
-        component.setToolTipText(tooltip);
-        }
-        else {
-        component.setToolTipText(null);
-        }
+        // if(!tooltip.equals(key+"_Tooltip")) {
+        component.setToolTipText(tooltip);
+        // }
+        // else {
+        // component.setToolTipText(null);
+        // }
     }
     }
@@ -568 +768 @@
     }
     }
+
     /** Update the text of this label. */
     private class JLabelChangeTask
     extends ChangeTask {
     private JLabel component;
+
     public JLabelChangeTask(JLabel component, String key, String value) {
         super(key, value);
         this.component = component;
     }
+
     public void run() {
         component.setText(value);
     }
     }
+
     /** Updates a tabbed panes tab title and tooltip. */
     private class JTabbedPaneChangeTask
@@ -666 +870 @@
     }
 }
-
-
-
-

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

@@ -25 +25 @@
  *########################################################################
  */
+
 package org.greenstone.gatherer.cdm;
+
 import java.awt.*;
 import java.awt.event.*;
@@ -70 +72 @@
     // Creation
     JPanel tree_pane = new JPanel();
-    JLabel title = new JLabel(get("CDM.GUI.Design_Topics"));
+    JLabel title = new JLabel();
+    Gatherer.dictionary.setText(title, "CDM.GUI.Design_Topics", null);
     tree = new DesignTree();
     view = controls;
@@ -106 +109 @@
     /** Refresh the values on our controls that could be stale due to changes in other components. */
     public void gainFocus() {
-    if(view != null) {
+    if (view != null) {
         view.gainFocus();
     }
@@ -113 +116 @@
     /** Saves the state of the controls in the current view. */
     public void loseFocus() {
-    if(view != null) {
+    if (view != null) {
         view.loseFocus();
     }
-    }
-
-    /** Overloaded to call get with both a key and an empty argument array.
-     * @param key a String which is mapped to a key within the dictionary
-     * @return a String which has been referenced by the key and that either contains no argument fields, or has had the argument fields automatically populated with arguments provided in the get call
-     */
-    private String get(String key) {
-    return get(key, null);
-    }
-
-    /** Used to retrieve a property value from the Locale specific ResourceBundle, based upon the key and arguments supplied. If the key cannot be found or if some other part of the call fails a default (English) error message is returned. <BR>
-     * Here the get recieves a second argument which is an array of Strings used to populate argument fields, denoted {<I>n</I>}, within the value String returned. Note that argument numbers greater than or equal to 32 are automatically mapped to the formatting String named Farg<I>n</I>.
-     * @param key A <strong>String</strong> which is mapped to a initial String within the ResourceBundle.
-     * @param args A <strong>String[]</strong> used to populate argument fields within the complete String.
-     * @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.
-     * @see org.greenstone.gatherer.Gatherer
-     * @see org.greenstone.gatherer.Dictionary
-     */
-    private String get(String key, String args[]) {
-    if(key.indexOf('.') == -1) {
-        key = "CDM.GUI." + key;
-    }
-    return Gatherer.dictionary.get(key, args);
     }
 
@@ -191 +171 @@
         beta_collectionmeta = new CollectionMeta(CollectionDesignManager.collect_config.getBeta());
         public_collectionmeta = new CollectionMeta(CollectionDesignManager.collect_config.getPublic());
-       
+
         // Creation
         JPanel instruction_panel = new JPanel();
-        title_label = new JLabel("CDM.General.Title");
+        title_label = new JLabel();
         title_label.setHorizontalAlignment(JLabel.CENTER);
-        instructions_textarea = new JTextArea("CDM.General.Instructions");
+        Gatherer.dictionary.setText(title_label, "CDM.General.Title", null);
+
+        instructions_textarea = new JTextArea();
         instructions_textarea.setCaretPosition(0);
         instructions_textarea.setEditable(false);
@@ -202 +184 @@
         instructions_textarea.setRows(6);
         instructions_textarea.setWrapStyleWord(true);
+        Gatherer.dictionary.setText(instructions_textarea, "CDM.General.Instructions", null);
 
         JPanel all_details_panel = new JPanel();
         JPanel details_panel = new JPanel();
         JPanel creator_panel = new JPanel();
-        creator_label = new JLabel("CDM.General.Email.Creator");
+        creator_label = new JLabel();
         creator_label.setPreferredSize(LABEL_SIZE);
+        Gatherer.dictionary.setText(creator_label, "CDM.General.Email.Creator", null);
+
         creator_emailfield = new EmailField(Gatherer.config.getColor("coloring.error_background", false));
+        Gatherer.dictionary.setTooltip(creator_emailfield, "CDM.General.Email.Creator_Tooltip");
+
         JPanel maintainer_panel = new JPanel();
-        maintainer_label = new JLabel("CDM.General.Email.Maintainer");
+        maintainer_label = new JLabel();
         maintainer_label.setPreferredSize(LABEL_SIZE);
+        Gatherer.dictionary.setText(maintainer_label, "CDM.General.Email.Maintainer", null);
+
         maintainer_emailfield = new EmailField(Gatherer.config.getColor("coloring.error_background", false));
-        public_checkbox = new JCheckBox("CDM.General.Access", public_collectionmeta.getValue(CollectionMeta.TEXT).equals(CollectionConfiguration.TRUE_STR));
-        beta_checkbox = new JCheckBox("CDM.General.Beta", beta_collectionmeta.getValue(CollectionMeta.TEXT).equals(CollectionConfiguration.TRUE_STR));
+        Gatherer.dictionary.setTooltip(maintainer_emailfield, "CDM.General.Email.Maintainer_Tooltip");
+        public_checkbox = new JCheckBox("", public_collectionmeta.getValue(CollectionMeta.TEXT).equals(CollectionConfiguration.TRUE_STR));
+        Gatherer.dictionary.setText(public_checkbox, "CDM.General.Access", null);
+        beta_checkbox = new JCheckBox("", beta_collectionmeta.getValue(CollectionMeta.TEXT).equals(CollectionConfiguration.TRUE_STR));
+        Gatherer.dictionary.setText(beta_checkbox, "CDM.General.Beta", null);
         JPanel name_panel = new JPanel();
-        name_label = new JLabel("CDM.General.Collection_Name");
+        name_label = new JLabel();
         name_label.setPreferredSize(LABEL_SIZE);
-        name_textfield = new JTextField();
+        Gatherer.dictionary.setText(name_label, "CDM.General.Collection_Name", null);
+        name_textfield = new JTextField("CDM.General.Collection_Name");
+        Gatherer.dictionary.setTooltip(name_textfield, "CDM.General.Collection_Name_Tooltip");
         JPanel icon_panel = new JPanel();
-        icon_label = new JLabel("CDM.General.Icon_Collection");
+        icon_label = new JLabel();
         icon_label.setPreferredSize(LABEL_SIZE);
-        icon_textfield = new JTextField();
+        Gatherer.dictionary.setText(icon_label, "CDM.General.Icon_Collection", null);
+        icon_textfield = new JTextField("CDM.General.Icon_Collection");
+        Gatherer.dictionary.setTooltip(icon_textfield, "CDM.General.Icon_Collection_Tooltip");
         JPanel small_icon_panel = new JPanel();
         small_icon_label = new JLabel("CDM.General.Icon_Collection_Small");
         small_icon_label.setPreferredSize(LABEL_SIZE);
-        small_icon_textfield = new JTextField();
+        Gatherer.dictionary.setText(small_icon_label, "CDM.General.Icon_Collection_Small", null);
+        small_icon_textfield = new JTextField("CDM.General.Icon_Collection_Small");
+        Gatherer.dictionary.setTooltip(small_icon_textfield, "CDM.General.Icon_Collection_Small_Tooltip");
         JPanel description_panel = new JPanel();
-        description_label = new JLabel("CDM.General.Collection_Extra");
+        description_label = new JLabel();
         description_label.setPreferredSize(LABEL_SIZE);
+        Gatherer.dictionary.setText(description_label, "CDM.General.Collection_Extra", null);
         description_textarea = new JTextArea();
         description_textarea.setBackground(Gatherer.config.getColor("coloring.editable_background", false));
+        Gatherer.dictionary.setTooltip(description_textarea, "CDM.General.Collection_Extra_Tooltip");
         // Connection
         beta_checkbox.addActionListener(CollectionDesignManager.change_listener);
@@ -241 +241 @@
         name_textfield.getDocument().addDocumentListener(CollectionDesignManager.change_listener);
         small_icon_textfield.getDocument().addDocumentListener(CollectionDesignManager.change_listener);
-        Gatherer.dictionary.register(beta_checkbox, null, false);
-        Gatherer.dictionary.register(creator_label, null, false);
-        Gatherer.dictionary.register(description_label, null, false);
-        Gatherer.dictionary.register(icon_label, null, false);
-        Gatherer.dictionary.register(instructions_textarea, null, false);
-        Gatherer.dictionary.register(maintainer_label, null, false);
-        Gatherer.dictionary.register(name_label, null, false);
-        Gatherer.dictionary.register(public_checkbox, null, false);
-        Gatherer.dictionary.register(small_icon_label, null, false);
-        Gatherer.dictionary.register(title_label, null, false);
+
         // Layout
         instruction_panel.setBorder(BorderFactory.createEmptyBorder(0,0,5,0));
@@ -299 +290 @@
         add(all_details_panel, BorderLayout.CENTER);
     }
+
     /** Destructor. */
     public void destroy() {
-        Gatherer.dictionary.deregister(beta_checkbox);
-        Gatherer.dictionary.deregister(creator_label);
-        Gatherer.dictionary.deregister(description_label);
-        Gatherer.dictionary.deregister(icon_label);
-        Gatherer.dictionary.deregister(instructions_textarea);
-        Gatherer.dictionary.deregister(maintainer_label);
-        Gatherer.dictionary.deregister(name_label);
-        Gatherer.dictionary.deregister(public_checkbox);
-        Gatherer.dictionary.deregister(small_icon_label);
-        Gatherer.dictionary.deregister(title_label);
-    }
+    }
+
     /** Called to refresh the components. */
     public void gainFocus() {
@@ -361 +344 @@
     public DesignTree() {
         super();
-        root = new DesignNode("CDM.GUI.Root");
+        root = new DesignNode("Root");
         this.setModel(new DefaultTreeModel(root));
         // Now add the design categories.
@@ -390 +373 @@
     /** Constructor.
      * @param object The <strong>Object</strong> assigned to this node.
-          */
+     */
     public DesignNode(String object) {
         super(object);
@@ -398 +381 @@
      */
     public String toString() {
-        return get((String)getUserObject());
+        return Gatherer.dictionary.get("CDM.GUI." + (String)getUserObject());
     }
     }

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

@@ -145 +145 @@
     }
     if(plugin.getName().equals(StaticStrings.ARCPLUG_STR) || plugin.getName().equals(StaticStrings.RECPLUG_STR)) {
-        JOptionPane.showMessageDialog(Gatherer.g_man, get("CDM.Move.Fixed"), get("CDM.Move.Title"), JOptionPane.ERROR_MESSAGE);
+        JOptionPane.showMessageDialog(Gatherer.g_man, Gatherer.dictionary.get("CDM.Move.Fixed"), Gatherer.dictionary.get("CDM.Move.Title"), JOptionPane.ERROR_MESSAGE);
         return;
     }
@@ -182 +182 @@
         if(index < 0) {
             String args[] = new String[2];
-            args[0] = get("CDM.PlugInManager.PlugIn_Str");
+            args[0] = Gatherer.dictionary.get("CDM.PlugInManager.PlugIn_Str");
             args[1] = plugin.getName();
-            JOptionPane.showMessageDialog(Gatherer.g_man, get("CDM.Move.At_Top", args), get("CDM.Move.Title"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(Gatherer.g_man, Gatherer.dictionary.get("CDM.Move.At_Top", args), Gatherer.dictionary.get("CDM.Move.Title"), JOptionPane.ERROR_MESSAGE);
             return;
         }
@@ -197 +197 @@
             String args[] = new String[1];
             args[0] = plugin.getName();
-            JOptionPane.showMessageDialog(Gatherer.g_man, get("CDM.Move.Cannot", args), get("CDM.Move.Title"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(Gatherer.g_man, Gatherer.dictionary.get("CDM.Move.Cannot", args), Gatherer.dictionary.get("CDM.Move.Title"), JOptionPane.ERROR_MESSAGE);
             // Still not going to move RecPlug or ArcPlug.
             return;
@@ -279 +279 @@
     }
 
-    /* Retrieve a phrase from the dictionary based on a certain key.
-     * @param key The search <strong>String</strong>.
-     * @return The matching phrase from the Dictionary.
-     */
-    private String get(String key) {
-    return get(key, (String[])null);
-    }
-    
-    private String get(String key, String arg) {
-    String args[] = new String[1];
-    args[0] = arg;
-    return get(key, args);
-    }
-
-    /* Retrieve a phrase from the dictionary based on a certain key and arguments.
-     * @param key The search <strong>String</strong>.
-     * @param args A <strong>String[]</strong> of arguments used to complete and format the choosen phrase.
-     * @return The matching phrase from the Dictionary.
-     */
-    private String get(String key, String args[]) {
-    if(key.indexOf(".") == -1) {
-        key = "CDM.PlugInManager." + key;
-    }
-    return Gatherer.dictionary.get(key, args);
-    }    
 
     /** Retrieve a list of those plugins that are in library but not in the assigned plugins. */
@@ -398 +373 @@
         String plugin_name = getPlugInName(plugin);
         //Gatherer.println("Zero length argument xml detected for: " + plugin_name);
-        JOptionPane.showMessageDialog(Gatherer.g_man, get("CDM.PlugInManager.PlugIn_XML_Parse_Failed", plugin_name), get("General.Error"), JOptionPane.ERROR_MESSAGE);
+        JOptionPane.showMessageDialog(Gatherer.g_man, Gatherer.dictionary.get("CDM.PlugInManager.PlugIn_XML_Parse_Failed", plugin_name), Gatherer.dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
         }
     }
@@ -435 +410 @@
     if(files != null) {
         // Create a progress indicator.
-        ParsingProgress progress = new ParsingProgress(get("CDM.PlugInManager.Parsing.Title"), get("CDM.PlugInManager.Parsing.Message"), files.length);
+        ParsingProgress progress = new ParsingProgress(Gatherer.dictionary.get("CDM.PlugInManager.Parsing.Title"), Gatherer.dictionary.get("CDM.PlugInManager.Parsing.Message"), files.length);
         for(int i = 0; i < files.length; i++) {
         // We only want to check Perl Modules.
@@ -565 +540 @@
     /** The area where the add, configure and remove buttons are placed. */
     private JPanel button_pane = null;
-    /** The region which divides the central portion of the view into list and controls. */
+    /** The region which divides the central portion of the view into list and controls */
     private JPanel central_pane = null;
     /** The area where title label and instructions sit. */
@@ -577 +552 @@
     /** The text area containing instructions on the use of this control. */
     private JTextArea instructions = null;
+
     /** Constructor.
      */
     public PlugInControl() {
         // Create
-        add = new JButton(get("CDM.PlugInManager.Add"));
+        add = new JButton();
         add.setMnemonic(KeyEvent.VK_A);
+        Gatherer.dictionary.setBoth(add, "CDM.PlugInManager.Add", "CDM.PlugInManager.Add_Tooltip");
+
         button_pane = new JPanel();
         central_pane = new JPanel();
-        configure = new JButton(get("CDM.PlugInManager.Configure"));
+
+        configure = new JButton();
         configure.setEnabled(false);
         configure.setMnemonic(KeyEvent.VK_C);
+        Gatherer.dictionary.setBoth(configure, "CDM.PlugInManager.Configure", "CDM.PlugInManager.Configure_Tooltip");
+
         header_pane = new JPanel();
-        instructions = new JTextArea(get("CDM.PlugInManager.Instructions"));
+
+        instructions = new JTextArea();
         instructions.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
         instructions.setEditable(false);
@@ -595 +577 @@
         instructions.setRows(6);
         instructions.setWrapStyleWord(true);
-
-        move_top_button = new DoubleImageButton(get("CDM.Move.Move_Top"), Utility.getImage("arrow-top.gif"), Utility.getImage("arrow-top-disabled.gif"));
+        Gatherer.dictionary.setText(instructions, "CDM.PlugInManager.Instructions", null);
+
+        move_top_button = new DoubleImageButton("", Utility.getImage("arrow-top.gif"), Utility.getImage("arrow-top-disabled.gif"));
         move_top_button.setEnabled(false);
         move_top_button.setMnemonic(KeyEvent.VK_T);
-        move_top_button.setDisplayedMnemonicIndex(8);  // !! English-centric hack
+        // move_top_button.setDisplayedMnemonicIndex(8);  // !! English-centric hack
         move_top_button.setPreferredSize(Utility.DOUBLE_IMAGE_BUTTON_SIZE);
-
-        move_up_button = new DoubleImageButton(get("CDM.Move.Move_Up"), Utility.getImage("arrow-up.gif"), Utility.getImage("arrow-up-disabled.gif"));
+        Gatherer.dictionary.setBoth(move_top_button, "CDM.Move.Move_Top", "CDM.Move.Move_Top_Tooltip");
+
+        move_up_button = new DoubleImageButton("", Utility.getImage("arrow-up.gif"), Utility.getImage("arrow-up-disabled.gif"));
         move_up_button.setEnabled(false);
         move_up_button.setMnemonic(KeyEvent.VK_U);
         move_up_button.setPreferredSize(Utility.DOUBLE_IMAGE_BUTTON_SIZE);
-
-        move_down_button = new DoubleImageButton(get("CDM.Move.Move_Down"), Utility.getImage("arrow-down.gif"), Utility.getImage("arrow-down-disabled.gif"));
+        Gatherer.dictionary.setBoth(move_up_button, "CDM.Move.Move_Up", "CDM.Move.Move_Up_Tooltip");
+
+        move_down_button = new DoubleImageButton("", Utility.getImage("arrow-down.gif"), Utility.getImage("arrow-down-disabled.gif"));
         move_down_button.setEnabled(false);
         move_down_button.setMnemonic(KeyEvent.VK_D);
         move_down_button.setPreferredSize(Utility.DOUBLE_IMAGE_BUTTON_SIZE);
-
-        move_bottom_button = new DoubleImageButton(get("CDM.Move.Move_Bottom"), Utility.getImage("arrow-bottom.gif"), Utility.getImage("arrow-bottom-disabled.gif"));
+        Gatherer.dictionary.setBoth(move_down_button, "CDM.Move.Move_Down", "CDM.Move.Move_Down_Tooltip");
+
+        move_bottom_button = new DoubleImageButton("", Utility.getImage("arrow-bottom.gif"), Utility.getImage("arrow-bottom-disabled.gif"));
         move_bottom_button.setEnabled(false);
         move_bottom_button.setMnemonic(KeyEvent.VK_B);
         move_bottom_button.setPreferredSize(Utility.DOUBLE_IMAGE_BUTTON_SIZE);
+        Gatherer.dictionary.setBoth(move_bottom_button, "CDM.Move.Move_Bottom", "CDM.Move.Move_Bottom_Tooltip");
 
         movement_pane = new JPanel();
@@ -626 +613 @@
         plugin.setTextNonSelectionColor(Gatherer.config.getColor("coloring.workspace_tree_foreground", false));
         plugin.setTextSelectionColor(Gatherer.config.getColor("coloring.collection_selection_foreground", false));
-
-        plugin_label = new JLabel(get("CDM.PlugInManager.PlugIn"));
+        Gatherer.dictionary.setTooltip(plugin, "CDM.PlugInManager.PlugIn_Tooltip");
+
+        plugin_label = new JLabel();
+        Gatherer.dictionary.setText(plugin_label, "CDM.PlugInManager.PlugIn", null);
+
         plugin_list = new JList(model);
         plugin_list.setCellRenderer(new ListRenderer());
         plugin_list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-        plugin_list_label = new JLabel(get("CDM.PlugInManager.Assigned"));
+        plugin_list_label = new JLabel();
         plugin_list_label.setHorizontalAlignment(JLabel.CENTER);
         plugin_list_label.setOpaque(true);
+        Gatherer.dictionary.setText(plugin_list_label, "CDM.PlugInManager.Assigned", null);
+
         plugin_list_pane = new JPanel();
         plugin_pane = new JPanel();
-        remove = new JButton(get("CDM.PlugInManager.Remove"));
+
+        remove = new JButton();
         remove.setEnabled(false);
         remove.setMnemonic(KeyEvent.VK_R);
-        title = new JLabel(get("CDM.PlugInManager.Title"));
+        Gatherer.dictionary.setBoth(remove, "CDM.PlugInManager.Remove", "CDM.PlugInManager.Remove_Tooltip");
+
+        title = new JLabel();
         title.setHorizontalAlignment(JLabel.CENTER);
         title.setOpaque(true);
+        Gatherer.dictionary.setText(title, "CDM.PlugInManager.Title", null);
+
         // Listeners
         add.addActionListener(new AddListener());
@@ -653 +650 @@
         plugin_list.addMouseListener(new ClickListener());
         plugin_list.addListSelectionListener(new ListListener());
+
         // Layout
         title.setBorder(BorderFactory.createEmptyBorder(0,0,2,0));
@@ -683 +681 @@
         plugin_pane.add(plugin);
 
+        button_pane.setLayout(new GridLayout(1,3));
+        button_pane.add(add);
+        button_pane.add(configure);
+        button_pane.add(remove);
+
         // Scope these mad bordering skillz.
+        // !! TO DO: Dictionary registration !!
         JPanel temp = new JPanel(new BorderLayout());
         temp.setBorder
@@ -689 +693 @@
          (BorderFactory.createEmptyBorder(5,0,5,0),
           BorderFactory.createCompoundBorder
-          (BorderFactory.createTitledBorder(get("CDM.PlugInManager.Controls")),
+          (BorderFactory.createTitledBorder(Gatherer.dictionary.get("CDM.PlugInManager.Controls")),
            BorderFactory.createEmptyBorder(2,2,2,2))));
 
@@ -698 +702 @@
         central_pane.add(plugin_list_pane, BorderLayout.CENTER);
         central_pane.add(temp, BorderLayout.SOUTH);
-
-        button_pane.setLayout(new GridLayout(1,3));
-        button_pane.add(add);
-        button_pane.add(configure);
-        button_pane.add(remove);
 
         setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
@@ -708 +707 @@
         add(header_pane, BorderLayout.NORTH);
         add(central_pane, BorderLayout.CENTER);
-                //add(button_pane, BorderLayout.SOUTH);
-    }
+    }
+
     /** Method which acts like a destructor, tidying up references to persistant objects.
      */
@@ -725 +724 @@
 
     public void loseFocus() {
-
     }
 
@@ -770 +768 @@
             }
             else {
-            JOptionPane.showMessageDialog(Gatherer.g_man, get("CDM.PlugInManager.PlugIn_Exists"), get("General.Error"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(Gatherer.g_man, Gatherer.dictionary.get("CDM.PlugInManager.PlugIn_Exists"), Gatherer.dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
             }
             base_plugin = null;
@@ -930 +928 @@
      */
     static private JPanel getSeparator() {
-    // we put the separator inside a panel to control
-    // its appearance
+    // We put the separator inside a panel to control its appearance
     JPanel _sepPanel = new JPanel();
     _sepPanel.setOpaque(false);

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

@@ -42 +42 @@
 import java.net.*;
 import javax.swing.*;
+import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.util.GURL;
@@ -69 +70 @@
     private String args[] = null;
     static final String BOOKMARKS_FILE = "bookmarks.txt";
+
     public BrowsingPane() {
     super();
@@ -80 +82 @@
     preferences.setHomeURL((new GURL(Gatherer.config.getString("general.home_page", false))).getURL());
     // Creation
-    //   Controls
+    // Controls
     JPanel button_pane = new JPanel();
     JPanel left_button_pane = new JPanel();
-    back_button = new JButton("", Utility.getImage("back.gif"));
+
+    back_button = new JButton(Utility.getImage("back.gif"));
     back_button.setEnabled(false);
-    back_button.setToolTipText(get("Browser.Back"));
-    refresh_button = new JButton("", Utility.getImage("reload.gif"));
-    refresh_button.setEnabled(false);
-    refresh_button.setToolTipText(get("Browser.Reload"));
-    bookmarks_button = new JButton("", Utility.getImage("bookmark.gif"));
+    Dictionary.setTooltip(back_button, "Browser.Back");
+
+    // refresh_button = new JButton(Utility.getImage("reload.gif"));
+    // refresh_button.setEnabled(false);
+    // Dictionary.setTooltip(refresh_button, "Browser.Reload");
+
+    bookmarks_button = new JButton(Utility.getImage("bookmark.gif"));
     bookmarks_button.setEnabled(false);
-    bookmarks_button.setToolTipText(get("Browser.Bookmarks"));
-    home_button = new JButton("", Utility.getImage("home.gif"));
-    home_button.setToolTipText(get("Browser.Home"));
+    Dictionary.setTooltip(bookmarks_button, "Browser.Bookmarks");
+
+    home_button = new JButton(Utility.getImage("home.gif"));
+    Dictionary.setTooltip(home_button, "Browser.Home");
+
     JPanel address_pane = new JPanel();
     address_field = new JTextField(Gatherer.config.getString("general.home_page", false));
+    Dictionary.setTooltip(address_field, "Browser.Address_Tooltip");
+
     JPanel right_button_pane = new JPanel();
-    go_button = new JButton("", Utility.getImage("go.gif"));
-    go_button.setToolTipText(get("Browser.Go"));
-    stop_button = new JButton("", Utility.getImage("stop.gif"));
+    go_button = new JButton(Utility.getImage("go.gif"));
+    Dictionary.setTooltip(go_button, "Browser.Go");
+
+    stop_button = new JButton(Utility.getImage("stop.gif"));
     stop_button.setEnabled(false);
-    stop_button.setToolTipText(get("Browser.Stop"));
-    forward_button = new JButton("", Utility.getImage("forward.gif"));
+    Dictionary.setTooltip(stop_button, "Browser.Stop");
+
+    forward_button = new JButton(Utility.getImage("forward.gif"));
     forward_button.setEnabled(false);
-    forward_button.setToolTipText(get("Browser.Forward"));
-    //   Calpa Pane stuff
+    Dictionary.setTooltip(forward_button, "Browser.Forward");
+
+    // Calpa Pane stuff
     view_pane = new CalHTMLPane(preferences, observer, "VIEW_PANE");
-    //   Status bar
-    status_label = new JLabel(get("Browser.Ready"));
+
+    // Status bar
+    status_label = new JLabel();
+    Dictionary.setText(status_label, "Browser.Ready");
+
     // Connection
     address_field.addActionListener(new AddressFieldListener());
@@ -116 +131 @@
     go_button.addActionListener(new GoButtonListener());
     home_button.addActionListener(new HomeButtonListener());
-    refresh_button.addActionListener(new RefreshButtonListener());
+    // refresh_button.addActionListener(new RefreshButtonListener());
     stop_button.addActionListener(new StopButtonListener());
+
     // Layout
     left_button_pane.setLayout(new GridLayout(1,3));
@@ -144 +160 @@
     add(status_label, BorderLayout.SOUTH);
     }
+
     /** Some actions, such as getting the HTML to render properly without throwing sixty bazillion NPE's, can only occur after the frame has been drawn to screen. To this end we have this method so we can action things -after- the frame draw.
      */
@@ -155 +172 @@
     public void collectionChanged(boolean ready) {
     // Reload the bookmarks associated with this collection.
-    if(ready) {
+    if (ready) {
         bookmarks.load();
     }
@@ -176 +193 @@
 
 
-    /** Retrieves a key from the Dictionary, using no extra arguments.
-     * @param key A <strong>String</strong> which maps to a certain phrase from the Dictionary.
-     * @return The <strong>String</strong> that matches the key or an error message if no match was found.
-     */
-    private String get(String key) {
-    return get(key, null);
-    }
-
-    /** Retrieves a key from the Dictionary, providing extra arguments to be inserted using a String array.
-     * @param key A <strong>String</strong> which maps to a certain phrase from the Dictionary.
-     * @param args A <strong>String[]</strong> containing further arguments (such as formatting instructions and variable values) to be taken into account when Dictionary creates the return String.
-     * @return The <strong>String</strong> that matches the key or an error message if no match was found.
-     */
-    private String get(String key, String args[]) {
-    if(key.indexOf('.') == -1) {
-        key = "Browser." + key;
-    }
-    return Gatherer.dictionary.get(key,args);
-    }
     /** Called to validate the status of the controls. Disables those that are no longer applicable or restores those that have come back into scope of usage.
      * @param update_address <i>true</i> if this pollControls call should update the address bar, <i>false</i> otherwise.
@@ -206 +204 @@
     implements ActionListener {
     public void actionPerformed(ActionEvent event) {
-                // Attempt to create a GURL
+        // Attempt to create a GURL
         GURL url = new GURL(address_field.getText());
         address_field.setText(url.getURL().toString());
@@ -357 +355 @@
         args = new String[1];
         args[0] = url.toString();
-        status_label.setText(get("Browser.Follow"));
+        Dictionary.setText(status_label, "Browser.Follow");
         args = null;
     }
@@ -377 +375 @@
         args = new String[1];
         args[0] = url.toString();
-        status_label.setText(get("Browser.Loading", args));
+        Dictionary.setText(status_label, "Browser.Loading", args);
         args = null;
         break;
@@ -398 +396 @@
         stop_button.setEnabled(false);
         // Rendering complete.
-        status_label.setText(get("Browser.Ready"));
+        Dictionary.setText(status_label, "Browser.Ready");
         go_button.setEnabled(true);
         stop_button.setEnabled(false);
-        refresh_button.setEnabled(true);
+        // refresh_button.setEnabled(true);
         // Update mirror pane
         Gatherer.g_man.mirror_pane.setURL(url.toString());

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

@@ -43 +43 @@
 import javax.swing.event.*;
 import javax.swing.tree.*;
+import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.file.FileNode;
@@ -134 +135 @@
 
     // Create components.
-    stop_action = new JButton(get("Collection.Stop"));
+    stop_action = new JButton();
     stop_action.addActionListener(this);
     stop_action.setEnabled(false);
-    stop_action.setToolTipText(get("Collection.Stop_Tooltip"));
-    
+    Dictionary.setBoth(stop_action, "Collection.Stop", "Collection.Stop_Tooltip");
+
     new_folder = new JButton(Utility.getImage("folder.gif"));
     new_folder.addActionListener(this);
@@ -144 +145 @@
     new_folder.setMinimumSize(MIN_SIZE);
     new_folder.setPreferredSize(MIN_SIZE);
-    new_folder.setToolTipText(get("Collection.New_Folder_Tooltip"));
-    }
+    Dictionary.setTooltip(new_folder, "Collection.New_Folder_Tooltip");
+    }
+
     /** Any implementation of ActionListener requires this method so that when an action is performed the appropriate effect can occur. In this case there are three valid possibilities. If the action occured on the recycle bin, then delete the current selection from the collection tree. If the action instead occured on the new folder button, then create a new folder under the current (single) selection in the collection tree. And finally if the cancel button was pressed, cancel the current, and remaining, jobs on the file queue. */
     public void actionPerformed(ActionEvent event) {
@@ -195 +197 @@
         FileNode node = (FileNode) collection_tree.getModel().getRoot();
         Gatherer.f_man.newFolder(collection_tree, node);
-        //JOptionPane.showMessageDialog(Gatherer.g_man, Gatherer.dictionary.get("FileActions.No_Parent_For_New_Folder"), Gatherer.dictionary.get("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);
         }
     }
@@ -203 +205 @@
     }
     /** Called whenever a significant change occurs in the current collections state, such as a new collection being loaded or the current one being closed. Several actions must occur in the GUI to indicate this change to the user, such as en/disabling the collection tree.
-      * @param ready <i>true</i> if a collection is loaded and ready to be modified, <i>false</i> otherwise.
-      * @see org.greenstone.gatherer.Configuration
-      * @see org.greenstone.gatherer.Gatherer
-      * @see org.greenstone.gatherer.collection.CollectionManager
-      * @see org.greenstone.gatherer.gui.Coloring
-      * @see org.greenstone.gatherer.gui.Filter
-      * @see org.greenstone.gatherer.util.TreeSynchronizer
-      */
+     * @param ready <i>true</i> if a collection is loaded and ready to be modified, <i>false</i> otherwise.
+     * @see org.greenstone.gatherer.Configuration
+     * @see org.greenstone.gatherer.Gatherer
+     * @see org.greenstone.gatherer.collection.CollectionManager
+     * @see org.greenstone.gatherer.gui.Coloring
+     * @see org.greenstone.gatherer.gui.Filter
+     * @see org.greenstone.gatherer.util.TreeSynchronizer
+     */
     public void collectionChanged(boolean ready) {
     // Try to retrieve the collections record set.
@@ -217 +219 @@
         args = new String[1];
         args[0] = Gatherer.c_man.getCollection().getName();
-        collection_label.setText(get("Collection", args));
+        Dictionary.setText(collection_label, "Collection.Collection", args);
         collection_tree.setModel(collection);
         collection_tree.repaint();
@@ -224 +226 @@
     else {
         String args[] = new String[1];
-        args[0] = get("Collection.No_Collection");
-        collection_label.setText(get("Collection", args));
+        args[0] = Dictionary.newget("Collection.No_Collection");
+        Dictionary.setText(collection_label, "Collection.Collection", args);
         args = null;
         collection_tree.setModel(new DefaultTreeModel(new DefaultMutableTreeNode("Error")));
@@ -232 +234 @@
     collection_tree.setEnabled(ready);
     collection_filter.setEnabled(ready);
+    Dictionary.setTooltip(collection_filter.getComboBox(), "Collection.Filter_Tooltip");
 
     // Change the label at the top of collection tree.
@@ -258 +261 @@
     workspace_pane.setSize(TREE_SIZE);
 
-    workspace_label = new JLabel(get("Collection.Workspace"));
+    workspace_label = new JLabel();
     workspace_label.setOpaque(true);
     workspace_label.setBackground(Gatherer.config.getColor("coloring.workspace_heading_background", false));
     workspace_label.setForeground(Gatherer.config.getColor("coloring.workspace_heading_foreground", false));
+    Dictionary.setText(workspace_label, "Collection.Workspace");
 
     workspace = Gatherer.c_man.getWorkspace();
@@ -289 +293 @@
     fcb.setBackgroundSelectionColor(Gatherer.config.getColor("coloring.collection_selection_background", false));
     fcb.setTextSelectionColor(Gatherer.config.getColor("coloring.collection_selection_foreground", false));
+    Dictionary.setTooltip(fcb, "Collection.Filter_Tooltip");
     fcb = null;
 
@@ -298 +303 @@
 
     args = new String[1];
-    args[0] = get("Collection.No_Collection");
-    collection_label = new JLabel(get("Collection", args));
+    args[0] = Dictionary.newget("Collection.No_Collection");
+    collection_label = new JLabel();
     collection_label.setOpaque(true);
+    Dictionary.setText(collection_label, "Collection.Collection", args);
 
     collection = Gatherer.c_man.getRecordSet();
@@ -369 +375 @@
     bin_button.setMinimumSize(MIN_SIZE);
     bin_button.setPreferredSize(MIN_SIZE);
-    bin_button.setToolTipText(get("Collection.Delete_Tooltip"));
+    Dictionary.setTooltip(bin_button, "Collection.Delete_Tooltip");
     group.add(bin_button);
 
@@ -498 +504 @@
     }
 
-    /** Retrieve a phrase from the dictionary based on the key.
-      * @param key A <strong>String</strong> used to uniquely identify the phrase to be retrieved.
-      */
-    private String get(String key) {
-    return get(key, null);
-    }
-    /** Retrieve a phrase from the dictionary based on the key, and filled in using text fragments from an arguments array.
-      * @param key A <strong>String</strong> used to uniquely identify the phrase to be retrieved.
-      * @param args A <strong>String[]</strong> used as parameters to be inserted in the phrase retrieved.
-      * @see org.greenstone.gatherer.Dictionary
-      * @see org.greenstone.gatherer.Gatherer
-      */
-    private String get(String key, String args[]) {
-    if(key.indexOf('.') == -1) {
-        key = "Collection." + key;
-    }
-    return Gatherer.dictionary.get(key, args);
-    }
+
     /** Used to set the enabled state, and hence the colouring, of the two tree labels.
       * @param label The <strong>JLabel</strong> to be affected.
@@ -563 +552 @@
         // Set Options based on selection and tree
         if(tree.getSelectionCount() != 0 && tree == collection_tree) {
-            show_metaaudit = new JMenuItem(get("Menu.Metadata_View") + " " + collection_tree.getSelectionDetails(), KeyEvent.VK_V);
+            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.addActionListener(this);
             add(show_metaaudit);
         }
         if(tree == collection_tree && node != null && node.getFile() != null && node.getFile().isDirectory() && !node.isReadOnly()) {
-            new_folder = new JMenuItem(get("CollectionPopupMenu.New_Folder"), KeyEvent.VK_N);
+            new_folder = new JMenuItem(Dictionary.newget("CollectionPopupMenu.New_Folder"), KeyEvent.VK_N);
             new_folder.addActionListener(this);
             add(new_folder);
@@ -574 +565 @@
         }
         if(node == null || (node != null && !node.isReadOnly())) {
-            delete = new JMenuItem(get("CollectionPopupMenu.Delete"), KeyEvent.VK_D);
+            delete = new JMenuItem(Dictionary.newget("CollectionPopupMenu.Delete"), KeyEvent.VK_D);
             delete.addActionListener(this);
             add(delete);
@@ -581 +572 @@
             String node_name = node.toString();
             FileNode root = (FileNode) tree.getModel().getRoot();
-            if(!node_name.equals(get("Tree.World")) && !node_name.equals(get("Tree.Root")) && !node_name.equals(get("Tree.Public")) && !node_name.equals(get("Tree.Private"))) {
+            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"))) {
             // You can unmap 1st level nodes.
             if(root.getIndex(node) != -1) {
-                unmap = new JMenuItem(get("MappingPrompt.Unmap"), KeyEvent.VK_U);
+                unmap = new JMenuItem(Dictionary.newget("MappingPrompt.Unmap"), KeyEvent.VK_U);
                 unmap.addActionListener(this);
                 add(unmap);
@@ -590 +581 @@
             // Or map any other level directories.
             else {
-                map = new JMenuItem(get("MappingPrompt.Map"), KeyEvent.VK_M);
+                map = new JMenuItem(Dictionary.newget("MappingPrompt.Map"), KeyEvent.VK_M);
                 map.addActionListener(this);
                 add(map);
@@ -639 +630 @@
         }
     }
-    /** Retrieve a phrase from the dictionary based on the key.
-            * @param key A <strong>String</strong> used to uniquely identify the phrase to be retrieved.
-            */
-    private String get(String key) {
-        return get(key, null);
-    }
-    /** Retrieve a phrase from the dictionary based on the key, and filled in using text fragments from an arguments array.
-            * @param key A <strong>String</strong> used to uniquely identify the phrase to be retrieved.
-            * @param args A <strong>String[]</strong> used as parameters to be inserted in the phrase retrieved.
-            * @see org.greenstone.gatherer.Dictionary
-            * @see org.greenstone.gatherer.Gatherer
-            */
-    private String get(String key, String args[]) {
-        if(key.indexOf('.') == -1) {
-        key = "CollectionPopupMenu." + key;
-        }
-        return Gatherer.dictionary.get(key, args);
-    }
-    }
+    }
+
     /** This class listens for certain key presses, such as [Enter] or [Delete], and responds appropriately. */
     private class KeyListenerImpl
@@ -715 +689 @@
         setModal(true);
         setSize(DIALOG_SIZE);
-        setTitle(get("MappingPrompt.Title"));
-                // Creation
+        Dictionary.setText(this, "MappingPrompt.Title");
+
+        // Creation
         JPanel content_pane = (JPanel) getContentPane();
         JPanel center_pane = new JPanel();
         JPanel file_pane = new JPanel();
-        JLabel file_label = new JLabel(get("MappingPrompt.File"));
+        JLabel file_label = new JLabel();
         file_label.setPreferredSize(LABEL_SIZE);
+        Dictionary.setText(file_label, "MappingPrompt.File");
         JLabel file_field = new JLabel(file.getAbsolutePath());
         JPanel name_pane = new JPanel();
-        JLabel name_label = new JLabel(get("MappingPrompt.Name"));
+        JLabel name_label = new JLabel();
         name_label.setPreferredSize(LABEL_SIZE);
+        Dictionary.setText(name_label, "MappingPrompt.Name");
         name_field = new JTextField(file.getName());
         JPanel button_pane = new JPanel();
-        ok_button = new JButton(get("General.OK"));
+        ok_button = new JButton();
         ok_button.setEnabled(name_field.getText().length() > 0);
-        cancel_button = new JButton(get("General.Cancel"));
-                // Connection
+        Dictionary.setBoth(ok_button, "General.OK", "General.OK_Tooltip");
+        cancel_button = new JButton();
+        Dictionary.setBoth(cancel_button, "General.Cancel", "General.Cancel_Tooltip");
+
+        // Connection
         cancel_button.addActionListener(this);
         ok_button.addActionListener(this);
         name_field.addKeyListener(this);
-                // Layout
+        // Layout
         file_pane.setLayout(new BorderLayout());
         file_pane.add(file_label, BorderLayout.WEST);
@@ -757 +737 @@
         content_pane.add(center_pane, BorderLayout.CENTER);
         content_pane.add(button_pane, BorderLayout.SOUTH);
-                // Display
+        // Display
         Dimension screen_size = Gatherer.config.screen_size;
         setLocation((screen_size.width - DIALOG_SIZE.width) / 2, (screen_size.height - DIALOG_SIZE.height) / 2);
         show();
-                // If not cancelled create mapping.
+        // If not cancelled create mapping.
         if(!cancelled) {
         Gatherer.c_man.addDirectoryMapping(name_field.getText(), file);

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

@@ -75 +75 @@
 import org.greenstone.gatherer.msm.ElementWrapper;
 import org.greenstone.gatherer.msm.Metadata;
-import org.greenstone.gatherer.sarm.SearchAndReplace;
+// import org.greenstone.gatherer.sarm.SearchAndReplace;
 import org.greenstone.gatherer.shell.GShell;
 import org.greenstone.gatherer.util.TreeSynchronizer;
@@ -124 +124 @@
     private JTabbedPane tab_pane = null;
     /** A reference to any existing search and replace module/dialog. */
-    private SearchAndReplace sar = null;
+    // private SearchAndReplace sar = null;
     /** A threaded tab changer to try and avoid NPE on exit. */
     private TabUpdater tab_updater = null;
@@ -251 +251 @@
         }
     }
-    else if(esrc == menu_bar.edit_search) {
-        if(sar != null) {
-        sar.dispose();
-        }
-        sar = new SearchAndReplace(false);
-    }
-    else if(esrc == menu_bar.edit_replace) {
-        if(sar != null) {
-        sar.dispose();
-        }
-        sar = new SearchAndReplace(true);
-    }
+//      else if(esrc == menu_bar.edit_search) {
+//          if(sar != null) {
+//          sar.dispose();
+//          }
+//          sar = new SearchAndReplace(false);
+//      }
+//      else if(esrc == menu_bar.edit_replace) {
+//          if(sar != null) {
+//          sar.dispose();
+//          }
+//          sar = new SearchAndReplace(true);
+//      }
     // *************
     // Tools Options.

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

@@ -45 +45 @@
 import javax.swing.table.*;
 import javax.swing.tree.*;
+import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.file.FileNode;
@@ -138 +139 @@
     this.tree_sync = tree_sync;
 
-    add = new JButton("MetaEdit.Accumulate");
+    add = new JButton();
     add.addActionListener(this);
     add.setEnabled(false);
     add.setMnemonic(KeyEvent.VK_A);
     add.setPreferredSize(BUTTON_SIZE);
-
-    update = new JButton("MetaEdit.Overwrite");
+    Dictionary.setBoth(add, "MetaEdit.Accumulate", "MetaEdit.Accumulate_Tooltip");
+
+    update = new JButton();
     update.addActionListener(this);
     update.setEnabled(false);
     update.setMnemonic(KeyEvent.VK_P);
     update.setPreferredSize(BUTTON_SIZE);
-
-    remove = new JButton("MetaEdit.Remove");
+    Dictionary.setBoth(update, "MetaEdit.Overwrite", "MetaEdit.Overwrite_Tooltip");
+
+    remove = new JButton();
     remove.addActionListener(this);
     remove.setEnabled(false);
     remove.setMnemonic(KeyEvent.VK_R);
     remove.setPreferredSize(BUTTON_SIZE);
-
-    expand = new JButton("MetaEdit.Expand");
+    Dictionary.setBoth(remove, "MetaEdit.Remove", "MetaEdit.Remove_Tooltip");
+
+    expand = new JButton();
     expand.addActionListener(this);
     expand.setEnabled(true);
     expand.setMnemonic(KeyEvent.VK_E);
     expand.setPreferredSize(new Dimension(25, 25));
+    Dictionary.setBoth(expand, "MetaEdit.Expand", "MetaEdit.Expand_Tooltip");
 
     tree = new GValueTree(CONTROL_SIZE.width, CONTROL_SIZE.height);
-
-    // Dictionary registration
-    Gatherer.dictionary.register(add, null, false);
-    Gatherer.dictionary.register(update, null, false);
-    Gatherer.dictionary.register(remove, null, false);
-    Gatherer.dictionary.register(expand, null, false);
     }
 
@@ -302 +301 @@
         String[] args = new String[1];
         args[0] = Gatherer.c_man.getCollection().getName();
-        collection_label.setText(get("Collection.Collection", args));
+        Dictionary.setText(collection_label, "Collection.Collection", args);
         // Update label coloring.
         collection_label.setBackground(Gatherer.config.getColor("coloring.collection_heading_background", false));
@@ -321 +320 @@
     }
     else {
-        collection_label.setText(get("Collection.No_Collection"));
+        Dictionary.setText(collection_label, "Collection.No_Collection");
         collection_label.setBackground(Color.lightGray);
         collection_label.setForeground(Color.black);
-        collection_tree.setModel(new DefaultTreeModel(new DefaultMutableTreeNode(get("Collection.No_Collection"))));
+        collection_tree.setModel(new DefaultTreeModel(new DefaultMutableTreeNode(Dictionary.newget("Collection.No_Collection"))));
     }
 
@@ -353 +352 @@
 
     ///atherer.println("\tCreating collection_label");
-    collection_label = new JLabel(get("Collection.Collection"));
+    collection_label = new JLabel();
+    Dictionary.setText(collection_label, "Collection.Collection");
     collection_label.setOpaque(true);
-
 
     DragGroup group = new DragGroup();
@@ -385 +384 @@
     fcb.setBackgroundSelectionColor(Gatherer.config.getColor("coloring.collection_selection_background", false));
     fcb.setTextSelectionColor(Gatherer.config.getColor("coloring.collection_selection_foreground", false));
+    Dictionary.setTooltip(fcb, "Collection.Filter_Tooltip");
     fcb = null;
 
@@ -416 +416 @@
     JPanel table_title_pane = new JPanel();
 
-    table_label = new JTextField("MetaEdit.No_File");
+    table_label = new JTextField();
     table_label.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
     table_label.setEditable(false);
+    Dictionary.setText(table_label, "MetaEdit.No_File");
 
     card_layout = new CardLayout();
@@ -430 +431 @@
     table_pane_two.setOpaque(false);
 
-    JLabel no_file_message = new JLabel("MetaEdit.No_File");
+    JLabel no_file_message = new JLabel();
     no_file_message.setHorizontalAlignment(JLabel.CENTER);
     no_file_message.setOpaque(false);
     no_file_message.setVerticalAlignment(JLabel.CENTER);
-
-    JLabel no_metadata_message = new JLabel("MetaEdit.No_Metadata");
+    Dictionary.setText(no_file_message, "MetaEdit.No_File");
+
+    JLabel no_metadata_message = new JLabel();
     no_metadata_message.setHorizontalAlignment(JLabel.CENTER);
     no_metadata_message.setOpaque(false);
     no_metadata_message.setVerticalAlignment(JLabel.CENTER);
+    Dictionary.setText(no_metadata_message, "MetaEdit.No_Metadata");
 
     JPanel table_pane_one = new JPanel();
@@ -483 +486 @@
     JPanel tools_off_pane = new JPanel();
 
-    JLabel tools_off_label = new JLabel("MetaEdit.No_Metadata_Element");
+    JLabel tools_off_label = new JLabel();
     tools_off_label.setHorizontalAlignment(JLabel.CENTER);
     tools_off_label.setOpaque(false);
     tools_off_label.setVerticalAlignment(JLabel.CENTER);
+    Dictionary.setText(tools_off_label, "MetaEdit.No_Metadata_Element");
 
     JPanel tools_on_pane = new JPanel();
@@ -538 +542 @@
     this.setLayout(new BorderLayout());
     this.add(external_split, BorderLayout.CENTER);
-
-    // Dictionary registration
-    Gatherer.dictionary.register(table_label, null, false);
-    Gatherer.dictionary.register(no_file_message, null, false);
-    Gatherer.dictionary.register(no_metadata_message, null, false);
-    Gatherer.dictionary.register(tools_off_label, null, false);
     }
 
@@ -742 +740 @@
     else {
         records = null;
-        table_label.setText(get("MetaEdit.No_File"));
+        Dictionary.setText(table_label, "MetaEdit.No_File");
+
         // Remove old model from msm
         if(Gatherer.c_man.ready()) {
@@ -771 +770 @@
     table.doLayout();
     validateControls();
-    }
-
-
-    /** Retrieve a phrase from the Dictionary based on the given key.
-     * @param key The <strong>String</strong> which maps to the phrase to retrieve.
-     * @return The desired phrase as a <strong>String</strong>, or possibly an error message if no such phrase exists.
-     */
-    private String get(String key) {
-    return get(key, null);
-    }
-    /** Retrieve a phrase from the Dictionary based on the given key and filled in with the given arguments.
-     * @param key The <strong>String</strong> which maps to the phrase to retrieve.
-     * @param args A <strong>String[]</strong> of arguments to be inserted in the phrase.
-     * @return The desired phrase as a <strong>String</strong>, or possibly an error message if no such phrase exists.
-     * @see org.greenstone.gatherer.Dictionary
-     * @see org.greenstone.gatherer.Gatherer
-     */
-    private String get(String key, String args[]) {
-    if(key.indexOf('.') == -1) {
-        key = "MetaEdit." + key;
-    }
-    return Gatherer.dictionary.get(key,args);
     }
 
@@ -950 +927 @@
         super();
         // Creation
-        JMenuItem show_metaaudit = new JMenuItem(get("Menu.Metadata_View") + " " + collection_tree.getSelectionDetails(), KeyEvent.VK_V);
+        String[] args = new String[1];
+        args[0] = collection_tree.getSelectionDetails();
+        JMenuItem show_metaaudit = new JMenuItem(Dictionary.newget("Menu.Metadata_View", args), KeyEvent.VK_V);
         show_metaaudit.addActionListener(this);
         add(show_metaaudit);
@@ -1096 +1075 @@
         this.add(extracted_pane, NONE);
         card_showing = TREE;
-
-        // Dictionary registration
-        Gatherer.dictionary.register(value_label, null, false);
-        Gatherer.dictionary.register(value, null, false);
-        Gatherer.dictionary.register(tree_label, null, false);
     }
 
@@ -1154 +1128 @@
         String[] args = new String[1];
         args[0] = selected_metadata_element.toString();
-        extracted_message.setText(get("MetaEdit.AutoMessage", args));
+        Dictionary.setText(extracted_message, "MetaEdit.AutoMessage", args);
         card_layout.show(this, NONE);
         card_showing = NONE;
@@ -1189 +1163 @@
         manual_text_edit_event = true;
         }
-    }
-
-
-    private String get(String key, String args[]) {
-        return Gatherer.dictionary.get(key, args);
     }
 

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

@@ -52 +52 @@
     private JButton update;
     private JButton update_all;
+
     static private Dimension LABEL_SIZE = new Dimension(100, 25);
     static private Dimension SIZE = new Dimension(712, 250);
@@ -117 +118 @@
     JPanel buttons_pane = new JPanel();
 
-    accumulate = new JButton("MetaEditPrompt.Accumulate");
+    accumulate = new JButton("MetaEdit.Accumulate");
     accumulate.setEnabled(type == ADD_PROMPT);
     accumulate.setMnemonic(KeyEvent.VK_A);
@@ -125 +126 @@
     accumulate_all.setMnemonic(KeyEvent.VK_L);
 
-    overwrite = new JButton("MetaEditPrompt.Overwrite");
+    overwrite = new JButton("MetaEdit.Overwrite");
     overwrite.setEnabled(type == UPDATE_PROMPT);
     overwrite.setMnemonic(KeyEvent.VK_R);
@@ -133 +134 @@
     overwrite_all.setMnemonic(KeyEvent.VK_P);
 
-    remove = new JButton("MetaEditPrompt.Remove");
+    remove = new JButton("MetaEdit.Remove");
     remove.setEnabled(type == REMOVE_PROMPT);
     remove.setMnemonic(KeyEvent.VK_R);
@@ -145 +146 @@
     skip.setMnemonic(KeyEvent.VK_S);
 
-    cancel = new JButton("MetaEditPrompt.Cancel");
+    cancel = new JButton("General.Cancel");
     cancel.setMnemonic(KeyEvent.VK_C);
 
@@ -185 +186 @@
 
     buttons_pane.setBorder(BorderFactory.createEmptyBorder(2,2,2,2));
-    buttons_pane.setLayout(new GridLayout(2,4,0,0));
-    buttons_pane.add(accumulate);
-    buttons_pane.add(overwrite);
-    buttons_pane.add(remove);
-    buttons_pane.add(skip);
-    buttons_pane.add(accumulate_all);
-    buttons_pane.add(overwrite_all);
-    buttons_pane.add(remove_all);
-    buttons_pane.add(cancel);
+    buttons_pane.setLayout(new GridLayout(1,4,0,0));
+
+    if (type.equals(ADD_PROMPT)) {
+        buttons_pane.add(accumulate);
+        buttons_pane.add(accumulate_all);
+    }
+    else if (type.equals(UPDATE_PROMPT)) {
+        buttons_pane.add(overwrite);
+        buttons_pane.add(overwrite_all);
+    }
+    else if (type.equals(REMOVE_PROMPT)) {
+        buttons_pane.add(remove);
+        buttons_pane.add(remove_all);
+    }
+    buttons_pane.add(skip);
+    buttons_pane.add(cancel);
 
     content_pane.setBorder(BorderFactory.createEmptyBorder(3,3,3,3));

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

@@ -43 +43 @@
 import javax.swing.event.*;
 import javax.swing.tree.*;
+import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
-import org.greenstone.gatherer.Message;
 import org.greenstone.gatherer.WGet;
-import org.greenstone.gatherer.file.FileSystemModel;
-import org.greenstone.gatherer.gui.Filter;
-import org.greenstone.gatherer.gui.GComboBox;
-import org.greenstone.gatherer.gui.tree.DragTree;
-import org.greenstone.gatherer.util.DragGroup;
-import org.greenstone.gatherer.util.GURL;
-import org.greenstone.gatherer.util.TreeSynchronizer;
 import org.greenstone.gatherer.util.Utility;
 /**
@@ -72 +65 @@
     private JTextField url_textfield = null;
     private WGet getter = null;
+
     public MirrorPane() {
     super();
@@ -85 +79 @@
 
     JPanel url_pane = new JPanel();
-    JLabel url_label = new JLabel(Gatherer.dictionary.get("Mirroring.Source_URL"));
+    JLabel url_label = new JLabel();
     url_label.setPreferredSize(Utility.LABEL_SIZE);
+    Dictionary.setText(url_label, "Mirroring.Source_URL");
     url_textfield = new JTextField();
+    Dictionary.setTooltip(url_textfield, "Mirroring.Source_URL_Tooltip");
 
     JPanel depth_pane = new JPanel();
-    JLabel depth_label = new JLabel(Gatherer.dictionary.get("Mirroring.Download_Depth"));
+    JLabel depth_label = new JLabel();
+    Dictionary.setText(depth_label, "Mirroring.Download_Depth");
     depth_spinner = new JSpinner();
+    Dictionary.setTooltip(depth_spinner, "Mirroring.Download_Depth_Tooltip");
 
     JPanel destination_pane = new JPanel();
-    JLabel destination_label = new JLabel(Gatherer.dictionary.get("Mirroring.Destination_Folder"));
+    JLabel destination_label = new JLabel();
+    Dictionary.setText(destination_label, "Mirroring.Destination_Folder");
     ButtonGroup group = new ButtonGroup();
-    public_radiobutton = new JRadioButton(Gatherer.dictionary.get("Tree.Public"));
-    private_radiobutton = new JRadioButton(Gatherer.dictionary.get("Tree.Private"));
+    public_radiobutton = new JRadioButton();
+    public_radiobutton.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+    public_radiobutton.setOpaque(false);
+    Dictionary.setText(public_radiobutton, "Tree.Public");
+    private_radiobutton = new JRadioButton();
+    private_radiobutton.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
+    private_radiobutton.setOpaque(false);
+    Dictionary.setText(private_radiobutton, "Tree.Private");
     group.add(public_radiobutton);
     group.add(private_radiobutton);
@@ -103 +108 @@
 
     JPanel first_pane = new JPanel();
-    automatic_checkbox = new JCheckBox(Gatherer.dictionary.get("Mirroring.Download_Hidden"));
-    overwrite_checkbox = new JCheckBox(Gatherer.dictionary.get("Mirroring.Overwrite_Existing"));
+    automatic_checkbox = new JCheckBox();
+    Dictionary.setText(automatic_checkbox, "Mirroring.Download_Hidden");
+    overwrite_checkbox = new JCheckBox();
+    Dictionary.setText(overwrite_checkbox, "Mirroring.Overwrite_Existing");
 
     JPanel second_pane = new JPanel();
-    higher_checkbox = new JCheckBox(Gatherer.dictionary.get("Mirroring.Higher_Directories"));
-    same_host_checkbox = new JCheckBox(Gatherer.dictionary.get("Mirroring.Same_Host"));
-
-    remove_failed_checkbox = new JCheckBox(Gatherer.dictionary.get("Mirroring.Remove_Failed"));
-    JLabel further_label = new JLabel(Gatherer.dictionary.get("Mirroring.Further_Options"));
-    
+    higher_checkbox = new JCheckBox();
+    Dictionary.setText(higher_checkbox, "Mirroring.Higher_Directories");
+    same_host_checkbox = new JCheckBox();
+    Dictionary.setText(same_host_checkbox, "Mirroring.Same_Host");
+
+    remove_failed_checkbox = new JCheckBox();
+    Dictionary.setText(remove_failed_checkbox, "Mirroring.Remove_Failed");
+
+    JLabel further_label = new JLabel();
+    Dictionary.setText(further_label, "Mirroring.Further_Options");
+
     JPanel button_pane = new JPanel();
-    download_button = new JButton(Gatherer.dictionary.get("Mirroring.Download"));
+    download_button = new JButton();
+    Dictionary.setBoth(download_button, "Mirroring.Download", "Mirroring.Download_Tooltip");
 
     // Connect
@@ -156 +169 @@
     button_pane.add(download_button);
 
-    edit_pane.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createEmptyBorder(2,0,0,0), BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(Gatherer.dictionary.get("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.newget("Mirroring.Download_Controls")), BorderFactory.createEmptyBorder(2,2,2,2))));
     edit_pane.setLayout(new BorderLayout());
     edit_pane.add(details_pane, BorderLayout.CENTER);
@@ -182 +195 @@
 
     public void actionPerformed(ActionEvent event) {
-        // Retrieve the current url and confirm its valid
+        // Retrieve the current url and confirm it is valid
         String url_str = url_textfield.getText();
         URL url = null;
@@ -189 +202 @@
         }
         catch(MalformedURLException error) {
-        JOptionPane.showMessageDialog(Gatherer.g_man, Gatherer.dictionary.get("Mirroring.Invalid_URL"), Gatherer.dictionary.get("Mirroring.Invalid_URL__Title"), JOptionPane.ERROR_MESSAGE);
+        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("Mirroring.Invalid_URL"), Dictionary.newget("Mirroring.Invalid_URL__Title"), JOptionPane.ERROR_MESSAGE);
         }
         if(url != null) {