Changeset 5536

Timestamp:

2003-09-26T14:58:33+12:00 (21 years ago)

Author:

mdewsnip

Message:

Many more tooltips and improvements to the Dictionary. Still more to come.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• Dictionary.java (modified) (22 diffs)
• GAuthenticator.java (modified) (9 diffs)
• cdm/GeneralManager.java (modified) (9 diffs)
• cdm/IndexManager.java (modified) (27 diffs)
• cdm/PlugInManager.java (modified) (18 diffs)
• cdm/SearchTypeManager.java (modified) (9 diffs)
• collection/DeleteCollectionPrompt.java (modified) (16 diffs)
• collection/SaveCollectionBox.java (modified) (3 diffs)
• file/FileQueue.java (modified) (2 diffs)
• gui/BrowsingPane.java (modified) (9 diffs)
• gui/CollectionPane.java (modified) (12 diffs)
• gui/CreatePane.java (modified) (16 diffs)
• gui/GUIManager.java (modified) (3 diffs)
• gui/LockFileDialog.java (modified) (2 diffs)
• gui/MetaEditPane.java (modified) (14 diffs)
• gui/MetaEditPrompt.java (modified) (5 diffs)
• gui/MirrorPane.java (modified) (5 diffs)
• gui/NewCollectionDetailsPrompt.java (modified) (13 diffs)
• gui/OpenCollectionDialog.java (modified) (15 diffs)
• gui/OptionsPane.java (modified) (14 diffs)
• gui/Preferences.java (modified) (11 diffs)

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

@@ -1 @@
-package org.greenstone.gatherer;
 /**
  *#########################################################################
@@ -36 +35 @@
  *########################################################################
  */
+package org.greenstone.gatherer;
+
 import java.awt.Component;
 import java.io.*;
@@ -43 +44 @@
 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;
-import org.greenstone.gatherer.util.MutableComboBoxEntry;
-import org.greenstone.gatherer.util.ArrayTools;
 import org.greenstone.gatherer.util.Utility;
+
 /** Extends the ResourceBundle class to allow for the automatic insertion of  arguments. Note that the key names beginning Farg are reserved for formatting. <BR>
  * <BR>
@@ -91 +88 @@
     /**  Constructs the Dictionary class by first checking if a Locale has been set. If not the default locale is used, and a ResourceBundle is created. Finally a single important String, Language, is made available outside the class so a more read-able version of the Locale of this Dictionary is present.
      * @param locale The <strong>Locale</strong> used to load the desired dictionary resource bundle.
-      */
+     */
     public Dictionary(Locale locale, FontUIResource font) {
     super();
     this.self = this;
 
-    if(KEY_LIST_DEBUG) {
+    if (KEY_LIST_DEBUG) {
         // Reload the keylist
         File file = new File(KEY_LIST_FILENAME);
@@ -116 +113 @@
     // Initialize.
     this.font = font;
-    if(locale == null) {
+    if (locale == null) {
         this.locale = Locale.getDefault();
     }
@@ -127 +124 @@
     language = dictionary.getString("Language");
     }
-    /** Change the currently loaded dictionary and update registered (ie dynamic) components as possible. */
-    public void changeDictionary(Locale locale) {
+
+
+    /** Change the currently loaded dictionary and update registered components */
+    public void changeDictionary(Locale locale)
+    {
     this.locale = locale;
+
     // Load new dictionary
     dictionary = ResourceBundle.getBundle(Utility.DICTIONARY, locale);
     language = dictionary.getString("Language");
-    Gatherer.println("Having loaded new dictionary: " + language);
+    Gatherer.println("Loaded new dictionary: " + language);
+
     // Refresh all registered component
-    Gatherer.println("Updating components");
-    for(Iterator keys = keySet().iterator(); keys.hasNext(); ) {
-        Object component = keys.next();
-        String[] args = (String[]) get(component);
-        if(component instanceof AbstractButton) {
-        register((AbstractButton)component, args, true);
-        }
-        else if(component instanceof JComboBox) {
-        register((JComboBox)component, args, true);
-        }
-        else if(component instanceof JDialog) {
-        register((JDialog)component, args, true);
-        }
-        else if(component instanceof JFrame) {
-        register((JFrame)component, args, true);
-        }
-        else if(component instanceof JLabel) {
-        register((JLabel)component, args, true);
-        }
-        else if(component instanceof JTabbedPane) {
-        register((JTabbedPane)component, args, true);
-        }
-        else if(component instanceof JTextComponent) {
-        register((JTextComponent)component, args, true);
-        }
-        else if(component instanceof JTree) {
-        register((JTree)component, args, true);
-        }
-        else if(component instanceof TitledBorder) {
-        register((TitledBorder)component, args, true);
-        }
-        args = null;
-        component = null;
-    }
-    }
+    // !! TO FINISH !!
+    Gatherer.println("Updating components...");
+//      ArrayList temp_list = new ArrayList();
+//      Iterator components = keySet().iterator();
+//      while (components.hasNext()) {
+//          Component component = (Component) components.next();
+//          temp_list.add(component);
+//      }
+
+//      for (int i = 0; i < temp_list.size(); i++) {
+//          Component component = (Component) temp_list.get(i);
+//          ComponentDetails details = (ComponentDetails) get(component);
+//          oldSetBoth(component, details.text_key, details.text_args, details.tooltip_key);
+//      }
+
+//      for (Iterator keys = keySet().iterator(); keys.hasNext(); ) {
+//          Component component = (Component) keys.next();
+//          ComponentDetails details = (ComponentDetails) get(component);
+//          oldSetBoth(component, details.text_key, details.text_args, details.tooltip_key);
+//      }
+    }
+
+
+    /** Change the currently loaded dictionary and update registered (ie dynamic) components as possible. */
+//      public void oldChangeDictionary(Locale locale) {
+//      this.locale = locale;
+//      // Load new dictionary
+//      dictionary = ResourceBundle.getBundle(Utility.DICTIONARY, locale);
+//      language = dictionary.getString("Language");
+//      Gatherer.println("Having loaded new dictionary: " + language);
+//      // Refresh all registered component
+//      Gatherer.println("Updating components");
+//      for(Iterator keys = keySet().iterator(); keys.hasNext(); ) {
+//          Object component = keys.next();
+//          String[] args = (String[]) get(component);
+//          if(component instanceof AbstractButton) {
+//          register((AbstractButton)component, args, true);
+//          }
+//          else if(component instanceof JComboBox) {
+//          register((JComboBox)component, args, true);
+//          }
+//          else if(component instanceof JDialog) {
+//          register((JDialog)component, args, true);
+//          }
+//          else if(component instanceof JFrame) {
+//          register((JFrame)component, args, true);
+//          }
+//          else if(component instanceof JLabel) {
+//          register((JLabel)component, args, true);
+//          }
+//          else if(component instanceof JTabbedPane) {
+//          register((JTabbedPane)component, args, true);
+//          }
+//          else if(component instanceof JTextComponent) {
+//          register((JTextComponent)component, args, true);
+//          }
+//          else if(component instanceof JTree) {
+//          register((JTree)component, args, true);
+//          }
+//          else if(component instanceof TitledBorder) {
+//          register((TitledBorder)component, args, true);
+//          }
+//          args = null;
+//          component = null;
+//      }
+//      }
+
     /** Remove the component from our registered components list. */
     public void deregister(Object component) {
@@ -207 +241 @@
 
 
-    /** Overloaded to call get with both a key and an empty argument array.
+    /**
+     * @deprecated
+     * 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.
@@ -214 +250 @@
     return get(key, (String[])null);
     }
-    /** Convienence method with transforms the second string argument into a string array. */
+    /**
+     * @deprecated
+     * Convienence method with transforms the second string argument into a string array. */
     public String get(String key, String arg) {
     String[] args = new String[1];
@@ -220 +258 @@
     return get(key, args);
     }
+
     /** 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.
-      */
+     * 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.
+     */
     public String get(String key, String args[]) {
     if(key_list != null) {
@@ -269 +308 @@
     }
     catch (Exception e) {
-        // if(!key.endsWith("_Tooltip")) {
-        System.err.println("Missing value for key: " + key);
-        // }
-        //e.printStackTrace();
+        System.err.println("Missing value for key: " + key);
         return key;
     }
@@ -287 +323 @@
     static public void setBoth(Component component, String text_key, String tooltip_key)
     {
-    self.oldSetBoth(component, text_key, null, tooltip_key);
+    setText(component, text_key);
+    setTooltip(component, tooltip_key);
     }
 
@@ -293 +330 @@
     static public void setText(Component component, String text_key)
     {
-    self.oldSetText(component, text_key, null);
+    setText(component, text_key, null);
     }
 
@@ -299 +336 @@
     static public void setText(Component component, String text_key, String[] args)
     {
-    self.oldSetText(component, text_key, args);
+    if (component != null) {
+        // Update the component using the AWTEvent queue
+        ComponentDetails details = new ComponentDetails(true, text_key, args, false, null);
+        ComponentUpdateTask task = new ComponentUpdateTask(component, details);
+        SwingUtilities.invokeLater(task);
+    }
     }
 
@@ -305 +347 @@
     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 using the AWTEvent queue
+        ComponentDetails details = new ComponentDetails(false, null, null, true, tooltip_key);
+        ComponentUpdateTask task = new ComponentUpdateTask(component, details);
+        SwingUtilities.invokeLater(task);
+    }
+    }
+
+
+    static public void registerBoth(Component component, String text_key, String tooltip_key)
+    {
+    registerText(component, text_key, null);
+    registerTooltip(component, tooltip_key);
+    }
+
+
+    static public void registerText(Component component, String text_key)
+    {
+    registerText(component, text_key, null);
+    }
+
+
+    static public void registerText(Component component, String text_key, String[] args)
     {
     if (component != null) {
         // Update the component's details
-        ComponentDetails details = (ComponentDetails) remove(component);
+        ComponentDetails details = (ComponentDetails) self.remove(component);
         if (details == null) {
         details = new ComponentDetails(true, text_key, args, false, null);
@@ -329 +382 @@
         details.text_args = args;
         }
-        put(component, details);
+        self.put(component, details);
 
         // Update the component using the AWTEvent queue
-        RegisteredComponentUpdateTask task = new RegisteredComponentUpdateTask(component);
+        ComponentUpdateTask task = new ComponentUpdateTask(component, details);
         SwingUtilities.invokeLater(task);
     }
@@ -338 +391 @@
 
 
-    private void oldSetTooltip(Component component, String tooltip_key)
+    static public void registerTooltip(Component component, String tooltip_key)
     {
     if (component != null) {
         // Update the component's details
-        ComponentDetails details = (ComponentDetails) remove(component);
+        ComponentDetails details = (ComponentDetails) self.remove(component);
         if (details == null) {
         details = new ComponentDetails(false, null, null, true, tooltip_key);
@@ -350 +403 @@
         details.tooltip_key = tooltip_key;
         }
-        put(component, details);
+        self.put(component, details);
 
         // Update the component using the AWTEvent queue
-        RegisteredComponentUpdateTask task = new RegisteredComponentUpdateTask(component);
+        ComponentUpdateTask task = new ComponentUpdateTask(component, details);
         SwingUtilities.invokeLater(task);
     }
@@ -359 +412 @@
 
 
-    private class ComponentDetails
+    static private class ComponentDetails
     {
     public boolean has_text;
@@ -379 +432 @@
 
 
-    private class RegisteredComponentUpdateTask
+    static private class ComponentUpdateTask
     implements Runnable {
 
     private Component component;
-    private ComponentDetails details;
     private String text = null;
     private String tooltip = null;
 
-    public RegisteredComponentUpdateTask(Component component)
+    public ComponentUpdateTask(Component component, ComponentDetails details)
     {
         this.component = component;
-        this.details = (ComponentDetails) get(component);
 
         if (details.has_text) {
-        text = get(details.text_key, details.text_args);
+        text = self.get(details.text_key, details.text_args);
         }
         if (details.has_tooltip) {
-        tooltip = get(details.tooltip_key, (String[]) null);
+        tooltip = self.get(details.tooltip_key, (String[]) null);
         }
     }
@@ -416 +467 @@
         else if (component instanceof JTextComponent) {
             ((JTextComponent) component).setText(text);
+            ((JTextComponent) component).setCaretPosition(0);
         }
         else {
@@ -434 +486 @@
     /**
      * @deprecated
-     * Register an abstract button component */
-    public void register(AbstractButton component, String[] args, boolean already_registered)
+     * Register a tab pane component. */
+    static public void register(JTabbedPane component)
     {
     if(component != null) {
-        // Determine the key
-        String key = "";
-        if(!already_registered) {
-        key = component.getText();
-        }
-        else {
-        key = args[args.length - 1];
-        }
-        // Update the component using the AWTEvent queue
-        String value = get(key, args);
-        String tooltip = get(key + "_Tooltip", (String[])null);
-        ChangeTask task = new AbstractButtonChangeTask(component, key, value, tooltip);
-        SwingUtilities.invokeLater(task);
-        // Register as necessary
-        if(!already_registered) {
-        args = ArrayTools.add(args, key);
-        put(component, args);
-        }
-    }
-    }
-
-    /**
-     * @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) {
-        // If not already registered then args will be null.
-        if(!already_registered) {
-        args = new String[component.getItemCount()];
-        }
-        // Retrieve the tooltip. The key is mostly derived from the comboboxes name.
-        String key = component.getName();
-        String tooltip = get(key + "_Tooltip", (String[])null);
-        ChangeTask task = new JComboBoxChangeTask(component, key, -1, tooltip);
-        SwingUtilities.invokeLater(task);
-        // Iterate through the combobox, updating values and recording the original key of each item in args.
-        for(int i = 0; i < args.length; i++) {
-        if(args[i] == null) {
-            args[i] = component.getItemAt(i).toString();
-        }
-        String value = get(args[i], (String[])null);
-        task = new JComboBoxChangeTask(component, key, i, value);
-        SwingUtilities.invokeLater(task);
-        }
-        // Register if necessary
-        if(!already_registered) {
-        put(component, args);
-        }
-    }
-    }
-
-    /**
-     * @deprecated
-     * Register a dialog component. */
-    public void register(JDialog component, String[] args, boolean already_registered) {
-    if(component != null) {
-        // Determine the key
-        String key = "";
-        if(!already_registered) {
-        key = component.getTitle();
-        }
-        else {
-        key = args[args.length - 1];
-        }
-        // Update the component using the AWTEvent queue
-        String value = get(key, args);
-        ChangeTask task = new JDialogChangeTask(component, key, value);
-        SwingUtilities.invokeLater(task);
-        // Register as necessary
-        if(!already_registered) {
-        args = ArrayTools.add(args, key);
-        put(component, args);
-        }
-    }
-    }
-
-    /**
-     * @deprecated
-     * Register a frame component. */
-    public void register(JFrame component, String[] args, boolean already_registered) {
-    if(component != null) {
-        // Determine the key
-        String key = "";
-        if(!already_registered) {
-        key = component.getTitle();
-        }
-        else {
-        key = args[args.length - 1];
-        }
-        // Update the component using the AWTEvent queue
-        String value = get(key, args);
-        ChangeTask task = new JFrameChangeTask(component, key, value);
-        SwingUtilities.invokeLater(task);
-        // Register as necessary
-        if(!already_registered) {
-        args = ArrayTools.add(args, key);
-        put(component, args);
-        }
-    }
-    }
-
-    /**
-     * @deprecated
-     * Register a label component. */
-    public void register(JLabel component, String[] args, boolean already_registered) {
-    if(component != null) {
-        // Determine the key
-        String key = "";
-        if(!already_registered) {
-        key = component.getText();
-        }
-        else {
-        key = args[args.length - 1];
-        }
-        // Update the component using the AWTEvent queue
-        String value = get(key, args);
-        ChangeTask task = new JLabelChangeTask(component, key, value);
-        SwingUtilities.invokeLater(task);
-        // Register as necessary
-        if(!already_registered) {
-        args = ArrayTools.add(args, key);
-        put(component, args);
-        }
-    }
-    }
-
-    /**
-     * @deprecated
-     * Register a tab pane component. */
-    public void register(JTabbedPane component, String[] args, boolean already_registered) {
-    if(component != null) {
-        // If not already registered then args will be null.
-        if(!already_registered) {
-        args = new String[component.getTabCount()];
-        }
+        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++) {
@@ -585 +497 @@
             args[i] = component.getTitleAt(i);
         }
-        String value = get(args[i], (String[])null);
-        String tooltip = get(args[i] + "_Tooltip", (String[])null);
-        ChangeTask task = new JTabbedPaneChangeTask(component, args[i], i, value, tooltip);
+        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);
         SwingUtilities.invokeLater(task);
         }
-        // Register if necessary
-        if(!already_registered) {
-        put(component, args);
-        }
-    }
-    }
-
-    /**
-     * @deprecated
-     * Register a text component. */
-    public void register(JTextComponent component, String[] args, boolean already_registered)
-    {
-    if (component != null) {
-        // Determine the key
-        String key = "";
-        if (!already_registered) {
-        key = component.getText();
-        }
-        else {
-        key = args[args.length - 1];
-        }
-
-        // Update the component using the AWTEvent queue
-        String value = get(key, args);
-        String tooltip = get(key + "_Tooltip", (String[])null);
-        ChangeTask task = new JTextComponentChangeTask(component, key, value, tooltip);
-        SwingUtilities.invokeLater(task);
-        // Register as necessary
-        if (!already_registered) {
-        args = ArrayTools.add(args, key);
-        put(component, args);
-        }
-    }
-    }
-
-    /**
-     * @deprecated
-     * Register a tree component. */
-    public void register(JTree component, String[] args, boolean already_registered) {
-    if(component != null) {
-        // Retrieve the tooltip using the components name
-        String key = component.getName();
-        String tooltip = get(key + "_Tooltip", (String[])null);
-        ChangeTask task = new JTreeChangeTask(component, key, tooltip);
-        SwingUtilities.invokeLater(task);
-        // A tree can never be previously registered. In otherwords the keys are harvested each time. Thus for a tree to remain consistant its up to the implementer to implement DictionaryTreeNode for the tree nodes!
-        ArrayList nodes = new ArrayList();
-        nodes.add(component.getModel().getRoot());
-        while(nodes.size() > 0) {
-        DictionaryTreeNode node = (DictionaryTreeNode) nodes.remove(0);
-        // Update
-        String value = get(node.getKey(), (String[])null);
-        task = new JTreeChangeTask(component, node.getKey(), node, value);
-        SwingUtilities.invokeLater(task);
-        // Add children to nodes
-        for(int i = 0; i < node.getChildCount(); i++) {
-            nodes.add(node.getChildAt(i));
-        }
-        }
-    }
-    }
-
-    /**
-     * @deprecated
-     * Register a titled border component. */
-    public void register(TitledBorder component, String[] args, boolean already_registered) {
-    if(component != null) {
-        // Determine the key
-        String key = "";
-        if(!already_registered) {
-        key = component.getTitle();
-        }
-        else {
-        key = args[args.length - 1];
-        }
-        // Update the component using the AWTEvent queue
-        String value = get(key, args);
-        ChangeTask task = new TitledBorderChangeTask(component, key, value);
-        SwingUtilities.invokeLater(task);
-        // Register as necessary
-        if(!already_registered) {
-        args = ArrayTools.add(args, key);
-        put(component, args);
-        }
-    }
-    }
-
-    /** 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
-    implements Runnable {
-    protected String key;
-    protected String value;
-    public ChangeTask(String key, String value) {
-        this.key = key;
+    }
+    }
+
+
+    /** Updates a tabbed panes tab title and tooltip. */
+    static private class JTabbedPaneChangeTask
+    implements Runnable {
+    protected String key;
+    protected String value;
+    private int index;
+    private JTabbedPane component;
+    private String tooltip;
+
+    public JTabbedPaneChangeTask(JTabbedPane component, String key, int index, String value, String tooltip) {
+        this.key = key;
         this.value = value;
-    }
-    public void run() {
-    }
-    }
-
-    /** Update the text and tooltip for this button. */
-    private class AbstractButtonChangeTask
-    extends ChangeTask {
-    private AbstractButton component;
-    private String tooltip;
-    public AbstractButtonChangeTask(AbstractButton component, String key, String value, String tooltip) {
-        super(key, value);
-        this.component = component;
-        this.tooltip = tooltip;
-    }
-    public void run() {
-        component.setText(value);
-        // if(!tooltip.equals(key+"_Tooltip")) {
-        component.setToolTipText(tooltip);
-        // }
-        // else {
-        // component.setToolTipText(null);
-        // }
-    }
-    }
-    /** Update the text associated with a combobox. If the index used is -1 then we are setting the tooltip for this combobox. */
-    private class JComboBoxChangeTask
-    extends ChangeTask {
-    private int index;
-    private JComboBox component;
-    public JComboBoxChangeTask(JComboBox component, String key, int index, String value) {
-        super(key, value);
-        this.component = component;
-        this.index = index;
-    }
-    public void run() {
-        if(index != -1) {
-        try {
-            MutableComboBoxEntry entry = (MutableComboBoxEntry)component.getItemAt(index);
-            entry.setText(value);
-        }
-        catch (Exception error) {
-        }
-        }
-        else {
-        if(!value.equals(key+"_Tooltip")) {
-            component.setToolTipText(value);
-        }
-        else {
-            component.setToolTipText(null);
-        }
-        }
-    }
-    }
-    /** Update the title of this dialog. */
-    private class JDialogChangeTask
-    extends ChangeTask {
-    private JDialog component;
-    public JDialogChangeTask(JDialog component, String key, String value) {
-        super(key, value);
-        this.component = component;
-    }
-    public void run() {
-        component.setTitle(value);
-    }
-    }
-    /** Update the title of this frame. */
-    private class JFrameChangeTask
-    extends ChangeTask {
-    private JFrame component;
-    public JFrameChangeTask(JFrame component, String key, String value) {
-        super(key, value);
-        this.component = component;
-    }
-    public void run() {
-        component.setTitle(value);
-    }
-    }
-
-    /** 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
-    extends ChangeTask {
-    private int index;
-    private JTabbedPane component;
-    private String tooltip;
-    public JTabbedPaneChangeTask(JTabbedPane component, String key, int index, String value, String tooltip) {
-        super(key, value);
-        this.component = component;
-        this.index = index;
-        this.tooltip = tooltip;
-    }
-    public void run() {
-        component.setTitleAt(index, value);
-        if(!tooltip.equals(key+"_Tooltip")) {
-        component.setToolTipTextAt(index, tooltip);
-        }
-        else {
-        component.setToolTipTextAt(index, null);
-        }
-    }
-    }
-    /** Update the text and tooltip of this text component. */
-    private class JTextComponentChangeTask
-    extends ChangeTask {
-    private JTextComponent component;
-    private String tooltip;
-    public JTextComponentChangeTask(JTextComponent component, String key, String value, String tooltip) {
-        super(key, value);
-        this.component = component;
-        this.tooltip = tooltip;
-    }
-    public void run() {
-        component.setText(value);
-        if(!tooltip.equals(key+"_Tooltip")) {
-        component.setToolTipText(tooltip);
-        }
-        else {
-        component.setToolTipText(null);
-        }
-    }
-    }
-    /** Update the tooltip of a tree and its tree node's labels. Shouldn't really ever be used on a dynamic tree, but is quite useful for a 'contents' tree type control. */
-    private class JTreeChangeTask
-    extends ChangeTask {
-    private DictionaryTreeNode node;
-    private JTree component;
-    public JTreeChangeTask(JTree component, String key, String value) {
-        super(key, value);
-        this.component = component;
-    }
-    public JTreeChangeTask(JTree component, String key, DictionaryTreeNode node, String value) {
-        super(key, value);
-        this.component = component;
-        this.node = node;
-    }
-    public void run() {
-        if(value != null) {
-        node.setText(value);
-        ((DefaultTreeModel)component.getModel()).nodeChanged((TreeNode)node);
-        }
-                // Set the tool tip
-        else {
-        if(!value.equals(key+"_Tooltip")) {
-            component.setToolTipText(value);
-        }
-        else {
-            component.setToolTipText(null);
-        }
-        }
-    }
-    }
-    /** Update the title of this titled border. */
-    private class TitledBorderChangeTask
-    extends ChangeTask {
-    private TitledBorder component;
-    public TitledBorderChangeTask(TitledBorder component, String key, String value) {
-        super(key, value);
-        this.component = component;
-    }
-    public void run() {
-        component.setTitle(value);
-        component.getParent().repaint();
-    }
+        this.component = component;
+        this.index = index;
+        this.tooltip = tooltip;
+    }
+    public void run() {
+        component.setTitleAt(index, value);
+        if(!tooltip.equals(key+"_Tooltip")) {
+        component.setToolTipTextAt(index, tooltip);
+        }
+        else {
+        component.setToolTipTextAt(index, null);
+        }
+    }
     }
 }

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

@@ -1 @@
-package org.greenstone.gatherer;
 /**
  *#########################################################################
@@ -36 +35 @@
  *########################################################################
  */ 
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.GridLayout;
-import java.awt.Point;
-import java.awt.Toolkit;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.net.Authenticator;
-import java.net.PasswordAuthentication;
-import javax.swing.BorderFactory;
-import javax.swing.JButton;
-import javax.swing.JDialog;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JTextField;
-import javax.swing.JPanel;
-import javax.swing.JPasswordField;
+package org.greenstone.gatherer;
+
+import java.awt.*;
+import java.awt.event.*;
+import java.net.*;
+import javax.swing.*;
+
 /** Provides a graphic authenticator for network password requests.
  * @author John Thompson, Greenstone Digital Library, University of Waikato
@@ -72 +60 @@
     /** The default size of this dialog. */
     static final private Dimension SIZE = new Dimension(410,140);
+
     /** Constructor. */
     public GAuthenticator() {
     }
+
     /** Prompt the user for authentication using a pretty dialog box.
-      * @return A <strong>PasswordAuthentication</strong> object containing the login and password valuees the user has submitted.
-      * @see org.greenstone.gatherer.GAuthenticator.AuthenticationActionListener
-      * @see org.greenstone.gatherer.GAuthenticator.RequestFocusListener
-      */
+     * @return A <strong>PasswordAuthentication</strong> object containing the login and password valuees the user has submitted.
+     * @see org.greenstone.gatherer.GAuthenticator.AuthenticationActionListener
+     * @see org.greenstone.gatherer.GAuthenticator.RequestFocusListener
+     */
     protected PasswordAuthentication getPasswordAuthentication() {
     // Component definition.
-    dialog = new JDialog (Gatherer.g_man, get("GAuthenticator.Title"), true);
+    dialog = new JDialog (Gatherer.g_man, Dictionary.newget("GAuthenticator.Title"), true);
     dialog.setModal(true);
     dialog.setSize(SIZE);
-    JPanel content_pane = (JPanel)dialog.getContentPane();
+    JPanel content_pane = (JPanel) dialog.getContentPane();
     JLabel title_label = new JLabel(getRequestingPrompt());
     JPanel user_panel = new JPanel();
-    JLabel username_label = new JLabel(get("GAuthenticator.Username"));
+    JLabel username_label = new JLabel();
+    Dictionary.setText(username_label, "GAuthenticator.Username");
     JTextField username = new JTextField();
+    Dictionary.setTooltip(username, "GAuthenticator.Username_Tooltip");
     JPanel password_panel = new JPanel();
-    JLabel password_label = new JLabel(get("GAuthenticator.Password"));
+    JLabel password_label = new JLabel();
+    Dictionary.setText(password_label, "GAuthenticator.Password");
     password = new JPasswordField();
-    password.setEchoChar ('*');
+    password.setEchoChar('*');
+    Dictionary.setTooltip(password, "GAuthenticator.Password_Tooltip");
     JPanel button_panel = new JPanel();
-    ok_button = new JButton(get("General.OK"));
-    cancel_button = new JButton(get("General.Cancel"));
-    // Connect listeners.
+    ok_button = new JButton();
+    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(new AuthenticationActionListener(true));
     ok_button.addActionListener(new AuthenticationActionListener(false));
     password.addActionListener(new AuthenticationActionListener(false));
     username.addActionListener(new RequestFocusListener(password));
-    // Layout the components.
+
+    // Layout
     user_panel.setLayout(new GridLayout(1,2));
     user_panel.add(username_label);
@@ -121 +119 @@
     content_pane.add(password_panel);
     content_pane.add(button_panel);
-    // Position the window.
+
+    // Position the window
     Dimension screen_size = Toolkit.getDefaultToolkit().getScreenSize();
     dialog.setLocation((screen_size.width - SIZE.width) / 2, (screen_size.height - SIZE.height) / 2);
@@ -134 +133 @@
     }
 
-    /** Retrieve a phrase from the dictionary.
-      * @param key A <strong>String</strong> used to determine what phrase to retrieve.
-      * @return The required phrase as a <strong>String</strong>, or at least some meaningful error message.
-      * @see org.greenstone.gatherer.Dictionary
-      * @see org.greenstone.gatherer.Gatherer
-      */
-    private String get(String key) {
-    if(key.indexOf(".") == -1) {
-        key = "GAuthenticator." + key;
-    }
-    return Gatherer.dictionary.get(key);
-    }
+
     /** Detects actions upon any control that attempt to submit the current details for authentication. */
     private class AuthenticationActionListener
@@ -153 +141 @@
     /** Constructor.
      * @param cancel_action <i>true</i> if this authentication action cancels the authentication, <i>false</i> otherwise.
-            */
+     */
     public AuthenticationActionListener(boolean cancel_action) {
         this.cancel_action = cancel_action;
     }
     /** Any implementation of an ActionListener must include this method so that we can be informed when an action has been performed on our registered controls, allowing us to dispose of the authentication dialog after determining if this is a submit action or a cancel one.
-            * @param event An <strong>ActionEvent</strong> with information about the event that fired this method.
-            */
+     * @param event An <strong>ActionEvent</strong> with information about the event that fired this method.
+     */
     public void actionPerformed(ActionEvent event) {
         authentication_cancelled = cancel_action;
@@ -165 +153 @@
     }
     }
+
     /** This listener detects actions on registered controls, and when they occur ensures the focus is moved to some targetted component. */
     private class RequestFocusListener
@@ -172 +161 @@
     /** Constructor.
      * @param target The <strong>Component</strong> you wish to gain focus when an action is performed on a registered control.
-            */
+     */
     public RequestFocusListener(Component target) {
         this.target = target;
     }
     /** Any implementation of an ActionListener must include this method so that we can be informed when an action has been performed on our registered controls, allowing us to request focus in the target control.
-            * @param event An <strong>ActionEvent</strong> with information about the event that fired this method.
-            */
+     * @param event An <strong>ActionEvent</strong> with information about the event that fired this method.
+     */
     public void actionPerformed(ActionEvent event) {
         target.requestFocus();
@@ -184 +173 @@
     }
 }
-
-
-
-
-
-
-

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

@@ -25 +25 @@
  *########################################################################
  */
-
 package org.greenstone.gatherer.cdm;
 
@@ -32 +31 @@
 import javax.swing.*;
 import javax.swing.event.*;
-import javax.swing.text.JTextComponent;
 import javax.swing.tree.*;
 import org.greenstone.gatherer.Configuration;
@@ -41 +39 @@
 import org.greenstone.gatherer.cdm.Control;
 import org.greenstone.gatherer.gui.EmailField;
-import org.greenstone.gatherer.msm.MSMUtils;
 import org.greenstone.gatherer.util.Utility;
+
 /** This class is responsible for generating the necessary GUI components. It does this by calling the getEditControls() method of the appropriate class (i.e. IndexManager for index related edits). It also is in charge of correctly adding (and removing) listeners, using phrases from the <strong>Dictionary</strong> rather than the text keys inserted in the component classes, and several other aspects of the design page, including the config file section tree.
 * @author John Thompson, Greenstone Digital Library, University of Waikato
@@ -73 +71 @@
     JPanel tree_pane = new JPanel();
     JLabel title = new JLabel();
-    Gatherer.dictionary.setText(title, "CDM.GUI.Design_Topics", null);
+    Dictionary.registerText(title, "CDM.GUI.Design_Topics");
     tree = new DesignTree();
     view = controls;
@@ -176 +174 @@
         title_label = new JLabel();
         title_label.setHorizontalAlignment(JLabel.CENTER);
-        Gatherer.dictionary.setText(title_label, "CDM.General.Title", null);
+        Dictionary.registerText(title_label, "CDM.General.Title");
 
         instructions_textarea = new JTextArea();
@@ -184 +182 @@
         instructions_textarea.setRows(6);
         instructions_textarea.setWrapStyleWord(true);
-        Gatherer.dictionary.setText(instructions_textarea, "CDM.General.Instructions", null);
+        Dictionary.registerText(instructions_textarea, "CDM.General.Instructions");
 
         JPanel all_details_panel = new JPanel();
@@ -191 +189 @@
         creator_label = new JLabel();
         creator_label.setPreferredSize(LABEL_SIZE);
-        Gatherer.dictionary.setText(creator_label, "CDM.General.Email.Creator", null);
+        Dictionary.registerText(creator_label, "CDM.General.Email.Creator");
 
         creator_emailfield = new EmailField(Gatherer.config.getColor("coloring.error_background", false));
-        Gatherer.dictionary.setTooltip(creator_emailfield, "CDM.General.Email.Creator_Tooltip");
+        Dictionary.registerTooltip(creator_emailfield, "CDM.General.Email.Creator_Tooltip");
 
         JPanel maintainer_panel = new JPanel();
         maintainer_label = new JLabel();
         maintainer_label.setPreferredSize(LABEL_SIZE);
-        Gatherer.dictionary.setText(maintainer_label, "CDM.General.Email.Maintainer", null);
+        Dictionary.registerText(maintainer_label, "CDM.General.Email.Maintainer");
 
         maintainer_emailfield = new EmailField(Gatherer.config.getColor("coloring.error_background", false));
-        Gatherer.dictionary.setTooltip(maintainer_emailfield, "CDM.General.Email.Maintainer_Tooltip");
+        Dictionary.registerTooltip(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);
+        Dictionary.registerText(public_checkbox, "CDM.General.Access");
         beta_checkbox = new JCheckBox("", beta_collectionmeta.getValue(CollectionMeta.TEXT).equals(CollectionConfiguration.TRUE_STR));
-        Gatherer.dictionary.setText(beta_checkbox, "CDM.General.Beta", null);
+        Dictionary.registerText(beta_checkbox, "CDM.General.Beta");
         JPanel name_panel = new JPanel();
         name_label = new JLabel();
         name_label.setPreferredSize(LABEL_SIZE);
-        Gatherer.dictionary.setText(name_label, "CDM.General.Collection_Name", null);
+        Dictionary.registerText(name_label, "CDM.General.Collection_Name");
         name_textfield = new JTextField("CDM.General.Collection_Name");
-        Gatherer.dictionary.setTooltip(name_textfield, "CDM.General.Collection_Name_Tooltip");
+        Dictionary.registerTooltip(name_textfield, "CDM.General.Collection_Name_Tooltip");
         JPanel icon_panel = new JPanel();
         icon_label = new JLabel();
         icon_label.setPreferredSize(LABEL_SIZE);
-        Gatherer.dictionary.setText(icon_label, "CDM.General.Icon_Collection", null);
+        Dictionary.registerText(icon_label, "CDM.General.Icon_Collection");
         icon_textfield = new JTextField("CDM.General.Icon_Collection");
-        Gatherer.dictionary.setTooltip(icon_textfield, "CDM.General.Icon_Collection_Tooltip");
+        Dictionary.registerTooltip(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);
-        Gatherer.dictionary.setText(small_icon_label, "CDM.General.Icon_Collection_Small", null);
+        Dictionary.registerText(small_icon_label, "CDM.General.Icon_Collection_Small");
         small_icon_textfield = new JTextField("CDM.General.Icon_Collection_Small");
-        Gatherer.dictionary.setTooltip(small_icon_textfield, "CDM.General.Icon_Collection_Small_Tooltip");
+        Dictionary.registerTooltip(small_icon_textfield, "CDM.General.Icon_Collection_Small_Tooltip");
         JPanel description_panel = new JPanel();
         description_label = new JLabel();
         description_label.setPreferredSize(LABEL_SIZE);
-        Gatherer.dictionary.setText(description_label, "CDM.General.Collection_Extra", null);
+        Dictionary.registerText(description_label, "CDM.General.Collection_Extra");
         description_textarea = new JTextArea();
         description_textarea.setBackground(Gatherer.config.getColor("coloring.editable_background", false));
-        Gatherer.dictionary.setTooltip(description_textarea, "CDM.General.Collection_Extra_Tooltip");
+        Dictionary.registerTooltip(description_textarea, "CDM.General.Collection_Extra_Tooltip");
         // Connection
         beta_checkbox.addActionListener(CollectionDesignManager.change_listener);
@@ -358 +356 @@
      */
     public void setSelectedView(String type) {
-        type = Gatherer.dictionary.get(type);
+        type = Dictionary.newget(type);
         for(int i = 0; i < root.getChildCount(); i++) {
         DesignNode child = (DesignNode) root.getChildAt(i);
@@ -381 +379 @@
      */
     public String toString() {
-        return Gatherer.dictionary.get("CDM.GUI." + (String)getUserObject());
+        return Dictionary.newget("CDM.GUI." + (String)getUserObject());
     }
     }

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

@@ -26 +26 @@
  */
 package org.greenstone.gatherer.cdm;
+
 import java.awt.*;
 import java.awt.event.*;
@@ -31 +32 @@
 import javax.swing.*;
 import javax.swing.event.*;
+import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.cdm.CollectionMeta;
@@ -104 +106 @@
     }
     else {
-        JOptionPane.showMessageDialog(Gatherer.g_man, get("CDM.IndexManager.Index_Exists"), get("General.Warning"), JOptionPane.WARNING_MESSAGE);
+        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("CDM.IndexManager.Index_Exists"), Dictionary.newget("General.Warning"), JOptionPane.WARNING_MESSAGE);
     }
     }
@@ -122 +124 @@
     }
     else {
-        JOptionPane.showMessageDialog(Gatherer.g_man, get("CDM.IndexManager.Level_Exists"), get("General.Warning"), JOptionPane.WARNING_MESSAGE);
+        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("CDM.IndexManager.Level_Exists"), Dictionary.newget("General.Warning"), JOptionPane.WARNING_MESSAGE);
     }
     }
@@ -481 +483 @@
     }
 
-    /** 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.
-     */
-    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 automatically 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.IndexManager." + key;
-    }
-    return Gatherer.dictionary.get(key, args);
-    }
 
     /** This class creates a set of controls for editing the indexes. */
@@ -552 +532 @@
 
         JPanel instruction_pane = new JPanel();
-        JLabel title_label = new JLabel(get("CDM.IndexManager.Title"));
+        JLabel title_label = new JLabel();
         title_label.setHorizontalAlignment(JLabel.CENTER);
-        instruction_textarea = new JTextArea(get("CDM.IndexManager.Instructions"));
+        Dictionary.registerText(title_label, "CDM.IndexManager.Title");
+
+        instruction_textarea = new JTextArea();
         instruction_textarea.setEditable(false);
         instruction_textarea.setLineWrap(true);
         instruction_textarea.setRows(6);
         instruction_textarea.setWrapStyleWord(true);
+        Dictionary.registerText(instruction_textarea, "CDM.IndexManager.Instructions");
 
         JPanel assigned_indexes_pane = new JPanel();
-        JLabel index_label = new JLabel(get("CDM.IndexManager.Indexes"));
+        JLabel index_label = new JLabel();
+        Dictionary.registerText(index_label, "CDM.IndexManager.Indexes");
         index_list = new JList(model);
         index_list.setCellRenderer(new IndexListRenderer());
@@ -567 +551 @@
         JPanel movement_pane = new JPanel();
 
-        move_up_button = new DoubleImageButton(get("CDM.Move.Move_Up"), Utility.getImage("arrow-up.gif"), Utility.getImage("arrow-up-disabled.gif"));
+        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"));
+        Dictionary.registerBoth(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);
+        Dictionary.registerBoth(move_down_button, "CDM.Move.Move_Down", "CDM.Move.Move_Down_Tooltip");
 
         JPanel index_pane = new JPanel();
@@ -582 +568 @@
 
         JPanel name_pane = new JPanel();
-        JLabel name_label = new JLabel(get("CDM.IndexManager.Name"));
+        JLabel name_label = new JLabel();
         name_label.setPreferredSize(Utility.LABEL_SIZE);
+        Dictionary.registerText(name_label, "CDM.IndexManager.Name");
         name_textfield = new JTextField();
 
         JPanel source_pane = new JPanel();
-        JLabel source_label = new JLabel(get("CDM.IndexManager.Source"));
+        JLabel source_label = new JLabel();
         source_label.setPreferredSize(Utility.LABEL_SIZE);
+        Dictionary.registerText(source_label, "CDM.IndexManager.Source");
         source_list = new CheckList(new_data, false);
 
         JPanel level_pane = new JPanel();
-        JLabel level_label = new JLabel(get("CDM.IndexManager.Level"));
+        JLabel level_label = new JLabel();
         level_label.setPreferredSize(Utility.LABEL_SIZE);
+        Dictionary.registerText(level_label, "CDM.IndexManager.Level");
         level_combobox = new JComboBox();
-        level_combobox.addItem(get("CDM.IndexManager.Document"));
-        level_combobox.addItem(get("CDM.IndexManager.Paragraph"));
-        level_combobox.addItem(get("CDM.IndexManager.Section"));
+        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.setEditable(false);
 
         JPanel button_pane = new JPanel();
-        add_button = new JButton(get("CDM.IndexManager.Add"));
+        add_button = new JButton();
         add_button.setEnabled(false);
         add_button.setMnemonic(KeyEvent.VK_A);
-        set_default_button = new JButton(get("CDM.IndexManager.Set_Default"));
+        Dictionary.registerBoth(add_button, "CDM.IndexManager.Add", "CDM.IndexManager.Add_Tooltip");
+        set_default_button = new JButton();
         set_default_button.setEnabled(false);
         set_default_button.setMnemonic(KeyEvent.VK_S);
-        remove_button = new JButton(get("CDM.IndexManager.Remove"));
+        Dictionary.registerBoth(set_default_button, "CDM.IndexManager.Set_Default", "CDM.IndexManager.Set_Default_Tooltip");
+        remove_button = new JButton();
         remove_button.setEnabled(false);
         remove_button.setMnemonic(KeyEvent.VK_R);
+        Dictionary.registerBoth(remove_button, "CDM.IndexManager.Remove", "CDM.IndexManager.Remove_Tooltip");
 
         // This class is getting a little crowded, so I'll generate the many mgpp controls in a inner class.
@@ -684 +676 @@
         add(mgppindexes_control, MGPPINDEXES);
     }
+
     /* Destructor, removes persistant listeners from the Dictionary.
      */
@@ -803 +796 @@
         JLabel component = (JLabel) super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
         if(default_index != null && default_index.equals(value)) {
-            component.setText(component.getText() + " " + get("CDM.IndexManager.Default_Index_Indicator"));
+            component.setText(component.getText() + " " + Dictionary.newget("CDM.IndexManager.Default_Index_Indicator"));
         }
         return component;
@@ -932 +925 @@
         JPanel current_indexes_panel = new JPanel();
 
-        current_indexes_label = new JLabel("CDM.IndexManager.MGPP.Current_Indexes");
-
+        current_indexes_label = new JLabel();
+        Dictionary.registerText(current_indexes_label, "CDM.IndexManager.MGPP.Current_Indexes");
         current_indexes_list = new JList(model);
         current_indexes_list.setVisibleRowCount(5);
@@ -939 +932 @@
         JPanel index_movement_panel = new JPanel();
 
-        ImageIcon move_index_up_icon = Utility.getImage("arrow-up.gif");
-        move_index_up_button = new JButton();
-        move_index_up_label = new JLabel("CDM.Move.Move_Up");
-        move_index_up_label.setHorizontalAlignment(JLabel.CENTER);
-        move_index_up_label.setPreferredSize(LABEL_SIZE);
-        move_index_up_button.setLayout(new BorderLayout());
-        move_index_up_button.add(new JLabel(move_index_up_icon), BorderLayout.WEST);
-        move_index_up_button.add(move_index_up_label, BorderLayout.CENTER);
-        move_index_up_button.add(new JLabel(move_index_up_icon), BorderLayout.EAST);
+        move_index_up_button = new DoubleImageButton("", Utility.getImage("arrow-up.gif"), Utility.getImage("arrow-up-disabled.gif"));
+        move_index_up_button.setEnabled(false);
         move_index_up_button.setMnemonic(KeyEvent.VK_U);
-
-        ImageIcon move_index_down_icon = Utility.getImage("arrow-down.gif");
-        move_index_down_button = new JButton();
-        move_index_down_label = new JLabel("CDM.Move.Move_Down");
-        move_index_down_label.setHorizontalAlignment(JLabel.CENTER);
-        move_index_down_label.setPreferredSize(LABEL_SIZE);
-        move_index_down_button.setLayout(new BorderLayout());
-        move_index_down_button.add(new JLabel(move_index_down_icon), BorderLayout.WEST);
-        move_index_down_button.add(move_index_down_label, BorderLayout.CENTER);
-        move_index_down_button.add(new JLabel(move_index_down_icon), BorderLayout.EAST);
+        move_index_up_button.setPreferredSize(Utility.DOUBLE_IMAGE_BUTTON_SIZE);
+        Dictionary.registerBoth(move_index_up_button, "CDM.Move.Move_Up", "CDM.Move.Move_Up_Tooltip");
+
+        move_index_down_button = new DoubleImageButton("", Utility.getImage("arrow-down.gif"), Utility.getImage("arrow-down-disabled.gif"));
+        move_index_down_button.setEnabled(false);
         move_index_down_button.setMnemonic(KeyEvent.VK_D);
+        move_index_down_button.setPreferredSize(Utility.DOUBLE_IMAGE_BUTTON_SIZE);
+        Dictionary.registerBoth(move_index_down_button, "CDM.Move.Move_Down", "CDM.Move.Move_Down_Tooltip");
 
         JPanel index_spacer_panel = new JPanel();
@@ -969 +952 @@
         JPanel index_name_panel = new JPanel();
 
-        index_name_label = new JLabel("CDM.IndexManager.MGPP.Index_Name");
+        index_name_label = new JLabel();
         index_name_label.setPreferredSize(LABEL_SIZE);
+        Dictionary.registerText(index_name_label, "CDM.IndexManager.MGPP.Index_Name");
 
         index_name_field = new JTextField();
+        Dictionary.registerTooltip(index_name_field, "CDM.IndexManager.MGPP.Index_Name_Tooltip");
 
         JPanel index_panel = new JPanel();
@@ -978 +963 @@
         index_label = new JLabel("CDM.IndexManager.MGPP.Index");
         index_label.setPreferredSize(LABEL_SIZE);
+        Dictionary.registerText(index_label, "CDM.IndexManager.MGPP.Index");
 
         index_combobox = new GComboBox();
@@ -985 +971 @@
         index_combobox.setTextNonSelectionColor(Gatherer.config.getColor("coloring.workspace_tree_foreground", false));
         index_combobox.setTextSelectionColor(Gatherer.config.getColor("coloring.collection_selection_foreground", false));
+        Dictionary.registerTooltip(index_combobox, "CDM.IndexManager.MGPP.Index_Tooltip");
 
         JPanel index_button_panel = new JPanel();
 
-        add_index_button = new JButton("CDM.IndexManager.MGPP.Add_Index");
+        add_index_button = new JButton();
         add_index_button.setEnabled(false);
         add_index_button.setMnemonic(KeyEvent.VK_A);
-        
-        add_all_button = new JButton("CDM.IndexManager.MGPP.Add_All_Metadata");
+        Dictionary.registerBoth(add_index_button, "CDM.IndexManager.MGPP.Add_Index", "CDM.IndexManager.MGPP.Add_Index_Tooltip");
+
+        add_all_button = new JButton();
         add_all_button.setEnabled(true);
         add_all_button.setMnemonic(KeyEvent.VK_L);
-
-        replace_button = new JButton("CDM.IndexManager.MGPP.Replace_Index");
+        Dictionary.registerBoth(add_all_button, "CDM.IndexManager.MGPP.Add_All_Metadata", "CDM.IndexManager.MGPP.Add_All_Metadata_Tooltip");
+
+        replace_button = new JButton();
         replace_button.setEnabled(false);
         replace_button.setMnemonic(KeyEvent.VK_C);
-
-        remove_index_button = new JButton("CDM.IndexManager.MGPP.Remove_Index");
+        Dictionary.registerBoth(replace_button, "CDM.IndexManager.MGPP.Replace_Index", "CDM.IndexManager.MGPP.Replace_Index_Tooltip");
+
+        remove_index_button = new JButton();
         remove_index_button.setEnabled(false);
         remove_index_button.setMnemonic(KeyEvent.VK_A);
+        Dictionary.registerBoth(remove_index_button, "CDM.IndexManager.MGPP.Remove_Index", "CDM.IndexManager.MGPP.Remove_Index_Tooltip");
 
         JPanel index_empty_panel = new JPanel();
@@ -1011 +1002 @@
         add_all_button.addActionListener(new AddAllActionListener());
         current_indexes_list.addListSelectionListener(new CurrentIndexesListSelectionListener());
-        Gatherer.dictionary.register(add_index_button, null, false);
-        Gatherer.dictionary.register(add_all_button, null, false);
-        Gatherer.dictionary.register(current_indexes_label, null, false);
-        Gatherer.dictionary.register(index_label, null, false);
-        Gatherer.dictionary.register(index_name_label, null, false);
-        Gatherer.dictionary.register(move_index_down_label, null, false);
-        Gatherer.dictionary.register(move_index_up_label, null, false);
-        Gatherer.dictionary.register(replace_button, null, false);
-        Gatherer.dictionary.register(remove_index_button, null, false);
         index_combobox.addActionListener(index_eal);
         ((JTextField)index_combobox.getEditor().getEditorComponent()).getDocument().addDocumentListener(index_eal);
@@ -1027 +1009 @@
         replace_button.addActionListener(new ReplaceIndexActionListener());
         remove_index_button.addActionListener(new RemoveIndexActionListener(index_eal));
+
         // Layout Indexes
         index_movement_panel.setLayout(new GridLayout(2,1));
@@ -1075 +1058 @@
         JPanel current_levels_panel = new JPanel();
 
-        current_levels_label = new JLabel("CDM.IndexManager.MGPP.Current_Levels");
+        current_levels_label = new JLabel();
+        Dictionary.registerText(current_levels_label, "CDM.IndexManager.MGPP.Current_Levels");
 
         current_levels_list = new JList(levels_model);
@@ -1082 +1066 @@
         JPanel level_movement_panel = new JPanel();
 
-        ImageIcon move_level_up_icon = Utility.getImage("arrow-up.gif");
-        move_level_up_button = new JButton();
-        move_level_up_label = new JLabel("CDM.Move.Move_Up");
-        move_level_up_label.setHorizontalAlignment(JLabel.CENTER);
-        move_level_up_label.setPreferredSize(LABEL_SIZE);
-        move_level_up_button.setLayout(new BorderLayout());
-        move_level_up_button.add(new JLabel(move_level_up_icon), BorderLayout.WEST);
-        move_level_up_button.add(move_level_up_label, BorderLayout.CENTER);
-        move_level_up_button.add(new JLabel(move_level_up_icon), BorderLayout.EAST);
+        move_level_up_button = new DoubleImageButton("", Utility.getImage("arrow-up.gif"), Utility.getImage("arrow-up-disabled.gif"));
+        move_level_up_button.setEnabled(false);
         move_level_up_button.setMnemonic(KeyEvent.VK_U);
-
-        ImageIcon move_level_down_icon = Utility.getImage("arrow-down.gif");
-        move_level_down_button = new JButton();
-        move_level_down_label = new JLabel("CDM.Move.Move_Down");
-        move_level_down_label.setHorizontalAlignment(JLabel.CENTER);
-        move_level_down_label.setPreferredSize(LABEL_SIZE);
-        move_level_down_button.setLayout(new BorderLayout());
-        move_level_down_button.add(new JLabel(move_level_down_icon), BorderLayout.WEST);
-        move_level_down_button.add(move_level_down_label, BorderLayout.CENTER);
-        move_level_down_button.add(new JLabel(move_level_down_icon), BorderLayout.EAST);
+        move_level_up_button.setPreferredSize(Utility.DOUBLE_IMAGE_BUTTON_SIZE);
+        Dictionary.registerBoth(move_level_up_button, "CDM.Move.Move_Up", "CDM.Move.Move_Up_Tooltip");
+
+        move_level_down_button = new DoubleImageButton("", Utility.getImage("arrow-down.gif"), Utility.getImage("arrow-down-disabled.gif"));
+        move_level_down_button.setEnabled(false);
         move_level_down_button.setMnemonic(KeyEvent.VK_D);
+        move_level_down_button.setPreferredSize(Utility.DOUBLE_IMAGE_BUTTON_SIZE);
+        Dictionary.registerBoth(move_level_down_button, "CDM.Move.Move_Down", "CDM.Move.Move_Down_Tooltip");
 
         JPanel level_spacer_panel = new JPanel();
@@ -1112 +1086 @@
         JPanel level_name_panel = new JPanel();
 
-        level_name_label = new JLabel("CDM.IndexManager.MGPP.Level_Name");
+        level_name_label = new JLabel();
         level_name_label.setPreferredSize(LABEL_SIZE);
+        Dictionary.registerText(level_name_label, "CDM.IndexManager.MGPP.Level_Name");
 
         level_name_field = new JTextField();
+        Dictionary.registerTooltip(level_name_field, "CDM.IndexManager.MGPP.Level_Name_Tooltip");
 
         JPanel level_panel = new JPanel();
@@ -1121 +1097 @@
         level_label = new JLabel("CDM.IndexManager.MGPP.Level");
         level_label.setPreferredSize(LABEL_SIZE);
+        Dictionary.registerText(level_label, "CDM.IndexManager.MGPP.Level");
 
         level_combobox = new GComboBox(Index.LEVEL);
@@ -1128 +1105 @@
         level_combobox.setTextNonSelectionColor(Gatherer.config.getColor("coloring.workspace_tree_foreground", false));
         level_combobox.setTextSelectionColor(Gatherer.config.getColor("coloring.collection_selection_foreground", false));
+        Dictionary.registerTooltip(level_combobox, "CDM.IndexManager.MGPP.Level_Tooltip");
 
         JPanel level_button_panel = new JPanel();
@@ -1134 +1112 @@
         add_level_button.setEnabled(false);
         add_level_button.setMnemonic(KeyEvent.VK_A);
+        Dictionary.registerBoth(add_level_button, "CDM.IndexManager.MGPP.Add_Level", "CDM.IndexManager.MGPP.Add_Level_Tooltip");
         
         remove_level_button = new JButton("CDM.IndexManager.MGPP.Remove_Level");
         remove_level_button.setEnabled(false);
         remove_level_button.setMnemonic(KeyEvent.VK_A);
+        Dictionary.registerBoth(remove_level_button, "CDM.IndexManager.MGPP.Remove_Level", "CDM.IndexManager.MGPP.Remove_Level_Tooltip");
 
         JPanel level_empty_panel = new JPanel();
@@ -1145 +1125 @@
         add_level_button.addActionListener(new AddLevelActionListener());
         current_levels_list.addListSelectionListener(new CurrentLevelsListSelectionListener());
-        Gatherer.dictionary.register(add_level_button, null, false);
-        Gatherer.dictionary.register(current_levels_label, null, false);
-        Gatherer.dictionary.register(level_label, null, false);
-        Gatherer.dictionary.register(level_name_label, null, false);
-        Gatherer.dictionary.register(move_level_down_label, null, false);
-        Gatherer.dictionary.register(move_level_up_label, null, false);
-        Gatherer.dictionary.register(remove_level_button, null, false);
         level_combobox.addActionListener(level_eal);
         ((JTextField)level_combobox.getEditor().getEditorComponent()).getDocument().addDocumentListener(level_eal);
@@ -1203 +1176 @@
         JPanel header_panel = new JPanel();
         
-        title_label = new JLabel("CDM.IndexManager.MGPP.Title");
-
-        instructions_textarea = new JTextArea("CDM.IndexManager.MGPP.Instructions");
+        title_label = new JLabel();
+        title_label.setHorizontalAlignment(JLabel.CENTER);
+        Dictionary.registerText(title_label, "CDM.IndexManager.MGPP.Title");
+
+        instructions_textarea = new JTextArea();
         instructions_textarea.setEditable(false);
         instructions_textarea.setLineWrap(true);
         instructions_textarea.setRows(6);
         instructions_textarea.setWrapStyleWord(true);
+        Dictionary.registerText(instructions_textarea, "CDM.IndexManager.MGPP.Instructions");
 
         tabbed_pane = new JTabbedPane();
@@ -1219 +1195 @@
         header_panel.add(new JScrollPane(instructions_textarea), BorderLayout.CENTER);
 
-        tabbed_pane.add("CDM.IndexManager.MGPP.Indexes", indexes_panel);
-        tabbed_pane.add("CDM.IndexManager.MGPP.Levels", levels_panel);
+        tabbed_pane.add(Dictionary.newget("CDM.IndexManager.MGPP.Indexes"), indexes_panel);
+        tabbed_pane.add(Dictionary.newget("CDM.IndexManager.MGPP.Levels"), levels_panel);
 
         setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
@@ -1226 +1202 @@
         add(header_panel, BorderLayout.NORTH);
         add(tabbed_pane, BorderLayout.CENTER);
-
-        // Connect General
-        Gatherer.dictionary.register(instructions_textarea, null, false);
-        Gatherer.dictionary.register(tabbed_pane, null, false);
-        Gatherer.dictionary.register(title_label, null, false);
     }
 
     public void destroy() {
-        Gatherer.dictionary.deregister(add_index_button);
-        Gatherer.dictionary.deregister(add_all_button);
-        Gatherer.dictionary.deregister(current_indexes_label);
-        Gatherer.dictionary.deregister(index_label);
-        Gatherer.dictionary.deregister(index_name_label);
-        Gatherer.dictionary.deregister(move_index_down_label);
-        Gatherer.dictionary.deregister(move_index_up_label);
-        Gatherer.dictionary.deregister(replace_button);
-        Gatherer.dictionary.deregister(remove_index_button);
-
-        Gatherer.dictionary.deregister(instructions_textarea);
-        Gatherer.dictionary.deregister(tabbed_pane);
-        Gatherer.dictionary.deregister(title_label);
     }
 

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

@@ -35 +35 @@
 import javax.swing.plaf.basic.*;
 import org.apache.xerces.parsers.*;
+import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.cdm.Argument;
@@ -145 +146 @@
     }
     if(plugin.getName().equals(StaticStrings.ARCPLUG_STR) || plugin.getName().equals(StaticStrings.RECPLUG_STR)) {
-        JOptionPane.showMessageDialog(Gatherer.g_man, Gatherer.dictionary.get("CDM.Move.Fixed"), Gatherer.dictionary.get("CDM.Move.Title"), JOptionPane.ERROR_MESSAGE);
+        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("CDM.Move.Fixed"), Dictionary.newget("CDM.Move.Title"), JOptionPane.ERROR_MESSAGE);
         return;
     }
@@ -182 +183 @@
         if(index < 0) {
             String args[] = new String[2];
-            args[0] = Gatherer.dictionary.get("CDM.PlugInManager.PlugIn_Str");
+            args[0] = Dictionary.newget("CDM.PlugInManager.PlugIn_Str");
             args[1] = plugin.getName();
-            JOptionPane.showMessageDialog(Gatherer.g_man, Gatherer.dictionary.get("CDM.Move.At_Top", args), Gatherer.dictionary.get("CDM.Move.Title"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("CDM.Move.At_Top", args), Dictionary.newget("CDM.Move.Title"), JOptionPane.ERROR_MESSAGE);
             return;
         }
@@ -197 +198 @@
             String args[] = new String[1];
             args[0] = plugin.getName();
-            JOptionPane.showMessageDialog(Gatherer.g_man, Gatherer.dictionary.get("CDM.Move.Cannot", args), Gatherer.dictionary.get("CDM.Move.Title"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("CDM.Move.Cannot", args), Dictionary.newget("CDM.Move.Title"), JOptionPane.ERROR_MESSAGE);
             // Still not going to move RecPlug or ArcPlug.
             return;
@@ -373 +374 @@
         String plugin_name = getPlugInName(plugin);
         //Gatherer.println("Zero length argument xml detected for: " + plugin_name);
-        JOptionPane.showMessageDialog(Gatherer.g_man, Gatherer.dictionary.get("CDM.PlugInManager.PlugIn_XML_Parse_Failed", plugin_name), Gatherer.dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
+        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);
         }
     }
@@ -410 +413 @@
     if(files != null) {
         // Create a progress indicator.
-        ParsingProgress progress = new ParsingProgress(Gatherer.dictionary.get("CDM.PlugInManager.Parsing.Title"), Gatherer.dictionary.get("CDM.PlugInManager.Parsing.Message"), files.length);
+        ParsingProgress progress = new ParsingProgress(Dictionary.newget("CDM.PlugInManager.Parsing.Title"), Dictionary.newget("CDM.PlugInManager.Parsing.Message"), files.length);
         for(int i = 0; i < files.length; i++) {
         // We only want to check Perl Modules.
@@ -559 +562 @@
         add = new JButton();
         add.setMnemonic(KeyEvent.VK_A);
-        Gatherer.dictionary.setBoth(add, "CDM.PlugInManager.Add", "CDM.PlugInManager.Add_Tooltip");
+        Dictionary.registerBoth(add, "CDM.PlugInManager.Add", "CDM.PlugInManager.Add_Tooltip");
 
         button_pane = new JPanel();
@@ -567 +570 @@
         configure.setEnabled(false);
         configure.setMnemonic(KeyEvent.VK_C);
-        Gatherer.dictionary.setBoth(configure, "CDM.PlugInManager.Configure", "CDM.PlugInManager.Configure_Tooltip");
+        Dictionary.registerBoth(configure, "CDM.PlugInManager.Configure", "CDM.PlugInManager.Configure_Tooltip");
 
         header_pane = new JPanel();
@@ -577 +580 @@
         instructions.setRows(6);
         instructions.setWrapStyleWord(true);
-        Gatherer.dictionary.setText(instructions, "CDM.PlugInManager.Instructions", null);
+        Dictionary.registerText(instructions, "CDM.PlugInManager.Instructions");
 
         move_top_button = new DoubleImageButton("", Utility.getImage("arrow-top.gif"), Utility.getImage("arrow-top-disabled.gif"));
@@ -584 +587 @@
         // move_top_button.setDisplayedMnemonicIndex(8);  // !! English-centric hack
         move_top_button.setPreferredSize(Utility.DOUBLE_IMAGE_BUTTON_SIZE);
-        Gatherer.dictionary.setBoth(move_top_button, "CDM.Move.Move_Top", "CDM.Move.Move_Top_Tooltip");
+        Dictionary.registerBoth(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"));
@@ -590 +593 @@
         move_up_button.setMnemonic(KeyEvent.VK_U);
         move_up_button.setPreferredSize(Utility.DOUBLE_IMAGE_BUTTON_SIZE);
-        Gatherer.dictionary.setBoth(move_up_button, "CDM.Move.Move_Up", "CDM.Move.Move_Up_Tooltip");
+        Dictionary.registerBoth(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"));
@@ -596 +599 @@
         move_down_button.setMnemonic(KeyEvent.VK_D);
         move_down_button.setPreferredSize(Utility.DOUBLE_IMAGE_BUTTON_SIZE);
-        Gatherer.dictionary.setBoth(move_down_button, "CDM.Move.Move_Down", "CDM.Move.Move_Down_Tooltip");
+        Dictionary.registerBoth(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"));
@@ -602 +605 @@
         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");
+        Dictionary.registerBoth(move_bottom_button, "CDM.Move.Move_Bottom", "CDM.Move.Move_Bottom_Tooltip");
 
         movement_pane = new JPanel();
@@ -613 +616 @@
         plugin.setTextNonSelectionColor(Gatherer.config.getColor("coloring.workspace_tree_foreground", false));
         plugin.setTextSelectionColor(Gatherer.config.getColor("coloring.collection_selection_foreground", false));
-        Gatherer.dictionary.setTooltip(plugin, "CDM.PlugInManager.PlugIn_Tooltip");
+        Dictionary.registerTooltip(plugin, "CDM.PlugInManager.PlugIn_Tooltip");
 
         plugin_label = new JLabel();
-        Gatherer.dictionary.setText(plugin_label, "CDM.PlugInManager.PlugIn", null);
+        Dictionary.registerText(plugin_label, "CDM.PlugInManager.PlugIn");
 
         plugin_list = new JList(model);
@@ -624 +627 @@
         plugin_list_label.setHorizontalAlignment(JLabel.CENTER);
         plugin_list_label.setOpaque(true);
-        Gatherer.dictionary.setText(plugin_list_label, "CDM.PlugInManager.Assigned", null);
+        Dictionary.registerText(plugin_list_label, "CDM.PlugInManager.Assigned");
 
         plugin_list_pane = new JPanel();
@@ -632 +635 @@
         remove.setEnabled(false);
         remove.setMnemonic(KeyEvent.VK_R);
-        Gatherer.dictionary.setBoth(remove, "CDM.PlugInManager.Remove", "CDM.PlugInManager.Remove_Tooltip");
+        Dictionary.registerBoth(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);
+        Dictionary.registerText(title, "CDM.PlugInManager.Title");
 
         // Listeners
@@ -693 +696 @@
          (BorderFactory.createEmptyBorder(5,0,5,0),
           BorderFactory.createCompoundBorder
-          (BorderFactory.createTitledBorder(Gatherer.dictionary.get("CDM.PlugInManager.Controls")),
+          (BorderFactory.createTitledBorder(Dictionary.newget("CDM.PlugInManager.Controls")),
            BorderFactory.createEmptyBorder(2,2,2,2))));
 
@@ -768 +771 @@
             }
             else {
-            JOptionPane.showMessageDialog(Gatherer.g_man, Gatherer.dictionary.get("CDM.PlugInManager.PlugIn_Exists"), Gatherer.dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("CDM.PlugInManager.PlugIn_Exists"), Dictionary.newget("General.Error"), JOptionPane.ERROR_MESSAGE);
             }
             base_plugin = null;

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

@@ -35 +35 @@
 import javax.swing.*;
 import javax.swing.event.*;
+import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.cdm.CollectionConfiguration;
@@ -100 +101 @@
     if((direction && index < 0) || (!direction && index >= getSize())) {
         String args[] = new String[2];
-        args[0] = Gatherer.dictionary.get("CDM.SearchTypeManager.SearchType");
+        args[0] = Dictionary.newget("CDM.SearchTypeManager.SearchType");
         args[1] = search_type.toString();
         String message = null;
-        if(direction) {
-        message = Gatherer.dictionary.get("CDM.Move.At_Top", args);
+        if (direction) {
+        message = Dictionary.newget("CDM.Move.At_Top", args);
         }
         else {
-        message = Gatherer.dictionary.get("CDM.Move.At_Bottom", args);
-        }
-        JOptionPane.showMessageDialog(Gatherer.g_man, message, Gatherer.dictionary.get("CDM.Move.Title"), JOptionPane.ERROR_MESSAGE);
+        message = Dictionary.newget("CDM.Move.At_Bottom", args);
+        }
+        JOptionPane.showMessageDialog(Gatherer.g_man, message, Dictionary.newget("CDM.Move.Title"), JOptionPane.ERROR_MESSAGE);
         return;
     }
@@ -147 +148 @@
     public SearchTypeControl() {
         // Creation
+        title_label = new JLabel();
+        title_label.setHorizontalAlignment(JLabel.CENTER);
+        Dictionary.registerText(title_label, "CDM.SearchTypeManager.Title");
+
         JPanel instructions_panel = new JPanel();
-        title_label = new JLabel("CDM.SearchTypeManager.Title");
-        title_label.setHorizontalAlignment(JLabel.CENTER);
-        instructions_textarea = new JTextArea(Gatherer.dictionary.get("CDM.SearchTypeManager.Instructions"));
+        instructions_textarea = new JTextArea();
         instructions_textarea.setCaretPosition(0);
         instructions_textarea.setEditable(false);
@@ -156 +159 @@
         instructions_textarea.setRows(6);
         instructions_textarea.setWrapStyleWord(true);
+        Dictionary.registerText(instructions_textarea, "CDM.SearchTypeManager.Instructions");
 
         JPanel spacer_panel = new JPanel();
@@ -162 +166 @@
 
         JPanel inner_panel = new JPanel();
-        
-        enable_advanced_searches_checkbox = new JCheckBox("CDM.SearchTypeManager.Enable");
+
+        enable_advanced_searches_checkbox = new JCheckBox();
+        Dictionary.registerText(enable_advanced_searches_checkbox, "CDM.SearchTypeManager.Enable");
 
         JPanel current_search_types_panel = new JPanel();
-        current_search_types_label = new JLabel("CDM.SearchTypeManager.Assigned");
+        current_search_types_label = new JLabel();
+        Dictionary.registerText(current_search_types_label, "CDM.SearchTypeManager.Assigned");
         current_search_types_list = new JList(model);
         current_search_types_list.setVisibleRowCount(3);
@@ -172 +178 @@
         JPanel movement_panel = new JPanel();
 
-        move_up_button = new DoubleImageButton("CDM.Move.Move_Up", Utility.getImage("arrow-up.gif"), Utility.getImage("arrow-up-disabled.gif"));
+        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("CDM.Move.Move_Down", Utility.getImage("arrow-down.gif"), Utility.getImage("arrow-down-disabled.gif"));
+        Dictionary.registerBoth(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);
+        Dictionary.registerBoth(move_down_button, "CDM.Move.Move_Down", "CDM.Move.Move_Down_Tooltip");
 
         JPanel search_type_panel = new JPanel();
-        search_type_label = new JLabel("CDM.SearchTypeManager.SearchType_Selection");
+        search_type_label = new JLabel();
+        Dictionary.registerText(search_type_label, "CDM.SearchTypeManager.SearchType_Selection");
         search_type_combobox = new GComboBox(SEARCH_TYPES);
         search_type_combobox.setBackgroundNonSelectionColor(Gatherer.config.getColor("coloring.editable_background", false));
@@ -191 +200 @@
         search_type_combobox.setTextNonSelectionColor(Gatherer.config.getColor("coloring.workspace_tree_foreground", false));
         search_type_combobox.setTextSelectionColor(Gatherer.config.getColor("coloring.collection_selection_foreground", false));
+        Dictionary.registerTooltip(search_type_combobox, "CDM.SearchTypeManager.SearchType_Selection_Tooltip");
 
         JPanel button_panel = new JPanel();
-        add_button = new JButton("CDM.SearchTypeManager.Add");
+        add_button = new JButton();
         add_button.setEnabled(false);
         add_button.setMnemonic(KeyEvent.VK_A);
-
-        remove_button = new JButton("CDM.SearchTypeManager.Remove");
+        Dictionary.registerBoth(add_button, "CDM.SearchTypeManager.Add", "CDM.SearchTypeManager.Add_Tooltip");
+
+        remove_button = new JButton();
         remove_button.setEnabled(false);
         remove_button.setMnemonic(KeyEvent.VK_R);
+        Dictionary.registerBoth(remove_button, "CDM.SearchTypeManager.Remove", "CDM.SearchTypeManager.Remove_Tooltip");
 
         // Connection
@@ -207 +219 @@
         move_up_button.addActionListener(new MoveListener(true));
         move_down_button.addActionListener(new MoveListener(false));
-        Gatherer.dictionary.register(add_button, null, false);
-        Gatherer.dictionary.register(current_search_types_label, null, false);
-        Gatherer.dictionary.register(enable_advanced_searches_checkbox, null, false);
-        //Gatherer.dictionary.register(instructions_textarea, null, false);
-        Gatherer.dictionary.register(move_up_button, null, false);
-        Gatherer.dictionary.register(move_down_button, null, false);
-        Gatherer.dictionary.register(remove_button, null, false);
-        Gatherer.dictionary.register(search_type_label, null, false);
-        Gatherer.dictionary.register(title_label, null, false);
         remove_button.addActionListener(new RemoveActionListener());
         SearchTypesActionDocumentListener stadl = new SearchTypesActionDocumentListener();
         search_type_combobox.addActionListener(stadl);
         ((JTextField)search_type_combobox.getEditor().getEditorComponent()).getDocument().addDocumentListener(stadl);
+
         // Layout
         instructions_panel.setBorder(BorderFactory.createEmptyBorder(0,0,2,0));
@@ -263 +267 @@
 
     public void destroy() {
-        Gatherer.dictionary.deregister(add_button);
-        Gatherer.dictionary.deregister(current_search_types_label);
-        Gatherer.dictionary.deregister(enable_advanced_searches_checkbox);
-        //Gatherer.dictionary.deregister(instructions_textarea);
-        Gatherer.dictionary.deregister(move_up_button);
-        Gatherer.dictionary.deregister(move_down_button);
-        Gatherer.dictionary.deregister(remove_button);
-        Gatherer.dictionary.deregister(search_type_label);
-        Gatherer.dictionary.deregister(title_label);
     }
     

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

@@ -1 @@
-package org.greenstone.gatherer.collection;
 /**
  *#########################################################################
@@ -36 +35 @@
  *########################################################################
  */
+package org.greenstone.gatherer.collection;
+
 import java.awt.*;
 import java.awt.event.*;
@@ -41 +42 @@
 import javax.swing.*;
 import javax.swing.event.*;
+import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.collection.Collection;
-import org.greenstone.gatherer.collection.CollectionManager;
 import org.greenstone.gatherer.gui.ModalDialog;
 import org.greenstone.gatherer.gui.SimpleMenuBar;
@@ -50 +51 @@
 import org.greenstone.gatherer.util.StaticStrings;
 import org.greenstone.gatherer.util.Utility;
+
 /** This class provides the functionality to delete current collections from the GSDLHOME/collect/ directory. The user chooses the collection from a list, where each entry also displays details about itself, confirms the delete of a collection by checking a checkbox then presses the ok button to actually delete the collection.
  * @author John Thompson, Greenstone Digital Library, University of Waikato
@@ -60 +62 @@
     /** The model behind the list. */
     private DefaultListModel list_model = null;
-    /** A reference to ourself so any inner-classes get dispose of us. */
+    /** A reference to ourself so any inner-classes can dispose of us. */
     private DeleteCollectionPrompt prompt = null;
     /** The close button, which exits the prompt without deleting anything. */
@@ -82 +84 @@
     /** The size of the delete prompt screen. */
     public static final Dimension SIZE = new Dimension(500, 500);
+
     /** Constructor.
      * @see org.greenstone.gatherer.collection.DeleteCollectionPrompt.CloseButtonListener
@@ -90 +93 @@
     public DeleteCollectionPrompt() {
     super(Gatherer.g_man);
-    this.close_button = new JButton(get("General.Close", null));
-    this.confirmation = new JCheckBox(get("DeleteCollectionPrompt.Confirm_Delete", null));
-    this.details = new JTextArea();
-    this.details_label = new JLabel(get("DeleteCollectionPrompt.Collection_Details", null));
-    this.list = new JList();
-    this.list_label = new JLabel(get("DeleteCollectionPrompt.Collection_List", null));
-    this.list_model = new DefaultListModel();
-    this.ok_button = new JButton(get("General.OK", null));
-    this.prompt = this;
-    this.setModal(true);
-    this.setSize(SIZE);
-    this.setTitle(get("DeleteCollectionPrompt.Title", null));
-    this.setJMenuBar(new SimpleMenuBar("0")); // need to find an appropriate help page to open at
+    close_button = new JButton();
+    Dictionary.setText(close_button, "General.Close");
+    confirmation = new JCheckBox();
+    Dictionary.setText(confirmation, "DeleteCollectionPrompt.Confirm_Delete");
+    details = new JTextArea();
+    details.setFont(Gatherer.config.getFont("general.tooltip_font", false));
+    Dictionary.setText(details, "DeleteCollectionPrompt.No_Collection");
+    details_label = new JLabel();
+    Dictionary.setText(details_label, "DeleteCollectionPrompt.Collection_Details");
+    list = new JList();
+    list_label = new JLabel();
+    Dictionary.setText(list_label, "DeleteCollectionPrompt.Collection_List");
+    list_model = new DefaultListModel();
+    ok_button = new JButton();
+    Dictionary.setText(ok_button, "General.OK");
+    prompt = this;
+    setModal(true);
+    setSize(SIZE);
+    // setTitle();
+    Dictionary.setText(this, "DeleteCollectionPrompt.Title");
+
+    setJMenuBar(new SimpleMenuBar("0")); // need to find an appropriate help page to open at
     close_button.addActionListener(new CloseButtonListener());
     confirmation.addActionListener(new ConfirmationCheckBoxListener());
     confirmation.setEnabled(false);
     confirmation.setSelected(false);
-    details.setFont(Gatherer.config.getFont("general.tooltip_font", false));
-    details.setText(get("DeleteCollectionPrompt.No_Collection", null));
     list.addListSelectionListener(new CollectionListListener());
     list.clearSelection();
@@ -117 +127 @@
     scanForCollections();
     }
+
     /** Destructor. */
     public void destroy() {
@@ -129 +140 @@
     prompt = null;
     }
+
     /** This method causes the modal prompt to be displayed. 
-     * returns true if it has deleted the collection that is currently open*/
+     * returns true if it has deleted the collection that is currently open */
     public boolean display() {
     // Central pane
@@ -176 +188 @@
     
     }
+
     /** Shows a delete complete prompt. 
-      * @param success A <strong>boolean</strong> indicating if the collection was successfully deleted.
-      * @see org.greenstone.gatherer.collection.Collection
-      */
+     * @param success A <strong>boolean</strong> indicating if the collection was successfully deleted.
+     * @see org.greenstone.gatherer.collection.Collection
+     */
     public void resultPrompt(boolean success) {
     args = new String[1];
     args[0] = collection.getName();
-    if(success) {
-        JOptionPane.showMessageDialog(prompt,get("DeleteCollectionPrompt.Successful_Delete", args),get("DeleteCollectionPrompt.Successful_Title", null),JOptionPane.INFORMATION_MESSAGE);
+    if (success) {
+        JOptionPane.showMessageDialog(prompt,Dictionary.newget("DeleteCollectionPrompt.Successful_Delete", args),Dictionary.newget("DeleteCollectionPrompt.Successful_Title"),JOptionPane.INFORMATION_MESSAGE);
     }
     else {
-        JOptionPane.showMessageDialog(prompt,get("DeleteCollectionPrompt.Failed_Delete", args),get("DeleteCollectionPrompt.Failed_Title", null),JOptionPane.WARNING_MESSAGE);
-    }
-    }
-    /** Retrieves a phrase from the <strong>Dictionary</strong> in <strong>Gatherer</strong>.
-      * @param key A <strong>String</strong> used to match against a specific phrase in the dictionary.
-      * @see org.greenstone.gatherer.Dictionary
-      * @see org.greenstone.gatherer.Gatherer
-      */
-    private String get(String key, String args[]) {
-    if(key.indexOf(".") == -1) {
-        key = "DeleteCollectionPrompt." + key;
-    }
-    return Gatherer.dictionary.get(key, args);
-    }
+        JOptionPane.showMessageDialog(prompt,Dictionary.newget("DeleteCollectionPrompt.Failed_Delete", args),Dictionary.newget("DeleteCollectionPrompt.Failed_Title"),JOptionPane.WARNING_MESSAGE);
+    }
+    }
+
 
     /** Method to scan the collect directory retrieving and reloading each collection it finds, while building the list of known collections.
-      * @see org.greenstone.gatherer.Configuration
-      * @see org.greenstone.gatherer.Gatherer
-      * @see org.greenstone.gatherer.util.ArrayTools
-      * @see org.greenstone.gatherer.util.Utility
-      */
+     * @see org.greenstone.gatherer.Configuration
+     * @see org.greenstone.gatherer.Gatherer
+     * @see org.greenstone.gatherer.util.ArrayTools
+     * @see org.greenstone.gatherer.util.Utility
+     */
     private void scanForCollections() {
     // Start at the collect dir.
@@ -232 +235 @@
     // Otherwise the collect directory doesn't actually exist, so there ain't much we can do.
     }
+
     /** A button listener implementation, which listens for actions on the close button and disposes of the dialog when detected. */
     private class CloseButtonListener 
@@ -237 +241 @@
     /** Any implementation of ActionListener must include this method so we can be informed when the button is actioned.
      * @param event An <strong>ActionEvent</strong> containing all the relevant information garnered from the event itself.
-            */
+     */
     public void actionPerformed(ActionEvent event) {
         // Ask the collection manager to refresh the 'Greenstone Collections' folder
@@ -245 +249 @@
     }
     }
+
     /** This private class listens for selection events in from the list and then displays the appropriate details for that collection.
-      */
+     */
     private class CollectionListListener 
     implements ListSelectionListener {
@@ -264 +269 @@
         args[3] = collection.getMaintainer();
         args[4] = collection.getDescription();
-        details.setText(get("DeleteCollectionPrompt.Details", args));
+        Dictionary.setText(details, "DeleteCollectionPrompt.Details", args);
         details.setCaretPosition(0);
         }
         else {
         confirmation.setEnabled(false);
-        details.setText(get("DeleteCollectionPrompt.No_Collection", null));
-        }
-    }
-    }
-    /** A check box listener so we can tell if the users selected confirm. */
+        Dictionary.setText(details, "DeleteCollectionPrompt.No_Collection");
+        }
+    }
+    }
+
+    /** A check box listener so we can tell if the user has confirmed the deletion */
     private class ConfirmationCheckBoxListener
     implements ActionListener {
     /** Any implementation of ActionListener must include this method so we can be informed when the button is actioned.
      * @param event An <strong>ActionEvent</strong> containing all the relevant information garnered from the event itself.
-            */
+     */
     public void actionPerformed(ActionEvent event) {
-        if(confirmation.isSelected()) {
-        ok_button.setEnabled(true);
-        }
-        else {
-        ok_button.setEnabled(false);
-        }
+        // OK button is only enabled if the confirmation check box is ticked
+        ok_button.setEnabled(confirmation.isSelected());
     }
     }         
+
     /** The OK button listener implementation. */
     private class OKButtonListener 
@@ -314 +317 @@
         resultPrompt(true);
         list_model.removeElement(collection);
-        details.setText(get("DeleteCollectionPrompt.No_Collection", null));
+        Dictionary.setText(details, "DeleteCollectionPrompt.No_Collection");
         confirmation.setEnabled(false);
         confirmation.setSelected(false);
@@ -355 +358 @@
         return config.getMaintainer();
     }
+
     public String toString() {
-        return config.getName();
-        
+        return config.getName();        
     }
     }

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

@@ -94 +94 @@
     }
     /** Displays the prompt by first building the controls, then waits for a user selection.
-      * @param name The name of the current collection as a <strong>String</strong>.
-      */
+     * @param name The name of the current collection as a <strong>String</strong>.
+     */
     public int getUserOption(String name) {
     JPanel content_pane = (JPanel) this.getContentPane();
@@ -145 +145 @@
     }
     /** Method to retrieve a phrase from the dictionary based of a key.
-      * @param key A <strong>String</strong> used to find the correct phrase.
-      * @return A <strong>String</strong> containing the correct phrase with the correct formatting.
-      */
+     * @param key A <strong>String</strong> used to find the correct phrase.
+     * @return A <strong>String</strong> containing the correct phrase with the correct formatting.
+     */
     private String get(String key) {
     return get(key, null);
     }
     /** Method to retrieve a phrase from the dictionary based of a key and including arguments.
-      * @param key A <strong>String</strong> used to find the correct phrase.
-      * @param args A <strong>String[]</strong> of arguments used in formatting and filling out the phrase.
-      * @return A <strong>String</strong> containing the correct phrase with the correct formatting.
-      */
+     * @param key A <strong>String</strong> used to find the correct phrase.
+     * @param args A <strong>String[]</strong> of arguments used in formatting and filling out the phrase.
+     * @return A <strong>String</strong> containing the correct phrase with the correct formatting.
+     */
     private String get(String key, String args[]) {
     if(key.indexOf('.') == -1) {
@@ -167 +167 @@
     /** Any extension of KeyAdapter can override this method so that we can be informed whenever a key is released (ie after a keyTyped event). In this case we map the key press to an appropriate click on one of the buttons (not necessarily the one the key release was detected on).
      * @param event A <strong>KeyEvent</strong> containing details about the key release event.
-            */
+     */
     public void keyReleased(KeyEvent event) {
         if(event.getKeyCode() == KeyEvent.VK_Y) {

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

@@ -281 +281 @@
                 }
                 args = null;
-                //file_status.setToolTipText(Utility.formatHTMLWidth(file_status.getText(), 80));
+
                 // If source is a file
                 if(source_file.isFile()) {
@@ -461 +461 @@
                 file_status.setText(get("FileActions.Deleting", args));
                 args = null;
-                //file_status.setToolTipText(Utility.formatHTMLWidth(file_status.getText(), 80));
+
                 // Remove its metadata
                 ArrayList metadatum = null;

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

@@ -1 @@
-package org.greenstone.gatherer.gui;
 /**
  *#########################################################################
@@ -36 +35 @@
  *########################################################################
  */
+package org.greenstone.gatherer.gui;
+
 import calpa.html.*;
 import java.awt.*;
@@ -88 +89 @@
     back_button = new JButton(Utility.getImage("back.gif"));
     back_button.setEnabled(false);
-    Dictionary.setTooltip(back_button, "Browser.Back");
+    Dictionary.registerTooltip(back_button, "Browser.Back");
 
     // refresh_button = new JButton(Utility.getImage("reload.gif"));
     // refresh_button.setEnabled(false);
-    // Dictionary.setTooltip(refresh_button, "Browser.Reload");
+    // Dictionary.registerTooltip(refresh_button, "Browser.Reload");
 
     bookmarks_button = new JButton(Utility.getImage("bookmark.gif"));
     bookmarks_button.setEnabled(false);
-    Dictionary.setTooltip(bookmarks_button, "Browser.Bookmarks");
+    Dictionary.registerTooltip(bookmarks_button, "Browser.Bookmarks");
 
     home_button = new JButton(Utility.getImage("home.gif"));
-    Dictionary.setTooltip(home_button, "Browser.Home");
+    Dictionary.registerTooltip(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");
+    Dictionary.registerTooltip(address_field, "Browser.Address_Tooltip");
 
     JPanel right_button_pane = new JPanel();
     go_button = new JButton(Utility.getImage("go.gif"));
-    Dictionary.setTooltip(go_button, "Browser.Go");
+    Dictionary.registerTooltip(go_button, "Browser.Go");
 
     stop_button = new JButton(Utility.getImage("stop.gif"));
     stop_button.setEnabled(false);
-    Dictionary.setTooltip(stop_button, "Browser.Stop");
+    Dictionary.registerTooltip(stop_button, "Browser.Stop");
 
     forward_button = new JButton(Utility.getImage("forward.gif"));
     forward_button.setEnabled(false);
-    Dictionary.setTooltip(forward_button, "Browser.Forward");
+    Dictionary.registerTooltip(forward_button, "Browser.Forward");
 
     // Calpa Pane stuff
@@ -122 +123 @@
     // Status bar
     status_label = new JLabel();
-    Dictionary.setText(status_label, "Browser.Ready");
+    Dictionary.registerText(status_label, "Browser.Ready");
 
     // Connection
@@ -238 +239 @@
     public void clear() {
         data.removeAllElements();
-                // Re-add the "Add Bookmark" entry.
-                //add
+        // Re-add the "Add Bookmark" entry.
+        //add
     }
 
     public void load() {
-                // Clear existing
+        // Clear existing
         data.removeAllElements();
-                // Determine the file to load from...
+        // Determine the file to load from...
         File bookmarks = new File(Gatherer.c_man.getCollectionDirectory() + BOOKMARKS_FILE);
         if(bookmarks.exists()) {
@@ -290 +291 @@
     }
     }
-     
+
     private class GoButtonListener
     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());
@@ -355 +356 @@
         args = new String[1];
         args[0] = url.toString();
-        Dictionary.setText(status_label, "Browser.Follow");
+        Dictionary.registerText(status_label, "Browser.Follow");
         args = null;
     }
@@ -375 +376 @@
         args = new String[1];
         args[0] = url.toString();
-        Dictionary.setText(status_label, "Browser.Loading", args);
+        Dictionary.registerText(status_label, "Browser.Loading", args);
         args = null;
         break;
@@ -396 +397 @@
         stop_button.setEnabled(false);
         // Rendering complete.
-        Dictionary.setText(status_label, "Browser.Ready");
+        Dictionary.registerText(status_label, "Browser.Ready");
         go_button.setEnabled(true);
         stop_button.setEnabled(false);

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

@@ -123 +123 @@
     /** The initial size of the trees. */
     static private Dimension TREE_SIZE   = new Dimension(400, 430);
+
     /* Constructor.
      * @param tree_sync Ensures that expansion events between like trees are synchronized.
@@ -138 +139 @@
     stop_action.addActionListener(this);
     stop_action.setEnabled(false);
-    Dictionary.setBoth(stop_action, "Collection.Stop", "Collection.Stop_Tooltip");
+    Dictionary.registerBoth(stop_action, "Collection.Stop", "Collection.Stop_Tooltip");
 
     new_folder = new JButton(Utility.getImage("folder.gif"));
@@ -145 +146 @@
     new_folder.setMinimumSize(MIN_SIZE);
     new_folder.setPreferredSize(MIN_SIZE);
-    Dictionary.setTooltip(new_folder, "Collection.New_Folder_Tooltip");
+    Dictionary.registerTooltip(new_folder, "Collection.New_Folder_Tooltip");
     }
 
@@ -219 +220 @@
         args = new String[1];
         args[0] = Gatherer.c_man.getCollection().getName();
-        Dictionary.setText(collection_label, "Collection.Collection", args);
+        Dictionary.registerText(collection_label, "Collection.Collection", args);
         collection_tree.setModel(collection);
         collection_tree.repaint();
@@ -227 +228 @@
         String args[] = new String[1];
         args[0] = Dictionary.newget("Collection.No_Collection");
-        Dictionary.setText(collection_label, "Collection.Collection", args);
+        Dictionary.registerText(collection_label, "Collection.Collection", args);
         args = null;
         collection_tree.setModel(new DefaultTreeModel(new DefaultMutableTreeNode("Error")));
@@ -234 +235 @@
     collection_tree.setEnabled(ready);
     collection_filter.setEnabled(ready);
-    Dictionary.setTooltip(collection_filter.getComboBox(), "Collection.Filter_Tooltip");
+    Dictionary.registerTooltip(collection_filter.getComboBox(), "Collection.Filter_Tooltip");
 
     // Change the label at the top of collection tree.
@@ -265 +266 @@
     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");
+    Dictionary.registerText(workspace_label, "Collection.Workspace");
 
     workspace = Gatherer.c_man.getWorkspace();
@@ -293 +294 @@
     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");
+    Dictionary.registerTooltip(fcb, "Collection.Filter_Tooltip");
     fcb = null;
 
@@ -306 +307 @@
     collection_label = new JLabel();
     collection_label.setOpaque(true);
-    Dictionary.setText(collection_label, "Collection.Collection", args);
+    Dictionary.registerText(collection_label, "Collection.Collection", args);
 
     collection = Gatherer.c_man.getRecordSet();
@@ -375 +376 @@
     bin_button.setMinimumSize(MIN_SIZE);
     bin_button.setPreferredSize(MIN_SIZE);
-    Dictionary.setTooltip(bin_button, "Collection.Delete_Tooltip");
+    Dictionary.registerTooltip(bin_button, "Collection.Delete_Tooltip");
     group.add(bin_button);
 
@@ -506 +507 @@
 
     /** Used to set the enabled state, and hence the colouring, of the two tree labels.
-      * @param label The <strong>JLabel</strong> to be affected.
-      * @param state <i>true</i> for enabled, i.e. when a collection is ready, <i>false</i> otherwise.
-      * @param foreground The <strong>Color</strong> to make the foreground text of the label when enabled.
-      * @param background The <strong>Color</strong> to make the background of the label when enabled.
-      */
+     * @param label The <strong>JLabel</strong> to be affected.
+     * @param state <i>true</i> for enabled, i.e. when a collection is ready, <i>false</i> otherwise.
+     * @param foreground The <strong>Color</strong> to make the foreground text of the label when enabled.
+     * @param background The <strong>Color</strong> to make the background of the label when enabled.
+     */
     private void setEnabled(JLabel label, boolean state, Color foreground, Color background) {
     ///ystem.err.println("Setting the label color to state " + state);
@@ -524 +525 @@
     ///ystem.err.println("Color is now " + label.getBackground());
     }
+
     /** When a user right-clicks within the trees on the collection pane view they are presented with a small popup menu of context based options. This class provides such functionality.
-      */
+     */
     private class GPopupMenu
     extends JPopupMenu

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

@@ -1 @@
-package org.greenstone.gatherer.gui;
 /**
  *#########################################################################
@@ -36 +35 @@
  *########################################################################
  */
+package org.greenstone.gatherer.gui;
+
 import java.awt.*;
 import java.awt.event.*;
@@ -43 +44 @@
 import javax.swing.text.*;
 import javax.swing.tree.*;
+import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.collection.BuildOptions;
@@ -193 +195 @@
     Gatherer.c_man.registerBuildMonitor(build_monitor);
 
-    // Buttons.
-    build_button = new JButton(get("CreatePane.Build_Collection"));
+    // Buttons
+    build_button = new JButton();
     build_button.addActionListener(new BuildButtonListener());
     build_button.setPreferredSize(BUTTON_SIZE);
-    build_button.setToolTipText(get("CreatePane.Build_Collection_Tooltip"));
-    cancel_button = new JButton(get("CreatePane.Cancel_Build"));
+    Dictionary.registerBoth(build_button, "CreatePane.Build_Collection", "CreatePane.Build_Collection_Tooltip");
+
+    cancel_button = new JButton();
     cancel_button.addActionListener(new CancelButtonListener());
     cancel_button.setEnabled(false);
     cancel_button.setPreferredSize(BUTTON_SIZE);
-    cancel_button.setToolTipText(get("CreatePane.Cancel_Build_Tooltip"));
-    }
+    Dictionary.registerBoth(cancel_button, "CreatePane.Cancel_Build", "CreatePane.Cancel_Build_Tooltip");
+    }
+
     /** This method is invoked at any time there has been a significant change in the collection, such as saving, loading or creating.
-      * @param ready A <strong>boolean</strong> indicating if a collection is currently available.
-      * @see org.greenstone.gatherer.Gatherer
-      * @see org.greenstone.gatherer.collection.CollectionManager
-      * @see org.greenstone.gatherer.gui.BuildOptions
-      * @see org.greenstone.gatherer.gui.OptionsPane
-      */
+     * @param ready A <strong>boolean</strong> indicating if a collection is currently available.
+     * @see org.greenstone.gatherer.Gatherer
+     * @see org.greenstone.gatherer.collection.CollectionManager
+     * @see org.greenstone.gatherer.gui.BuildOptions
+     * @see org.greenstone.gatherer.gui.OptionsPane
+     */
     public void collectionChanged(boolean ready) {
     ///ystem.err.println("Collection changed... ");
@@ -223 +227 @@
     }
     /** This method is called to actually layout the components.
-      * @see org.greenstone.gatherer.Configuration
-      * @see org.greenstone.gatherer.Gatherer
-      */
+     * @see org.greenstone.gatherer.Configuration
+     * @see org.greenstone.gatherer.Gatherer
+     */
     public void display() {
 
@@ -297 +301 @@
     }
     /** This method is called whenever the 'Create' tab is selected from the view bar. It allows this view to perform any preactions required prior to display. In this case this entails gathering up to date information about the status of the collection including number of documents etc.
-      * @see org.greenstone.gatherer.Gatherer
-      * @see org.greenstone.gatherer.collection.CollectionManager
-      * @see org.greenstone.gatherer.gui.CreatePane.OptionTree
-      */
+     * @see org.greenstone.gatherer.Gatherer
+     * @see org.greenstone.gatherer.collection.CollectionManager
+     * @see org.greenstone.gatherer.gui.CreatePane.OptionTree
+     */
     public void gainFocus() {
     if(!processing) {
@@ -311 +315 @@
     }
     /** Method to acquire the progress monitor associated with builds.
-      * @return The build <strong>GShellProgressMonitor</strong>.
-      */
+     * @return The build <strong>GShellProgressMonitor</strong>.
+     */
     public GShellProgressMonitor getBuildProgress() {
     return build_monitor;
     }
     /** Method to acquire the progress monitor associated with copying.
-      * @return The copying <strong>GShellProgressMonitor</strong>.
-      */
+     * @return The copying <strong>GShellProgressMonitor</strong>.
+     */
     public GShellProgressMonitor getCopyProgress() {
     return copy_monitor;
     }
     /** Method to acquire the progress monitor associated with import.
-      * @return The import <strong>GShellProgressMonitor</strong>.
-      */
+     * @return The import <strong>GShellProgressMonitor</strong>.
+     */
     public GShellProgressMonitor getImportProgress() {
     return import_monitor;
@@ -347 +351 @@
 
     /** All implementation of GShellListener must include this method so the listener can be informed when a GShell begins its task. Implementation side-effect, not actually used.
-      * @param event A <strong>GShellEvent</strong> that contains details of the initial state of the <strong>GShell</strong> before task comencement.
-      */
+     * @param event A <strong>GShellEvent</strong> that contains details of the initial state of the <strong>GShell</strong> before task comencement.
+     */
     public synchronized void processBegun(GShellEvent event) {
     // We don't care. We'll get a more acurate start from the progress monitors.
     }
     /** All implementation of GShellListener must include this method so the listener can be informed when a GShell completes its task.
-      * @param event A <strong>GShellEvent</strong> that contains details of the final state of the <strong>GShell</strong> after task completion.
-      */
+     * @param event A <strong>GShellEvent</strong> that contains details of the final state of the <strong>GShell</strong> after task completion.
+     */
     public synchronized void processComplete(GShellEvent event) {
     if(event.getStatus() == GShell.OK) {
@@ -378 +382 @@
     }
     /** This method retrieves a phrase from the dictionary based apon the key.
-      * @param key A <strong>String</strong> used as a reference to the correct phrase.
-      * @return A phrase, matching the key, as a <strong>String</strong>.
-      */
+     * @param key A <strong>String</strong> used as a reference to the correct phrase.
+     * @return A phrase, matching the key, as a <strong>String</strong>.
+     */
     private String get(String key) {
     return get(key, null);
     }
     /** This method retrieves a phrase from the dictionary based apon the key and arguments.
-      * @param key A <strong>String</strong> used as a reference to the correct phrase.
-      * @param args A <strong>String[]</strong> whose contents are often substituted into the phrase before it is returned.
-      * @return A phrase, matching the key and constructed using the arguments, as a <strong>String</strong>.
-      * @see org.greenstone.gatherer.Dictionary
-      * @see org.greenstone.gatherer.Gatherer
-      */
+     * @param key A <strong>String</strong> used as a reference to the correct phrase.
+     * @param args A <strong>String[]</strong> whose contents are often substituted into the phrase before it is returned.
+     * @return A phrase, matching the key and constructed using the arguments, as a <strong>String</strong>.
+     * @see org.greenstone.gatherer.Dictionary
+     * @see org.greenstone.gatherer.Gatherer
+     */
     private String get(String key, String args[]) {
     if(key.indexOf(".") == -1) {
@@ -397 +401 @@
     return Gatherer.dictionary.get(key, args);
     }
+
     /** This class serves as the listener for actions on the build button. */
     private class BuildButtonListener
@@ -502 +507 @@
     }
     /** Any implementation of TreeSelectionListener must include this method to allow this listener to know when the selection has changed. Here we swap the options view depending on the selected OptionTreeNode.
-            * @param event A <Strong>TreeSelectionEvent</strong> which contains all the information garnered when the event occured.
-            * @see org.greenstone.gatherer.gui.CreatePane.OptionTreeNode
-            */
+     * @param event A <Strong>TreeSelectionEvent</strong> which contains all the information garnered when the event occured.
+     * @see org.greenstone.gatherer.gui.CreatePane.OptionTreeNode
+     */
     public void valueChanged(TreeSelectionEvent event) {
         TreePath path = null;
@@ -561 +566 @@
     /** Constructor.
      * @param title The <strong>String</strong> which serves as this nodes title.
-            */
+     */
     public OptionTreeNode(String title) {
         super();
@@ -567 +572 @@
     }
     /** This method compares two nodes for ordering.
-            * @param obj The <strong>Object</strong> to compare to.
-            * @return An <strong>int</strong> of one of the possible values -1, 0 or 1 indicating if this node is less than, equal to or greater than the target node respectively.
-            */
+     * @param obj The <strong>Object</strong> to compare to.
+     * @return An <strong>int</strong> of one of the possible values -1, 0 or 1 indicating if this node is less than, equal to or greater than the target node respectively.
+     */
     public int compareTo(Object obj) {
         return title.compareTo(obj.toString());
     }
     /** This method checks if two nodes are equivelent.
-            * @param obj The <strong>Object</strong> to be tested against.
-            * @return A <strong>boolean</strong> which is <i>true</i> if the objects are equal, <i>false</i> otherwise.
-            */
+     * @param obj The <strong>Object</strong> to be tested against.
+     * @return A <strong>boolean</strong> which is <i>true</i> if the objects are equal, <i>false</i> otherwise.
+     */
     public boolean equals(Object obj) {
         if(compareTo(obj) == 0) {
@@ -596 +601 @@
     
     /** Method to translate this node into a textual representation.
-            * @return A <strong>String</strong> which in this case is the title.
-            */
+     * @return A <strong>String</strong> which in this case is the title.
+     */
     public String toString() {
         return title;
@@ -614 +619 @@
                               int row,
                               boolean hasFocus) {
-        
+   
         super.getTreeCellRendererComponent(tree, value, sel,
                            expanded, leaf, row,
@@ -626 +631 @@
         return this;
     }
-    
-    }
-
+    }
 }

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

@@ -48 +48 @@
 import javax.swing.text.*;
 import org.greenstone.gatherer.Configuration;
+import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.collection.Collection;
@@ -381 +382 @@
     System.gc();
     }
+
     /** Enabled events on the window to be trapped, creates all the visual components, then builds the tab and other layouts.
-      */
+     */
     public void display() {
     content_pane = (JPanel) this.getContentPane();
@@ -472 +474 @@
         }
 
-        Gatherer.dictionary.register(tab_pane, null, false);
+        Dictionary.register(tab_pane);
         content_pane.add(tab_pane, BorderLayout.CENTER);
         // Drive a sessionReady event to update all controls to reflect current collection status.

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

@@ -7 +7 @@
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
-import org.greenstone.gatherer.gui.TextFieldLabel;
 import org.greenstone.gatherer.msm.MSMUtils;
 import org.greenstone.gatherer.util.Utility;
@@ -51 +50 @@
     JLabel name_label = new JLabel(get("LockFileDialog.Name"));
     name_label.setPreferredSize(LABEL_SIZE);
-    TextFieldLabel name_field = new TextFieldLabel(name);
+    JTextField name_field = new JTextField(name);
+    name_field.setEditable(false);
     name_field.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
     JPanel person_pane = new JPanel();
     JLabel person_label = new JLabel(get("LockFileDialog.User"));
     person_label.setPreferredSize(LABEL_SIZE);
-    TextFieldLabel person_field = new TextFieldLabel(getValue("User"));
+    JTextField person_field = new JTextField(getValue("User"));
+    person_field.setEditable(false);
     person_field.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
     JPanel machine_pane = new JPanel();
     JLabel machine_label = new JLabel(get("LockFileDialog.Machine"));
     machine_label.setPreferredSize(LABEL_SIZE);
-    TextFieldLabel machine_field = new TextFieldLabel(getValue("Machine"));
+    JTextField machine_field = new JTextField(getValue("Machine"));
+    machine_field.setEditable(false);
     machine_field.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
     JPanel created_pane = new JPanel();
     JLabel created_label = new JLabel(get("LockFileDialog.Date"));
     created_label.setPreferredSize(LABEL_SIZE);
-    TextFieldLabel created_field = new TextFieldLabel(getValue("Date"));
+    JTextField created_field = new JTextField(getValue("Date"));
+    created_field.setEditable(false);
     created_field.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
     JLabel central_label = new JLabel(get("LockFileDialog.Lockfile_Message_Two"));

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

@@ -144 +144 @@
     add.setMnemonic(KeyEvent.VK_A);
     add.setPreferredSize(BUTTON_SIZE);
-    Dictionary.setBoth(add, "MetaEdit.Accumulate", "MetaEdit.Accumulate_Tooltip");
+    Dictionary.registerBoth(add, "MetaEdit.Accumulate", "MetaEdit.Accumulate_Tooltip");
 
     update = new JButton();
@@ -151 +151 @@
     update.setMnemonic(KeyEvent.VK_P);
     update.setPreferredSize(BUTTON_SIZE);
-    Dictionary.setBoth(update, "MetaEdit.Overwrite", "MetaEdit.Overwrite_Tooltip");
+    Dictionary.registerBoth(update, "MetaEdit.Overwrite", "MetaEdit.Overwrite_Tooltip");
 
     remove = new JButton();
@@ -158 +158 @@
     remove.setMnemonic(KeyEvent.VK_R);
     remove.setPreferredSize(BUTTON_SIZE);
-    Dictionary.setBoth(remove, "MetaEdit.Remove", "MetaEdit.Remove_Tooltip");
+    Dictionary.registerBoth(remove, "MetaEdit.Remove", "MetaEdit.Remove_Tooltip");
 
     expand = new JButton();
@@ -165 +165 @@
     expand.setMnemonic(KeyEvent.VK_E);
     expand.setPreferredSize(new Dimension(25, 25));
-    Dictionary.setBoth(expand, "MetaEdit.Expand", "MetaEdit.Expand_Tooltip");
+    Dictionary.registerBoth(expand, "MetaEdit.Expand", "MetaEdit.Expand_Tooltip");
 
     tree = new GValueTree(CONTROL_SIZE.width, CONTROL_SIZE.height);
@@ -301 +301 @@
         String[] args = new String[1];
         args[0] = Gatherer.c_man.getCollection().getName();
-        Dictionary.setText(collection_label, "Collection.Collection", args);
+        Dictionary.registerText(collection_label, "Collection.Collection", args);
         // Update label coloring.
         collection_label.setBackground(Gatherer.config.getColor("coloring.collection_heading_background", false));
@@ -320 +320 @@
     }
     else {
-        Dictionary.setText(collection_label, "Collection.No_Collection");
+        Dictionary.registerText(collection_label, "Collection.No_Collection");
         collection_label.setBackground(Color.lightGray);
         collection_label.setForeground(Color.black);
@@ -353 +353 @@
     ///atherer.println("\tCreating collection_label");
     collection_label = new JLabel();
-    Dictionary.setText(collection_label, "Collection.Collection");
+    Dictionary.registerText(collection_label, "Collection.Collection");
     collection_label.setOpaque(true);
 
@@ -384 +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");
+    Dictionary.registerTooltip(fcb, "Collection.Filter_Tooltip");
     fcb = null;
 
@@ -419 +419 @@
     table_label.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
     table_label.setEditable(false);
-    Dictionary.setText(table_label, "MetaEdit.No_File");
+    Dictionary.registerText(table_label, "MetaEdit.No_File");
 
     card_layout = new CardLayout();
@@ -435 +435 @@
     no_file_message.setOpaque(false);
     no_file_message.setVerticalAlignment(JLabel.CENTER);
-    Dictionary.setText(no_file_message, "MetaEdit.No_File");
+    Dictionary.registerText(no_file_message, "MetaEdit.No_File");
 
     JLabel no_metadata_message = new JLabel();
@@ -441 +441 @@
     no_metadata_message.setOpaque(false);
     no_metadata_message.setVerticalAlignment(JLabel.CENTER);
-    Dictionary.setText(no_metadata_message, "MetaEdit.No_Metadata");
+    Dictionary.registerText(no_metadata_message, "MetaEdit.No_Metadata");
 
     JPanel table_pane_one = new JPanel();
@@ -490 +490 @@
     tools_off_label.setOpaque(false);
     tools_off_label.setVerticalAlignment(JLabel.CENTER);
-    Dictionary.setText(tools_off_label, "MetaEdit.No_Metadata_Element");
+    Dictionary.registerText(tools_off_label, "MetaEdit.No_Metadata_Element");
 
     JPanel tools_on_pane = new JPanel();
@@ -740 +740 @@
     else {
         records = null;
-        Dictionary.setText(table_label, "MetaEdit.No_File");
+        Dictionary.registerText(table_label, "MetaEdit.No_File");
 
         // Remove old model from msm
@@ -1128 +1128 @@
         String[] args = new String[1];
         args[0] = selected_metadata_element.toString();
-        Dictionary.setText(extracted_message, "MetaEdit.AutoMessage", args);
+        Dictionary.registerText(extracted_message, "MetaEdit.AutoMessage", args);
         card_layout.show(this, NONE);
         card_showing = NONE;

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

@@ -1 @@
-package org.greenstone.gatherer.gui;
 /**
  *#########################################################################
@@ -26 +25 @@
  *########################################################################
  */
+package org.greenstone.gatherer.gui;
+
 import java.awt.*;
 import java.awt.event.*;
 import java.io.File;
 import javax.swing.*;
+import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
-import org.greenstone.gatherer.gui.TextFieldLabel;
 import org.greenstone.gatherer.gui.SimpleMenuBar;
 import org.greenstone.gatherer.gui.ModalDialog;
@@ -78 +79 @@
     // Setup
     this.setSize(SIZE);
-    this.setTitle("MetaEditPrompt.Title");
+    Dictionary.setText(this, "MetaEditPrompt.Title");
 
     if (type.equals(ADD_PROMPT)) {
@@ -92 +93 @@
     // Creation
     JPanel content_pane = (JPanel)this.getContentPane();
-    JLabel title_label = new JLabel(type);
+    JLabel title_label = new JLabel();
+    Dictionary.setText(title_label, type);
 
     JPanel details_pane = new JPanel();
     JPanel filename_panel = new JPanel();
-    JLabel filename_label = new JLabel("MetaEditPrompt.File");
+    JLabel filename_label = new JLabel();
     filename_label.setPreferredSize(LABEL_SIZE);
-    TextFieldLabel filename_field = new TextFieldLabel(Utility.trimCenter(file.getAbsolutePath(), 120));
+    Dictionary.setText(filename_label, "MetaEditPrompt.File");
+    JTextField filename_field = new JTextField(Utility.trimCenter(file.getAbsolutePath(), 120));
+    filename_field.setEditable(false);
     filename_field.setFont(Gatherer.config.getFont("general.tooltip_font", false));
     filename_field.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
     JPanel element_panel = new JPanel();
-    JLabel element_label = new JLabel("MetaEditPrompt.Element");
+    JLabel element_label = new JLabel();
     element_label.setPreferredSize(LABEL_SIZE);
-    TextFieldLabel element_field = new TextFieldLabel(element); 
+    Dictionary.setText(element_label, "MetaEditPrompt.Element");
+    JTextField element_field = new JTextField(element); 
+    element_field.setEditable(false);
     element_field.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
     JPanel current_value_panel = new JPanel();
-    JLabel current_value_label = new JLabel("MetaEditPrompt.Current_Value");
+    JLabel current_value_label = new JLabel();
     current_value_label.setPreferredSize(LABEL_SIZE);
-    TextFieldLabel current_value_field = new TextFieldLabel(current_value);
+    Dictionary.setText(current_value_label, "MetaEditPrompt.Current_Value");
+    JTextField current_value_field = new JTextField(current_value);
+    current_value_field.setEditable(false);
     current_value_field.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
     JPanel new_value_panel = new JPanel();
-    JLabel new_value_label = new JLabel("MetaEditPrompt.New_Value");
+    JLabel new_value_label = new JLabel();
     new_value_label.setPreferredSize(LABEL_SIZE);
-    TextFieldLabel new_value_field = new TextFieldLabel(new_value, (type == ADD_PROMPT || type == UPDATE_PROMPT));
+    Dictionary.setText(new_value_label, "MetaEditPrompt.New_Value");
+    JTextField new_value_field = new JTextField(new_value); // , (type == ADD_PROMPT || type == UPDATE_PROMPT));
+    new_value_field.setEditable(false);
     new_value_field.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
     JPanel buttons_pane = new JPanel();
 
-    accumulate = new JButton("MetaEdit.Accumulate");
+    accumulate = new JButton();
     accumulate.setEnabled(type == ADD_PROMPT);
     accumulate.setMnemonic(KeyEvent.VK_A);
-
-    accumulate_all = new JButton("MetaEditPrompt.Accumulate_All");
+    Dictionary.setBoth(accumulate, "MetaEdit.Accumulate", "MetaEdit.Accumulate_Tooltip");
+
+    accumulate_all = new JButton();
     accumulate_all.setEnabled(type == ADD_PROMPT && multiple_selection);
     accumulate_all.setMnemonic(KeyEvent.VK_L);
-
-    overwrite = new JButton("MetaEdit.Overwrite");
+    Dictionary.setBoth(accumulate_all, "MetaEditPrompt.Accumulate_All", "MetaEditPrompt.Accumulate_All_Tooltip");
+
+    overwrite = new JButton();
     overwrite.setEnabled(type == UPDATE_PROMPT);
     overwrite.setMnemonic(KeyEvent.VK_R);
-
-    overwrite_all = new JButton("MetaEditPrompt.Overwrite_All");
+    Dictionary.setBoth(overwrite, "MetaEdit.Overwrite", "MetaEdit.Overwrite_Tooltip");
+
+    overwrite_all = new JButton();
     overwrite_all.setEnabled(type == UPDATE_PROMPT && multiple_selection);
     overwrite_all.setMnemonic(KeyEvent.VK_P);
-
-    remove = new JButton("MetaEdit.Remove");
+    Dictionary.setBoth(overwrite_all, "MetaEditPrompt.Overwrite_All", "MetaEditPrompt.Overwrite_All_Tooltip");
+
+    remove = new JButton();
     remove.setEnabled(type == REMOVE_PROMPT);
     remove.setMnemonic(KeyEvent.VK_R);
-
-    remove_all = new JButton("MetaEditPrompt.Remove_All");
+    Dictionary.setBoth(remove, "MetaEdit.Remove", "MetaEdit.Remove_Tooltip");
+
+    remove_all = new JButton();
     remove_all.setEnabled(type == REMOVE_PROMPT && multiple_selection);
     remove_all.setMnemonic(KeyEvent.VK_A);
-
-    skip = new JButton("MetaEditPrompt.Skip");
+    Dictionary.setBoth(remove_all, "MetaEditPrompt.Remove_All", "MetaEditPrompt.Remove_All_Tooltip");
+
+    skip = new JButton();
     skip.setEnabled(multiple_selection);
     skip.setMnemonic(KeyEvent.VK_S);
-
-    cancel = new JButton("General.Cancel");
+    Dictionary.setBoth(skip, "MetaEditPrompt.Skip", "MetaEditPrompt.Skip_Tooltip");
+
+    cancel = new JButton();
     cancel.setMnemonic(KeyEvent.VK_C);
+    Dictionary.setBoth(cancel, "General.Cancel", "General.Cancel_Tooltip");
 
     // Connection
@@ -212 +230 @@
     Rectangle frame_bounds = Gatherer.g_man.getBounds();
     this.setLocation(frame_bounds.x + ((frame_bounds.width - SIZE.width) / 2), frame_bounds.y + ((frame_bounds.height - SIZE.height) / 2));
-
-    // Dictionary registration
-    Gatherer.dictionary.register(title_label, null, false);
-    Gatherer.dictionary.register(filename_label, null, false);
-    Gatherer.dictionary.register(element_label, null, false);
-    Gatherer.dictionary.register(current_value_label, null, false);
-    Gatherer.dictionary.register(new_value_label, null, false);
-
-    Gatherer.dictionary.register(accumulate, null, false);
-    Gatherer.dictionary.register(accumulate_all, null, false);
-    Gatherer.dictionary.register(cancel, null, false);
-    Gatherer.dictionary.register(skip, null, false);
-    Gatherer.dictionary.register(overwrite, null, false);
-    Gatherer.dictionary.register(overwrite_all, null, false);
-    Gatherer.dictionary.register(remove, null, false);
-    Gatherer.dictionary.register(remove_all, null, false);
     }
 

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

@@ -1 @@
-package org.greenstone.gatherer.gui;
 /**
  *#########################################################################
@@ -36 +35 @@
  *########################################################################
  */
+package org.greenstone.gatherer.gui;
+
 import java.awt.*;
 import java.awt.event.*;
@@ -47 +48 @@
 import org.greenstone.gatherer.WGet;
 import org.greenstone.gatherer.util.Utility;
+
 /**
  * @author John Thompson, Greenstone Digital Library, University of Waikato
@@ -81 +83 @@
     JLabel url_label = new JLabel();
     url_label.setPreferredSize(Utility.LABEL_SIZE);
-    Dictionary.setText(url_label, "Mirroring.Source_URL");
+    Dictionary.registerText(url_label, "Mirroring.Source_URL");
     url_textfield = new JTextField();
-    Dictionary.setTooltip(url_textfield, "Mirroring.Source_URL_Tooltip");
+    Dictionary.registerTooltip(url_textfield, "Mirroring.Source_URL_Tooltip");
 
     JPanel depth_pane = new JPanel();
     JLabel depth_label = new JLabel();
-    Dictionary.setText(depth_label, "Mirroring.Download_Depth");
+    Dictionary.registerText(depth_label, "Mirroring.Download_Depth");
     depth_spinner = new JSpinner();
-    Dictionary.setTooltip(depth_spinner, "Mirroring.Download_Depth_Tooltip");
+    Dictionary.registerTooltip(depth_spinner, "Mirroring.Download_Depth_Tooltip");
 
     JPanel destination_pane = new JPanel();
     JLabel destination_label = new JLabel();
-    Dictionary.setText(destination_label, "Mirroring.Destination_Folder");
+    Dictionary.registerText(destination_label, "Mirroring.Destination_Folder");
     ButtonGroup group = new ButtonGroup();
     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");
+    Dictionary.registerText(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");
+    Dictionary.registerText(private_radiobutton, "Tree.Private");
     group.add(public_radiobutton);
     group.add(private_radiobutton);
@@ -109 +111 @@
     JPanel first_pane = new JPanel();
     automatic_checkbox = new JCheckBox();
-    Dictionary.setText(automatic_checkbox, "Mirroring.Download_Hidden");
+    Dictionary.registerText(automatic_checkbox, "Mirroring.Download_Hidden");
     overwrite_checkbox = new JCheckBox();
-    Dictionary.setText(overwrite_checkbox, "Mirroring.Overwrite_Existing");
+    Dictionary.registerText(overwrite_checkbox, "Mirroring.Overwrite_Existing");
 
     JPanel second_pane = new JPanel();
     higher_checkbox = new JCheckBox();
-    Dictionary.setText(higher_checkbox, "Mirroring.Higher_Directories");
+    Dictionary.registerText(higher_checkbox, "Mirroring.Higher_Directories");
     same_host_checkbox = new JCheckBox();
-    Dictionary.setText(same_host_checkbox, "Mirroring.Same_Host");
+    Dictionary.registerText(same_host_checkbox, "Mirroring.Same_Host");
 
     remove_failed_checkbox = new JCheckBox();
-    Dictionary.setText(remove_failed_checkbox, "Mirroring.Remove_Failed");
+    Dictionary.registerText(remove_failed_checkbox, "Mirroring.Remove_Failed");
 
     JLabel further_label = new JLabel();
-    Dictionary.setText(further_label, "Mirroring.Further_Options");
+    Dictionary.registerText(further_label, "Mirroring.Further_Options");
 
     JPanel button_pane = new JPanel();
     download_button = new JButton();
-    Dictionary.setBoth(download_button, "Mirroring.Download", "Mirroring.Download_Tooltip");
+    Dictionary.registerBoth(download_button, "Mirroring.Download", "Mirroring.Download_Tooltip");
 
     // Connect

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

@@ -8 +8 @@
 import javax.swing.event.*;
 import javax.swing.text.*;
+import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.collection.CollectionConfiguration;
@@ -45 +46 @@
     setJMenuBar(new SimpleMenuBar("creatingacollection"));
     setSize(size);
-    setTitle(get("NewCollectionPrompt.Title"));
+    Dictionary.setText(this, "NewCollectionPrompt.Title");
+
     // Model building. Build a model of all of the collections in the gsdl collect directory with the appropriate directories and hardcode the big five.
     Vector base_collection_model = new Vector();
@@ -52 +54 @@
     File[] possible_collections = gsdl_collection_directory.listFiles();
     for(int i = 0; possible_collections != null && i < possible_collections.length; i++) {
-                // The simpliest case is if the directory etc/collect.cfg file and a metadata/ in it. Thus it can easily be built upon.
+        // The simpliest case is if the directory etc/collect.cfg file and a metadata/ in it. Thus it can easily be built upon.
         File collect_cfg_file = new File(possible_collections[i], Utility.CONFIG_DIR);
         File metadata_directory = new File(possible_collections[i], Utility.META_DIR);
@@ -68 +70 @@
         // Else not a collection we know how to retrieve the metadata set for.
         }
-                // Else not a collection at all. Someones pulling a fast one.
+        // Else not a collection at all. Someones pulling a fast one.
     }
     // Sort the result.
     Collections.sort(base_collection_model);
-    base_collection_model.add(0, new Item(null, get("NewCollectionPrompt.NewCollection")));
-    // Creation.
+    base_collection_model.add(0, new Item(null, Dictionary.newget("NewCollectionPrompt.NewCollection")));
+
+    // Creation
     JPanel content_pane = (JPanel) getContentPane();
     content_pane.setOpaque(true);
     JPanel upper_pane = new JPanel();
-    upper_pane.setOpaque(false);
-    JLabel instructions_label = new JLabel(get("NewCollectionPrompt.Instructions"));
-    instructions_label.setOpaque(false);
+    JLabel instructions_label = new JLabel();
+    Dictionary.setText(instructions_label, "NewCollectionPrompt.Instructions");
     JPanel title_pane = new JPanel();
-    title_pane.setOpaque(false);
-    JLabel title_label = new JLabel(get("NewCollectionPrompt.Collection_Title"));
-    title_label.setOpaque(false);
+    JLabel title_label = new JLabel();
+    Dictionary.setText(title_label, "CDM.General.Collection_Name");
     title = new JTextField();
+    Dictionary.setTooltip(title, "CDM.General.Collection_Name_Tooltip");
     JPanel name_pane = new JPanel();
-    name_pane.setOpaque(false);
-    JLabel name_label = new JLabel(get("NewCollectionPrompt.Collection_Name"));
-    name_label.setOpaque(false);
+    JLabel name_label = new JLabel();
+    Dictionary.setText(name_label, "NewCollectionPrompt.Collection_Name");
     JPanel file_pane = new JPanel();
-    file_pane.setOpaque(false);
     file = new RestrictedTextField(new RestrictedTextDocument(FILENAME_SIZE), "", FILENAME_SIZE);
+    Dictionary.setTooltip(file, "NewCollectionPrompt.Collection_Name_Tooltip");
     JLabel file_label = new JLabel(".col");
-    file_label.setOpaque(false);
     JPanel email_pane = new JPanel();
-    email_pane.setOpaque(false);
-    JLabel email_label = new JLabel(get("NewCollectionPrompt.Collection_Email"));
-    email_label.setOpaque(false);
+    JLabel email_label = new JLabel();
+    Dictionary.setText(email_label, "NewCollectionPrompt.Collection_Email");
     JPanel host_pane = new JPanel();
-    host_pane.setOpaque(false);
     JPanel address_pane = new JPanel();
-    address_pane.setOpaque(false);
     address = new JTextField();
+    Dictionary.setTooltip(address, "CDM.General.Email.Creator_Tooltip");
     JLabel at_label = new JLabel("@");
     host = new JTextField();
+    Dictionary.setTooltip(host, "CDM.General.Email.Creator_Tooltip");
+
     JPanel center_pane = new JPanel();
-    center_pane.setOpaque(false);
     JPanel description_pane = new JPanel();
-    description_pane.setOpaque(false);
-    JLabel description_label = new JLabel(get("NewCollectionPrompt.Collection_Description"));
-    description_label.setOpaque(false);
+    JLabel description_label = new JLabel();
+    Dictionary.setText(description_label, "NewCollectionPrompt.Collection_Description");
     description = new JTextArea();
     description.setBackground(Gatherer.config.getColor("coloring.editable_background", false));
     description.setForeground(Gatherer.config.getColor("coloring.editable_foreground", false));
     description.setRows(5);
+    Dictionary.setTooltip(description, "CDM.General.Collection_Extra_Tooltip");
 
     JPanel bottom_pane = new JPanel();
     // Base Collection
     JPanel base_collection_pane = new JPanel();
-    JLabel base_collection_label = new JLabel(get("NewCollectionPrompt.Base_Collection"));
+    JLabel base_collection_label = new JLabel();
+    Dictionary.setText(base_collection_label, "NewCollectionPrompt.Base_Collection");
     base_collection = new JComboBox(base_collection_model);
-    // JButton base_collection_browse = new JButton(get("General.Browse"));
+    Dictionary.setTooltip(base_collection, "NewCollectionPrompt.Base_Collection_Tooltip");
 
     JPanel button_pane = new JPanel();
-    button_pane.setOpaque(false);
-    create_button = new JButton(get("General.OK"));
+    create_button = new JButton();
     create_button.setMnemonic(KeyEvent.VK_O);
-    JButton cancel_button = new JButton(get("General.Cancel"));
+    Dictionary.setBoth(create_button, "General.OK", "General.OK_Tooltip");
+    JButton cancel_button = new JButton();
     cancel_button.setMnemonic(KeyEvent.VK_C);
+    Dictionary.setBoth(cancel_button, "General.Cancel", "General.Cancel_Tooltip");
     ColorListener email_color_listener = new ColorListener(address, host);
+
     // Connection
-    // base_collection_browse.addActionListener(new BrowseListener());
     cancel_button.addActionListener(new CancelListener());
     create_button.addActionListener(new CreateListener());
@@ -237 +238 @@
     }
 
-    // public boolean viewExtractedMetadata() {
-    // return view_extracted_metadata_radio_button.isSelected();
-    // }
-
-    /** Gets a phrase from the dictionary based on key.
-     * @param key A <strong>String</strong> which serves as the unique identifier of a phrase.
-     * @return The desired phrase as a <strong>String</strong> or at least a meaningful error message.
-     */
-    private String get(String key) {
-    if(key.indexOf(".") == -1) {
-        key = "NewCollectionPrompt." + key;
-    }
-    return Gatherer.dictionary.get(key);
-    }
 
     private class BrowseListener 
@@ -262 +249 @@
         file = new File(Utility.BASE_DIR);
         }
-                // Show OpenCollectionPrompt.
+        // Show OpenCollectionPrompt.
         OpenCollectionDialog chooser = new OpenCollectionDialog(file);
         file = chooser.getSelectedFile();
@@ -311 +298 @@
         title_final = title.getText();
         if(title_final.length() == 0) {
-        GPrompt err_msg = new GPrompt(self, get("NewCollectionPrompt.Error"), get("NewCollectionPrompt.Title_Error"), "error.gif", null);
+        GPrompt err_msg = new GPrompt(self, Dictionary.newget("NewCollectionPrompt.Error"), Dictionary.newget("NewCollectionPrompt.Title_Error"), "error.gif", null);
         err_msg.display();
         err_msg.destroy();
@@ -326 +313 @@
         for(int i = 0; children != null && i < children.length; i++) {
             if(children[i].getName().equals(name_final)) {
-            GPrompt err_msg = new GPrompt(self, get("NewCollectionPrompt.Error"), get("NewCollectionPrompt.Name_Error"), "error.gif", null);
+            GPrompt err_msg = new GPrompt(self, Dictionary.newget("NewCollectionPrompt.Error"), Dictionary.newget("NewCollectionPrompt.Name_Error"), "error.gif", null);
             err_msg.display();
             err_msg.destroy();
@@ -337 +324 @@
         }
         else {
-        GPrompt err_msg = new GPrompt(self, get("NewCollectionPrompt.Error"), get("NewCollectionPrompt.Name_Error"), "error.gif", null);
+        GPrompt err_msg = new GPrompt(self, Dictionary.newget("NewCollectionPrompt.Error"), Dictionary.newget("NewCollectionPrompt.Name_Error"), "error.gif", null);
         err_msg.display();
         err_msg.destroy();
@@ -347 +334 @@
         email_final = address.getText() + "@" + host.getText();
         if(email_final.length() == 0 || email_final.startsWith("@") || email_final.endsWith("@")) {
-        GPrompt err_msg = new GPrompt(self, get("NewCollectionPrompt.Error"), get("NewCollectionPrompt.Email_Error"), "error.gif", null);
+        GPrompt err_msg = new GPrompt(self, Dictionary.newget("NewCollectionPrompt.Error"), Dictionary.newget("NewCollectionPrompt.Email_Error"), "error.gif", null);
         err_msg.display();
         err_msg.destroy();
@@ -359 +346 @@
         description_final = description.getText();
         if(description_final.length() == 0) {
-        GPrompt err_msg = new GPrompt(self, get("NewCollectionPrompt.Error"), get("NewCollectionPrompt.Description_Error"), "error.gif", null);
+        GPrompt err_msg = new GPrompt(self, Dictionary.newget("NewCollectionPrompt.Error"), Dictionary.newget("NewCollectionPrompt.Description_Error"), "error.gif", null);
         err_msg.display();
         err_msg.destroy();
@@ -444 +431 @@
     public void insertString(int offs, String str, AttributeSet a) 
         throws BadLocationException {
-                // Remove any blocked characters.
+        // Remove any blocked characters.
         StringBuffer temp = new StringBuffer(str);
         for(int i = 0; block != null && i < block.length; i++) {
@@ -472 +459 @@
         updateFilename();
     }
-          
+
     /** Gives notification that there was an insert into the document. */
     public void insertUpdate(DocumentEvent e) {

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

@@ -1 @@
-package org.greenstone.gatherer.gui;
 /**
  *#########################################################################
@@ -36 +35 @@
  *########################################################################
  */
+package org.greenstone.gatherer.gui;
+
 import java.awt.*;
 import java.awt.event.*;
@@ -43 +44 @@
 import java.text.*;
 import java.util.*;
-import javax.accessibility.*;
 import javax.swing.*;
 import javax.swing.filechooser.*;
@@ -51 +51 @@
 import org.greenstone.gatherer.collection.CollectionManager;
 import org.greenstone.gatherer.util.Utility;
-import org.outerj.pollo.util.*;
 
 public class OpenCollectionDialog 
@@ -59 +58 @@
     /** The name of the mouse listener that initiates editing on a double click. */ 
     static final private String SINGLE_CLICK_LISTENER = "SingleClickListener";
+
     /** Constructor */
     public OpenCollectionDialog(File file) {
@@ -65 +65 @@
     // Other initialization
     setAcceptAllFileFilterUsed(false);
-    setDialogTitle(Gatherer.dictionary.get("OpenCollectionDialog.Title"));
+    setDialogTitle(Dictionary.newget("OpenCollectionDialog.Title"));
     setFileFilter(new GathererFilter());
     setFileSystemView(new GathererFileSystemView());
@@ -79 +79 @@
     JPanel center_pane = (JPanel) accessory_pane.getParent();
     center_pane.add(accessory_pane, BorderLayout.SOUTH);
-    // Done.
     }
 
@@ -125 +124 @@
     } 
 
-    static public void main(String args[]) {
-    JFrame frame = new JFrame();
-    frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-    frame.setSize(800,640);
-    OpenCollectionDialog chooser = new OpenCollectionDialog(new File("/research/jmt12/gsdl/collect/"));
-    // Show dialog
-    int result = chooser.showOpenDialog(frame);
-    }
 
     /* The DescriptionPreview accessory is adapted from the ImagePreview.java (an example used by FileChooserDemo2.java). */
@@ -140 +131 @@
     private File file = null;
     private JTextArea text;
-    //private JEditorPane text;
+
     public DescriptionPreview(JFileChooser fc) {
         setName("Description Preview");
         setPreferredSize(new Dimension(100, 75)); // About three rows.
 
-        text = new JTextArea(Gatherer.dictionary.get("OpenCollectionDialog.No_Description"));
-                //text.setLineWrap(true);
-                //text.setWrapStyleWord(true);
-                //text = new JEditorPane();
-                //text.setText(Gatherer.dictionary.get("OpenCollectionDialog.No_Description"));
+        text = new JTextArea();
+        Dictionary.setText(text, "OpenCollectionDialog.No_Description");
 
         setBorder(BorderFactory.createEmptyBorder(5,0,0,0));
@@ -157 +145 @@
         fc.addPropertyChangeListener(this);
     }
+
     /** Whenever a new file or folder is selected we determine what description should be displayed. */
     public void propertyChange(PropertyChangeEvent e) {
         boolean update = false;
         String prop = e.getPropertyName();
-                //If the directory changed, don't show an image.
+        // If the directory changed, don't show an image.
         if (JFileChooser.DIRECTORY_CHANGED_PROPERTY.equals(prop)) {
         file = null;
-        update = true;
-                     
-        //If a file became selected, find out which one.
-        } else if (JFileChooser.SELECTED_FILE_CHANGED_PROPERTY.equals(prop)) {
+        update = true;           
+        }
+        // If a file became selected, find out which one.
+        else if (JFileChooser.SELECTED_FILE_CHANGED_PROPERTY.equals(prop)) {
         file = (File) e.getNewValue();
         update = true;
         }
-                //Update the description accordingly.
+
+        // Update the description accordingly.
         if (update) {
         if(file == null) {
-            text.setText(Gatherer.dictionary.get("OpenCollectionDialog.No_Description"));
+            Dictionary.setText(text, "OpenCollectionDialog.No_Description");
         }
         else {
@@ -186 +176 @@
         }
         }
-    }  
+    }
     }
 
@@ -192 +182 @@
     private class GathererFilter 
     extends FileFilter {
-  
-    //Accept all directories and all gif, jpg, tiff, or png files.
+
+    // Accept all directories and all .col files
     public boolean accept(File f) {
         return (f.isDirectory() || f.getName().toLowerCase().endsWith(".col"));
     }
-          
-    //The description of this filter
+
+    // The description of this filter
     public String getDescription() {
-        return Gatherer.dictionary.get("OpenCollectionDialog.Collection");
+        return Dictionary.newget("OpenCollectionDialog.Collection");
     }
     }
@@ -217 +207 @@
     /** Gets the list of shown (i.e. */
     public File[] getFiles(File dir, boolean useFileHiding) {
-                // Retrieve the files usually returned by the platform specific file system view.
+        // Retrieve the files usually returned by the platform specific file system view.
         File[] files = default_system_view.getFiles(dir, useFileHiding);
-                // Determine if the current dir actually contains a valid greenstone collection. To do this we check for the presence of the file <dir>/etc/collect.cfg and a directory named import.
+        // Determine if the current dir actually contains a valid greenstone collection. To do this we check for the presence of the file <dir>/etc/collect.cfg and a directory named import.
         File collect_cfg_file = new File(dir, Utility.CONFIG_DIR);
         File import_dir_file = new File(dir, Utility.IMPORT_DIR);
@@ -246 +236 @@
     private class GathererFileView
     extends FileView {
+
     public String getDescription(File file) {
         String description = null;
-        if(file.getName().endsWith(".col")) {
-        if(!lockExists(file)) {
-            Gatherer.dictionary.get("OpenCollectionDialog.Normal_Collection");
+        if (file.getName().endsWith(".col")) {
+        if (!lockExists(file)) {
+            description = Dictionary.newget("OpenCollectionDialog.Normal_Collection");
         }
         else {
-            Gatherer.dictionary.get("OpenCollectionDialog.Locked_Collection");
+            description = Dictionary.newget("OpenCollectionDialog.Locked_Collection");
         }
         }
         return description;
     }
+
     public Icon getIcon(File file) {
         Icon icon = null;
-        if(file.getName().endsWith(".col")) {
-        if(!lockExists(file)) {
+        if (file.getName().endsWith(".col")) {
+        if (!lockExists(file)) {
             icon = NORMAL_COLLECTION_ICON;
         }
@@ -270 +262 @@
         return icon;
     }
+
     /** Determine if a lock file exists. */
     private boolean lockExists(File file) {

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

@@ -1 @@
-package org.greenstone.gatherer.gui;
 /**
  *#########################################################################
@@ -36 +35 @@
  *########################################################################
  */
+package org.greenstone.gatherer.gui;
+
 import java.awt.*;
 import java.awt.event.*;
@@ -43 +44 @@
 import javax.swing.event.*;
 import javax.swing.text.*;
+import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.cdm.Argument;
@@ -53 +55 @@
 import org.greenstone.gatherer.util.AppendLineOnlyFileDocumentOwner;
 import org.greenstone.gatherer.util.Utility;
-//import org.w3c.dom.*;
+
 /** This class serves as the data holder for all subclasses of option panes, such as Import options or All options. It also contains methods for creating each of the option lines as they would appear in the subpane. Futhermore it has a method for considering all the arguments and generating a <strong>String[]</strong> to allow you to pass them to the <strong>GShell</strong>.
  * @author John Thompson, Greenstone Digital Library, University of Waikato
@@ -91 +93 @@
 
 
-     /** The default constructor creates the few session length options, but either retrieves the rest from the current collection, or creates a default set of options. */
+    /** The default constructor creates the few session length options, but either retrieves the rest from the current collection, or creates a default set of options. */
     public OptionsPane(BuildOptions build_options) {
     this.build_options = build_options;
@@ -102 +104 @@
 
     /** This method creates the panel with all the build only options on it.
-      * @return A <strong>JPanel</strong> which can be used to display all the build only options.
-      */
+     * @return A <strong>JPanel</strong> which can be used to display all the build only options.
+     */
     public JPanel buildBuild() {
     JPanel pane = new JPanel();
@@ -122 +124 @@
     }
     /** This method creates the panel with all the import only options on it.
-      * @return A <strong>JPanel</strong> which can be used to display all the import only options.
-      */
+     * @return A <strong>JPanel</strong> which can be used to display all the import only options.
+     */
     public JPanel buildImport() {
     JPanel pane = new JPanel();
@@ -142 +144 @@
     }
     /** This method is used to build a panel based on the message log, which is nothing like any of the other panels.
-      * @return A <strong>JPanel</strong> containing a scrollable text area which represents the shell process message log.
-      */
+     * @return A <strong>JPanel</strong> containing a scrollable text area which represents the shell process message log.
+     */
     public JPanel buildLog() {
     // we now save the log pane
@@ -179 +181 @@
         log_list.addListSelectionListener(new LogListListener());
 
-        JLabel log_history_label = new JLabel(get("OptionsPane.LogHistory"));
+        JLabel log_history_label = new JLabel();
+        Dictionary.registerText(log_history_label, "OptionsPane.LogHistory");
         JPanel log_history_pane = new JPanel();
         log_history_pane.setPreferredSize(new Dimension(600, 100));
@@ -211 +214 @@
     }
 
-    /** This method retrieves a phrase from the dictionary based apon the key.
-      * @param key A <strong>String</strong> used as a reference to the correct phrase.
-      * @return A phrase, matching the key, as a <strong>String</strong>.
-      */
-    private String get(String key) {
-    return get(key, null);
-    }
-    /** This method retrieves a phrase from the dictionary based apon the key and arguments.
-      * @param key A <strong>String</strong> used as a reference to the correct phrase.
-      * @param args A <strong>String[]</strong> whose contents are often substituted into the phrase before it is returned.
-      * @return A phrase, matching the key and constructed using the arguments, as a <strong>String</strong>.
-      * @see org.greenstone.gatherer.Dictionary
-      * @see org.greenstone.gatherer.Gatherer
-      */
-    private String get(String key, String args[]) {
-    if(key.indexOf(".") == -1) {
-        key = "OptionsPane." + key;
-    }
-    return Gatherer.dictionary.get(key, args);
-    }
+
     /** Attempts to discover the latest document count.
      * @return An <strong>int</strong> detailing the number of documents in this collection.
@@ -285 +269 @@
         setLayout(new BorderLayout());
         setPreferredSize(ROW_SIZE);
-
-        /*
-          JPanel inner_pane = new JPanel();
-          inner_pane.setOpaque(false);
-        */
 
         // Try to determine what the value_controls value should be.
@@ -389 +368 @@
         }
 
-                // If the argument is required, then you don't get a choice of whether it is enabled.
+        // If the argument is required, then you don't get a choice of whether it is enabled.
         if(argument.isRequired()) {
         JLabel label = new JLabel(argument.getName());
@@ -460 +439 @@
     }
     /** Any implementation of ActionListener must include this method so that we can be informed when an action has been performed on or registered check box, prompting us to change the state of the other controls as per the users request.
-            * @param event An <strong>ActionEvent</strong> containing information about the click.
-            */
+     * @param event An <strong>ActionEvent</strong> containing information about the click.
+     */
     public void actionPerformed(ActionEvent event) {
         JCheckBox source = (JCheckBox)event.getSource();
@@ -562 +541 @@
         switch (success) {
         case SUCCESSFUL:
-            d.append(get("OptionsPane.Successful"));
+            d.append(Dictionary.newget("OptionsPane.Successful"));
             break;
         case UNSUCCESSFUL:
-            d.append(get("OptionsPane.Unsuccessful"));
+            d.append(Dictionary.newget("OptionsPane.Unsuccessful"));
             break;
         case CANCELLED:
-            d.append(get("OptionsPane.Cancelled"));
+            d.append(Dictionary.newget("OptionsPane.Cancelled"));
             break;
         default:
-            d.append(get("OptionsPane.Unknown"));
+            d.append(Dictionary.newget("OptionsPane.Unknown"));
         }
         display = d.toString();

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

@@ -9 +9 @@
 import javax.swing.event.*;
 import org.greenstone.gatherer.Configuration;
+import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.checklist.CheckList;
@@ -61 +62 @@
     this.self = this;
     setSize(SIZE);
-    setTitle("Preferences");
+    Dictionary.registerText(this, "Preferences");
     setJMenuBar(new SimpleMenuBar("preferences"));
+
     // Creation
     JPanel content_pane = (JPanel) getContentPane();
     tab_pane = new JTabbedPane();
-    tab_pane.add("Preferences.General", createGeneralPreferences());
+    JPanel general_preferences = createGeneralPreferences();
+    tab_pane.add("Preferences.General", general_preferences);
     tab_pane.add("Preferences.Workflow", createWorkflowPreferences());
     tab_pane.add("Preferences.Connection", createConnectionPreferences());
     tab_pane.add("Preferences.Warnings", createWarningPreferences());
+    Dictionary.register(tab_pane);
 
     JPanel button_pane = new JPanel();
-    ok_button = new JButton("General.OK");
-    apply_button = new JButton("General.Apply");
-    cancel_button = new JButton("General.Cancel");
+    ok_button = new JButton();
+    Dictionary.registerBoth(ok_button, "General.OK", "General.OK_Tooltip");
+    apply_button = new JButton();
+    Dictionary.registerBoth(apply_button, "General.Apply", "General.Apply_Tooltip");
+    cancel_button = new JButton();
+    Dictionary.registerBoth(cancel_button, "General.Cancel", "General.Cancel_Tooltip");
+
     // Connection
-    Gatherer.dictionary.register(this, null, false);
-    Gatherer.dictionary.register(tab_pane, null, false);
-    Gatherer.dictionary.register(ok_button, null, false);
-    Gatherer.dictionary.register(apply_button, null, false);
-    Gatherer.dictionary.register(cancel_button, null, false);
     ok_button.addActionListener(new OKButtonListener(true));
     apply_button.addActionListener(new OKButtonListener(false));
     cancel_button.addActionListener(new CancelButtonListener());
+
     // Layout
     button_pane.setBorder(BorderFactory.createEmptyBorder(5,2,2,2));
@@ -114 +118 @@
     JPanel library_path_pane = new JPanel();
     library_path_pane.setPreferredSize(ROW_SIZE);
-    library_path_label = new JLabel("Preferences.Connection.Library_Path");
+    library_path_label = new JLabel();
     library_path_label.setPreferredSize(LABEL_SIZE);
+    Dictionary.registerText(library_path_label, "Preferences.Connection.Library_Path");
     library_path_field = new JTextField(Gatherer.config.getString("general.exec_address", true));
     library_path_field.setCaretPosition(0);
+    Dictionary.registerTooltip(library_path_field, "Preferences.Connection.Library_Path_Tooltip");
 
     boolean currently_enabled = Gatherer.config.get("general.use_proxy", true);
     // Creation
     JPanel connection_pane = new JPanel();
-    use_proxy_checkbox = new JCheckBox("Preferences.Connection.Use_Proxy", currently_enabled);
+    use_proxy_checkbox = new JCheckBox();
+    use_proxy_checkbox.setSelected(currently_enabled);
+    Dictionary.registerText(use_proxy_checkbox, "Preferences.Connection.Use_Proxy");
+
     use_proxy_checkbox.setPreferredSize(ROW_SIZE);
     JPanel proxy_host_pane = new JPanel();
     proxy_host_pane.setPreferredSize(ROW_SIZE);
-    proxy_host_label = new JLabel("Preferences.Connection.Proxy_Host");
+    proxy_host_label = new JLabel();
     proxy_host_label.setPreferredSize(LABEL_SIZE);
+    Dictionary.registerText(proxy_host_label, "Preferences.Connection.Proxy_Host"); 
     proxy_host_field = new JTextField(Gatherer.config.getString("general.proxy_host", true));
     proxy_host_field.setEnabled(currently_enabled);
+    Dictionary.registerTooltip(proxy_host_field, "Preferences.Connection.Proxy_Host_Tooltip");
     JPanel proxy_port_pane = new JPanel();
     proxy_port_pane.setPreferredSize(ROW_SIZE);
-    proxy_port_label = new JLabel("Preferences.Connection.Proxy_Port");
+    proxy_port_label = new JLabel();
     proxy_port_label.setPreferredSize(LABEL_SIZE);
+    Dictionary.registerText(proxy_port_label, "Preferences.Connection.Proxy_Port"); 
     proxy_port_field = new NumberField(Gatherer.config.getString("general.proxy_port", true));
     proxy_port_field.setEnabled(currently_enabled);
+    Dictionary.registerTooltip(proxy_port_field, "Preferences.Connection.Proxy_Port_Tooltip");
 
     // Connection
-    Gatherer.dictionary.register(library_path_label, null, false);
-    Gatherer.dictionary.register(use_proxy_checkbox, null, false);
-    Gatherer.dictionary.register(proxy_host_label, null, false);
-    Gatherer.dictionary.register(proxy_port_label, null, false);
     use_proxy_checkbox.addActionListener(new UseProxyListener());
 
@@ -214 +223 @@
 
     // Extracted metadata
-    view_extracted_metadata_checkbox = new JCheckBox("Preferences.General.View_Extracted_Metadata", false);
+    view_extracted_metadata_checkbox = new JCheckBox();
+    view_extracted_metadata_checkbox.setSelected(false);
+    Dictionary.registerText(view_extracted_metadata_checkbox, "Preferences.General.View_Extracted_Metadata");
     if (Gatherer.config.get("general.view_extracted_metadata", Configuration.COLLECTION_SPECIFIC)) {
         view_extracted_metadata_checkbox.setSelected(true);
@@ -220 +231 @@
 
     // Show file sizes
-    show_file_size_checkbox = new JCheckBox("Preferences.General.Show_File_Size", false);
+    show_file_size_checkbox = new JCheckBox();
+    show_file_size_checkbox.setSelected(false);
+    Dictionary.registerText(show_file_size_checkbox, "Preferences.General.Show_File_Size");
     if (Gatherer.config.get("general.show_file_size", Configuration.COLLECTION_SPECIFIC)) {
         show_file_size_checkbox.setSelected(true);
@@ -227 +240 @@
     // Language
     JPanel language_pane = new JPanel();
-    language_label = new JLabel("Preferences.General.Interface_Language");
+    language_label = new JLabel();
     language_label.setPreferredSize(LABEL_SIZE);
+    Dictionary.registerText(language_label, "Preferences.General.Interface_Language");
     language_combobox = new JComboBox(dictionary_model.toArray());
 
     // Connect
-    Gatherer.dictionary.register(view_extracted_metadata_checkbox, null, false);
-    Gatherer.dictionary.register(show_file_size_checkbox, null, false);
-    Gatherer.dictionary.register(language_label, null, false);
     language_combobox.addActionListener(new LanguageComboboxListener());
 
@@ -260 +271 @@
         String value = (String) warning_preferences.get(property);
         // Remove 'warning.'
-        String title = Gatherer.dictionary.get(property.substring(8) + ".Title");
+        String title = Dictionary.newget(property.substring(8) + ".Title");
         Entry entry = new Entry(title, value.equalsIgnoreCase(TRUE));
         entry.setProperty(property);
@@ -277 +288 @@
 
     private JPanel createWorkflowPreferences() {
-    // Read in the predefined configurations file.
+    // Read in the predefined configurations file
     Vector predefined = new Vector();
     Document predefined_document = Utility.parse("xml/workflows.xml", true);
@@ -285 +296 @@
         predefined.add(new WorkflowElementWrapper((Element)workflow_elements.item(i)));
     }
+
     // Creation
     JPanel workflow_preferences_pane = new JPanel();
     JPanel checklist_pane = new JPanel();
-    title_label = new JLabel("Preferences.Workflow.Title");
+    title_label = new JLabel();
     title_label.setPreferredSize(ROW_SIZE);
-    workflow_browse  = new JCheckBox("Preferences.Workflow.Browse",  Gatherer.config.get("workflow.browse", false));
+    Dictionary.registerText(title_label, "Preferences.Workflow.Title");
+
+    workflow_browse = new JCheckBox();
+    workflow_browse.setSelected(Gatherer.config.get("workflow.browse", false));
     workflow_browse.setPreferredSize(ROW_SIZE);
-    workflow_mirror  = new JCheckBox("Preferences.Workflow.Mirror",  Gatherer.config.get("workflow.mirror", false));
+    Dictionary.registerText(workflow_browse, "Preferences.Workflow.Browse");
+
+    workflow_mirror = new JCheckBox();
+    workflow_mirror.setSelected(Gatherer.config.get("workflow.mirror", false));
     workflow_mirror.setPreferredSize(ROW_SIZE);
-    workflow_gather  = new JCheckBox("Preferences.Workflow.Gather",  Gatherer.config.get("workflow.gather", false));
+    Dictionary.registerText(workflow_mirror, "Preferences.Workflow.Mirror");
+
+    workflow_gather = new JCheckBox();
+    workflow_gather.setSelected(Gatherer.config.get("workflow.gather", false));
     workflow_gather.setPreferredSize(ROW_SIZE);
-    workflow_enrich  = new JCheckBox("Preferences.Workflow.Enrich",  Gatherer.config.get("workflow.enrich", false));
+    Dictionary.registerText(workflow_gather, "Preferences.Workflow.Gather");
+
+    workflow_enrich = new JCheckBox();
+    workflow_enrich.setSelected(Gatherer.config.get("workflow.enrich", false));
     workflow_enrich.setPreferredSize(ROW_SIZE);
-    workflow_design  = new JCheckBox("Preferences.Workflow.Design",  Gatherer.config.get("workflow.design", false));
+    Dictionary.registerText(workflow_enrich, "Preferences.Workflow.Enrich");
+
+    workflow_design = new JCheckBox();
+    workflow_design.setSelected(Gatherer.config.get("workflow.design", false));
     workflow_design.setPreferredSize(ROW_SIZE);
-    workflow_export  = new JCheckBox("Preferences.Workflow.Export",  Gatherer.config.get("workflow.export", false));
+    Dictionary.registerText(workflow_design, "Preferences.Workflow.Design");
+
+    workflow_export = new JCheckBox();
+    workflow_export.setSelected(Gatherer.config.get("workflow.export", false));
     workflow_export.setPreferredSize(ROW_SIZE);
-    workflow_create  = new JCheckBox("Preferences.Workflow.Create",  Gatherer.config.get("workflow.create", false));
+    Dictionary.registerText(workflow_export, "Preferences.Workflow.Export");
+
+    workflow_create = new JCheckBox();
+    workflow_create.setSelected(Gatherer.config.get("workflow.create", false));
     workflow_create.setPreferredSize(ROW_SIZE);
-    workflow_preview = new JCheckBox("Preferences.Workflow.Preview", Gatherer.config.get("workflow.preview", false));
+    Dictionary.registerText(workflow_create, "Preferences.Workflow.Create");
+
+    workflow_preview = new JCheckBox();
+    workflow_preview.setSelected(Gatherer.config.get("workflow.preview", false));
     workflow_preview.setPreferredSize(ROW_SIZE);
+    Dictionary.registerText(workflow_preview, "Preferences.Workflow.Preview");
+
     JPanel predefined_pane = new JPanel();
-    predefined_label = new JLabel("Preferences.Workflow.Predefined.Label");
+    predefined_label = new JLabel();
     predefined_label.setPreferredSize(new Dimension(150,25));
+    Dictionary.registerText(predefined_label, "Preferences.Workflow.Predefined.Label");
     JComboBox predefined_combobox = new JComboBox(predefined);
+
     // Connection
-    Gatherer.dictionary.register(title_label, null, false);
-    Gatherer.dictionary.register(workflow_browse, null, false);
-    Gatherer.dictionary.register(workflow_mirror, null, false);
-    Gatherer.dictionary.register(workflow_gather, null, false);
-    Gatherer.dictionary.register(workflow_enrich, null, false);
-    Gatherer.dictionary.register(workflow_design, null, false);
-    Gatherer.dictionary.register(workflow_export, null, false);
-    Gatherer.dictionary.register(workflow_create, null, false);
-    Gatherer.dictionary.register(workflow_preview, null, false);
-    Gatherer.dictionary.register(predefined_label, null, false);
     predefined_combobox.addActionListener(new PredefinedActionListener());
+
     // Layout
     checklist_pane.setLayout(new BoxLayout(checklist_pane, BoxLayout.Y_AXIS));
     checklist_pane.add(title_label);
-    if(Gatherer.config.get("workflow.browse", true)) {
+    if (Gatherer.config.get("workflow.browse", true)) {
         checklist_pane.add(workflow_browse);
     }
-    if(Gatherer.config.get("workflow.mirror", true)) {
+    if (Gatherer.config.get("workflow.mirror", true)) {
         checklist_pane.add(workflow_mirror);
     }
-    if(Gatherer.config.get("workflow.gather", true)) {
+    if (Gatherer.config.get("workflow.gather", true)) {
         checklist_pane.add(workflow_gather);
     }
-    if(Gatherer.config.get("workflow.enrich", true)) {
+    if (Gatherer.config.get("workflow.enrich", true)) {
         checklist_pane.add(workflow_enrich);
     }
-    if(Gatherer.config.get("workflow.design", true)) {
+    if (Gatherer.config.get("workflow.design", true)) {
         checklist_pane.add(workflow_design);
     }
-    if(Gatherer.config.get("workflow.export", true)) {
+    if (Gatherer.config.get("workflow.export", true)) {
         checklist_pane.add(workflow_export);
     }
-    if(Gatherer.config.get("workflow.create", true)) {
+    if (Gatherer.config.get("workflow.create", true)) {
         checklist_pane.add(workflow_create);
     }
-    if(Gatherer.config.get("workflow.preview", true)) {
+    if (Gatherer.config.get("workflow.preview", true)) {
         checklist_pane.add(workflow_preview);
     }
@@ -362 +393 @@
 
     public void dispose() {
-    // Deregister dictionary components
-
-    // Connection
-    Gatherer.dictionary.deregister(library_path_label);
-    Gatherer.dictionary.deregister(use_proxy_checkbox);
-    Gatherer.dictionary.deregister(proxy_host_label);
-    Gatherer.dictionary.deregister(proxy_port_label);
-
-    // General
-    Gatherer.dictionary.deregister(view_extracted_metadata_checkbox);
-    Gatherer.dictionary.deregister(show_file_size_checkbox);
-    Gatherer.dictionary.deregister(language_label);
-
-    // Workflow
-    Gatherer.dictionary.deregister(title_label);
-    Gatherer.dictionary.deregister(workflow_browse);
-    Gatherer.dictionary.deregister(workflow_mirror);
-    Gatherer.dictionary.deregister(workflow_gather);
-    Gatherer.dictionary.deregister(workflow_enrich);
-    Gatherer.dictionary.deregister(workflow_design);
-    Gatherer.dictionary.deregister(workflow_export);
-    Gatherer.dictionary.deregister(workflow_create);
-    Gatherer.dictionary.deregister(workflow_preview);
-    Gatherer.dictionary.deregister(predefined_label);
-
-    // Dialog
-    Gatherer.dictionary.deregister(this);
-    Gatherer.dictionary.deregister(tab_pane);
-    Gatherer.dictionary.deregister(ok_button);
-    Gatherer.dictionary.deregister(apply_button);
-    Gatherer.dictionary.deregister(cancel_button);
     // Dispose
     super.dispose();
@@ -534 +534 @@
         Gatherer.dictionary.changeDictionary(entry.getLocale());
         // Display message
-        JOptionPane.showMessageDialog(Gatherer.g_man, Gatherer.dictionary.get("Preferences.General.Restart_Required"), Gatherer.dictionary.get("Preferences.General.Restart_Required"), JOptionPane.WARNING_MESSAGE);
+        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("Preferences.General.Restart_Required"), Dictionary.newget("Preferences.General.Restart_Required"), JOptionPane.WARNING_MESSAGE);
         }
     }