Changeset 5571

Timestamp:

2003-10-03T17:09:38+12:00 (21 years ago)

Author:

mdewsnip

Message:

More small updates and tooltips added.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• Dictionary.java (modified) (1 diff)
• Gatherer.java (modified) (8 diffs)
• collection/CollectionManager.java (modified) (13 diffs)
• gui/BrowsingPane.java (modified) (3 diffs)
• gui/CollectionPane.java (modified) (4 diffs)
• gui/CreatePane.java (modified) (1 diff)
• gui/FileAssociationDialog.java (modified) (17 diffs)
• gui/GProgressBar.java (modified) (17 diffs)
• gui/GUIManager.java (modified) (4 diffs)
• gui/NewCollectionDetailsPrompt.java (modified) (5 diffs)
• gui/NewCollectionMetadataPrompt.java (modified) (6 diffs)
• gui/Preferences.java (modified) (1 diff)
• gui/PreviewPane.java (modified) (12 diffs)
• gui/SimpleMenuBar.java (modified) (1 diff)
• gui/SimpleOpenCollectionDialog.java (modified) (6 diffs)
• gui/WarningDialog.java (modified) (1 diff)
• gui/table/GTableModel.java (modified) (5 diffs)
• gui/tree/DragTree.java (modified) (14 diffs)
• shell/GShellListener.java (modified) (1 diff)

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

@@ -473 +473 @@
             ((JLabel) component).setText(text);
         }
+        else if (component instanceof JProgressBar) {
+            ((JProgressBar) component).setString(text);
+        }
         else if (component instanceof JTextComponent) {
             ((JTextComponent) component).setText(text);

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

@@ -26 +26 @@
  */
 package org.greenstone.gatherer;
+
 /**************************************************************************************
  * Written:      ??/??/02
@@ -62 +63 @@
 import org.greenstone.gatherer.util.Utility;
 import sun.misc.*;
+
 /** Containing the main() method for the Gatherer, this class is the starting point for the rest of the application. It first parses the command line arguments, preparing to update the configuration as required. Next it loads several important support classes such as the Configuration and Dictionary. Finally it creates the other important managers and sends them on their way.
  * @author John Thompson, Greenstone Digital Library, University of Waikato
@@ -113 +115 @@
     /** A static reference to ourselves. */
     static public Gatherer self;
-    /** A public reference to the message log. */
-    static public Log log;
     /** The debug print stream. */
     static public PrintStream debug;
@@ -192 +192 @@
     }
     try {
-        // Create log
-        log = new Log();
         // Load Config
         loadConfig(gsdl_path, exec_path, perl_path);
@@ -581 +579 @@
      */
     static public void missingEXEC(Dictionary dictionary) {
-    WarningDialog dialog = new WarningDialog("warning.MissingEXEC", "general.exec_address", dictionary);
-    //NoSettingDialog dialog = new NoSettingDialog("warning.MissingEXEC", "NoSettingEXEC.Message", false, dictionary);
+    WarningDialog dialog = new WarningDialog("warning.MissingEXEC", "general.exec_address");
     dialog.setValueField(new URLField(Gatherer.config.getColor("coloring.editable_foreground", false), Gatherer.config.getColor("coloring.editable_background", false), Gatherer.config.getColor("coloring.error_foreground", false), Gatherer.config.getColor("coloring.error_background", false)));
     dialog.display();
@@ -593 +590 @@
      */
     static public void missingGSDL(Dictionary dictionary) {
-    WarningDialog dialog = new WarningDialog("warning.MissingGSDL", false, dictionary);
+    WarningDialog dialog = new WarningDialog("warning.MissingGSDL", false);
     dialog.display();
     dialog.dispose();
@@ -602 +599 @@
     /** Prints a warning message about a missing PERL path, which although not fatal pretty much ensures no collection creation/building will work properly in the Gatherer. */
     static public void missingPERL(Dictionary dictionary) {
-    WarningDialog dialog = new WarningDialog("warning.MissingPERL", false, dictionary);
+    WarningDialog dialog = new WarningDialog("warning.MissingPERL", false);
     dialog.display();
     dialog.dispose();
@@ -693 +690 @@
         Gatherer.printStackTrace(error);
     }
-    }
-
-    /** Creates and dispatches a message given the initial details.
-     * @param level An <i>int</i> indicating the message level for this message.
-     * @param message A <strong>String</strong> which contains the payload of this message.
-     * @see org.greenstone.gatherer.Message
-     * @see org.greenstone.gatherer.Log
-     */
-    private void message(int level, String message) {
-    Message msg = new Message(Message.GENERAL, level, message);
-    log.add(msg);
     }
 

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

@@ -45 +45 @@
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
-import org.greenstone.gatherer.Message;
 import org.greenstone.gatherer.cdm.CollectionDesignManager;
 import org.greenstone.gatherer.cdm.CommandTokenizer;
@@ -75 +74 @@
 import org.greenstone.gatherer.util.Utility;
 import org.w3c.dom.*;
+
 /** This class manages many aspects of the collection, from its creation via scripts, data access via methods and its importing and building into the final collection. It is also resposible for firing appropriate event when significant changes have occured within the collection, and for creating a new metadata set manager as necessary.
  * @author John Thompson
@@ -112 +112 @@
     static final public int NO_SPECIAL_CASE = -1;
     static final public int SPECIAL_DLS = 0;
+
+    /** Used to indicate the source of the message is the file collection methods. */
+    static final public int COLLECT   = 3;
+    /** Used to indicate the source of the message is the building methods. */
+    static final public int BUILDING  = 5;
+
     /** Constructor. */
     public CollectionManager() {
@@ -164 +170 @@
     }
     args = ArrayTools.add(args, collection.build_options.getBuildValues());
-    GShell shell = new GShell(args, GShell.BUILD, Message.BUILDING, this, build_monitor, GShell.GSHELL_BUILD);
+    GShell shell = new GShell(args, GShell.BUILD, BUILDING, this, build_monitor, GShell.GSHELL_BUILD);
     shell.addGShellListener(Gatherer.g_man.create_pane);
     shell.start();
@@ -726 +732 @@
         collection_import = null;
         args = ArrayTools.add(args, collection.build_options.getImportValues());
-        GShell shell = new GShell(args, GShell.IMPORT, Message.BUILDING, this, import_monitor, GShell.GSHELL_IMPORT);
+        GShell shell = new GShell(args, GShell.IMPORT, BUILDING, this, import_monitor, GShell.GSHELL_IMPORT);
         shell.addGShellListener(Gatherer.g_man.create_pane);
         shell.start();
@@ -871 +877 @@
         }
     }
-    GShell process = new GShell(command, GShell.NEW, Message.COLLECT, this, null, GShell.GSHELL_NEW);
+    GShell process = new GShell(command, GShell.NEW, COLLECT, this, null, GShell.GSHELL_NEW);
     process.addGShellListener(this);
     process.run(); // Don't bother threading this... yet
@@ -877 +883 @@
 
     /** Any implementation of GShellListener must include this method to allow the GShell to send messages to listeners. However in this case the CollectionManager is in no way interested in what the messages are, just the import events which have a specific type and are handled elsewhere. Thus we can safely ignore this event.
-      * @param event A <strong>GShellEvent</strong> which contains a the message.
-      */
+     * @param event A <strong>GShellEvent</strong> which contains a the message.
+     */
     public synchronized void message(GShellEvent event) {
     }
     /** Called whenever the metadata value changes in some way, such as the addition of a new value. We want to mark the collection so that it needs saving again.
-      * @param event A <strong>MSMEvent</strong> containing details of the event that caused this message to be fired.
-      * @see org.greenstone.gatherer.collection.Collection
-      */
+     * @param event A <strong>MSMEvent</strong> containing details of the event that caused this message to be fired.
+     * @see org.greenstone.gatherer.collection.Collection
+     */
     public void metadataChanged(MSMEvent event) {
     // Again this change means we need to save the collection again.
@@ -890 +896 @@
     }
     /** This call is fired whenever a process within a GShell created by this class begins.
-      * @param event A <strong>GShellEvent</strong> containing information about the GShell process.
-      * @see org.greenstone.gatherer.Gatherer
-      * @see org.greenstone.gatherer.gui.GUIManager
-      * @see org.greenstone.gatherer.shell.GShell
-      */
+     * @param event A <strong>GShellEvent</strong> containing information about the GShell process.
+     * @see org.greenstone.gatherer.Gatherer
+     * @see org.greenstone.gatherer.gui.GUIManager
+     * @see org.greenstone.gatherer.shell.GShell
+     */
     public synchronized void processBegun(GShellEvent event) {
     Gatherer.println("CollectionManager.processBegun(" + event.getType() + ")");
@@ -1186 +1192 @@
     catch (Exception exception) {
         JOptionPane.showMessageDialog(Gatherer.g_man, "Exception detected during collection install.\nMost likely caused by Windows or Local Library holding locks on files:\n" + exception.getMessage(), "Error", JOptionPane.ERROR_MESSAGE);
-    }
-    }
-
-    /** Creates and dispatches a message given the initial details.
-     * @param level An <i>int</i> indicating the message level for this message.
-     * @param message A <strong>String</strong> which contains the payload of this message.
-     * @see org.greenstone.gatherer.Log
-     * @see org.greenstone.gatherer.Message
-     */
-    private void message(int level, String message) {
-    Message msg = new Message(Message.COLLECT, level, message);
-    if(Gatherer.g_man != null) {
-        Gatherer.log.add(msg);
-    } else {
-        Gatherer.println(msg.toString());
     }
     }
@@ -1404 +1395 @@
     /** Any action that changes one of the tree models within a collection, which are the only models we listen to, mean the collections contents have changed and so saved should be set to false.
      * @param event A <strong>TreeModelEvent</strong> encompassing all the information about the event which has changed the tree.
-            */
+     */
     public void treeNodesChanged(TreeModelEvent event) {
         if(collection != null) {
@@ -1411 +1402 @@
     }
     /** Any action that changes one of the tree models within a collection, which are the only models we listen to, mean the collections contents have changed and so saved should be set to false.
-            * @param event A <strong>TreeModelEvent</strong> encompassing all the information about the event which has changed the tree.
-            */
+     * @param event A <strong>TreeModelEvent</strong> encompassing all the information about the event which has changed the tree.
+     */
     public void treeNodesInserted(TreeModelEvent event) {
         if(collection != null) {
@@ -1419 +1410 @@
     }
     /** Any action that changes one of the tree models within a collection, which are the only models we listen to, mean the collections contents have changed and so saved should be set to false.
-            * @param event A <strong>TreeModelEvent</strong> encompassing all the information about the event which has changed the tree.
-            */
+     * @param event A <strong>TreeModelEvent</strong> encompassing all the information about the event which has changed the tree.
+     */
     public void treeNodesRemoved(TreeModelEvent event) {
         if(collection != null) {
@@ -1427 +1418 @@
     }
     /** Any action that changes one of the tree models within a collection, which are the only models we listen to, mean the collections contents have changed and so saved should be set to false.
-            * @param event A <strong>TreeModelEvent</strong> encompassing all the information about the event which has changed the tree.
-            */
+     * @param event A <strong>TreeModelEvent</strong> encompassing all the information about the event which has changed the tree.
+     */
     public void treeStructureChanged(TreeModelEvent event) {
         if(collection != null) {

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

@@ -89 +89 @@
     back_button = new JButton(Utility.getImage("back.gif"));
     back_button.setEnabled(false);
-    Dictionary.registerTooltip(back_button, "Browser.Back");
+    Dictionary.registerTooltip(back_button, "Browser.Back_Tooltip");
 
     // refresh_button = new JButton(Utility.getImage("reload.gif"));
@@ -100 +100 @@
 
     home_button = new JButton(Utility.getImage("home.gif"));
-    Dictionary.registerTooltip(home_button, "Browser.Home");
+    Dictionary.registerTooltip(home_button, "Browser.Home_Tooltip");
 
     JPanel address_pane = new JPanel();
@@ -108 +108 @@
     JPanel right_button_pane = new JPanel();
     go_button = new JButton(Utility.getImage("go.gif"));
-    Dictionary.registerTooltip(go_button, "Browser.Go");
+    Dictionary.registerTooltip(go_button, "Browser.Go_Tooltip");
 
     stop_button = new JButton(Utility.getImage("stop.gif"));
     stop_button.setEnabled(false);
-    Dictionary.registerTooltip(stop_button, "Browser.Stop");
+    Dictionary.registerTooltip(stop_button, "Browser.Stop_Tooltip");
 
     forward_button = new JButton(Utility.getImage("forward.gif"));
     forward_button.setEnabled(false);
-    Dictionary.registerTooltip(forward_button, "Browser.Forward");
+    Dictionary.registerTooltip(forward_button, "Browser.Forward_Tooltip");
 
     // Calpa Pane stuff

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

@@ -1 @@
-package org.greenstone.gatherer.gui;
 /**
  *#########################################################################
@@ -36 +35 @@
  *########################################################################
  */
+package org.greenstone.gatherer.gui;
+
 import java.awt.*;
 import java.awt.event.*;
@@ -57 +58 @@
 import org.greenstone.gatherer.util.TreeSynchronizer;
 import org.greenstone.gatherer.util.Utility;
-import org.greenstone.gatherer.util.WinRegistry;
+
 /** The collection pane is analogous with a file manager. It is there that the user chooses which files to include in their collection and what structure the file hierarchy should take. The later aspect is not important for the Greenstone Suite, but is usefull for grouping files for ease of metadata markup. The view essentially consists of two file trees, one denoting the entire source workspace and the other the files within your collection. The trees themselves have a title bar at the top, a filter control at the bottom, and are coloured to indicate activity (grey for disabled). The remainder of the screen is taken by a status area, to indicate current file job progress during copying etc, and three buttons for controlling features of the view.
  * @author John Thompson, Greenstone Digital Library, University of Waikato
@@ -198 +199 @@
         FileNode node = (FileNode) collection_tree.getModel().getRoot();
         Gatherer.f_man.newFolder(collection_tree, node);
-        //JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("FileActions.No_Parent_For_New_Folder"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
+        //JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("FileActions.No_Parent_For_New_Folder"), Dictionary.newget("General.Error"), JOptionPane.ERROR_MESSAGE);
         }
     }

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

@@ -57 +57 @@
 import org.greenstone.gatherer.shell.GShellProgressMonitor;
 import org.greenstone.gatherer.util.AppendLineOnlyFileDocument;
+
 /** This class provides a GUI view showing some statistics on your current collection, and options for building it. As the collection is built this initial view is replaced with one showing progress bars and a message log of the creation process. This log can be later accessed via the options tree located in the center of the initial pane. This class is also responsible for creating the GShellProgressMonitors that are then attatched to external shell processes, and calling the methods in the CollectionManager for actually importing and building the collection. <br><BR>
  * <center><table width=80% border=2 cellspacing=0 cellpadding=2><tr><td align=center colspan=4>

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

@@ -1 @@
-package org.greenstone.gatherer.gui;
 /**
  *#########################################################################
@@ -36 +35 @@
  *########################################################################
  */
+package org.greenstone.gatherer.gui;
+
 import java.awt.*;
 import java.awt.event.*;
@@ -42 +43 @@
 import javax.swing.*;
 import javax.swing.event.*;
+import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.file.FileAssociationManager;
@@ -82 +84 @@
     /** The default size for the dialog. */
     static final private Dimension SIZE = new Dimension(600, 270);
+
     /** Create a new file association dialog.
      * @param manager A reference to the <strong>FileAssociationManager</strong> so we can determine what extensions are already associated.
@@ -95 +98 @@
     setModal(true);
     setSize(SIZE);
-    setTitle(get("FileAssociationDialog.Title"));
     setJMenuBar(new SimpleMenuBar("fileassociations"));
+    Dictionary.setText(this, "FileAssociationDialog.Title");
+
     JPanel content_pane = (JPanel) getContentPane();
     content_pane.setBackground(Gatherer.config.getColor("coloring.collection_heading_background", false));
     JPanel control_pane = new JPanel();
-    JTextArea instructions_area = new JTextArea(get("FileAssociationDialog.Instructions"));
+
+    JTextArea instructions_area = new JTextArea();
     instructions_area.setEditable(false);
     instructions_area.setLineWrap(true);
     instructions_area.setRows(5);
     instructions_area.setWrapStyleWord(true);
+    Dictionary.setText(instructions_area, "FileAssociationDialog.Instructions");
+
     JPanel extension_pane = new JPanel();
     extension_pane.setOpaque(false);
-    JLabel extension_label = new JLabel(get("FileAssociationDialog.Extension"));
+    JLabel extension_label = new JLabel();
     extension_label.setPreferredSize(LABEL_SIZE);
+    Dictionary.setText(extension_label, "FileAssociationDialog.Extension");
+
     extension = new GComboBox();
     extension.setEditable(true);
@@ -115 +124 @@
         extension.add(manager.getExtension(i));
     }
+    Dictionary.setTooltip(extension, "FileAssociationDialog.Extension_Tooltip");
+
     JPanel command_pane = new JPanel();
     command_pane.setOpaque(false);
-    JLabel command_label = new JLabel(get("FileAssociationDialog.Command"));
+    JLabel command_label = new JLabel();
     command_label.setPreferredSize(LABEL_SIZE);
+    Dictionary.setText(command_label, "FileAssociationDialog.Command");
     JPanel inner_pane = new JPanel();
     inner_pane.setOpaque(false);
@@ -128 +140 @@
         command.setText(manager.getCommandString((String)extension.get(0)));
     }
-    browse = new JButton(get("FileAssociationDialog.Browse"));
+    Dictionary.setTooltip(command, "FileAssociationDialog.Command_Tooltip");
+
+    browse = new JButton();
     browse.setBackground(Gatherer.config.getColor("coloring.button_background", false));
+    browse.setMnemonic(KeyEvent.VK_B);
     browse.setPreferredSize(LABEL_SIZE);
+    Dictionary.setBoth(browse, "FileAssociationDialog.Browse", "FileAssociationDialog.Browse_Tooltip");
+
     JPanel button_pane = new JPanel();
     button_pane.setOpaque(false);
-    ok = new JButton(get("General.OK"));
+    ok = new JButton();
     ok.setBackground(Gatherer.config.getColor("coloring.button_background", false));
-    cancel = new JButton(get("General.Cancel"));
+    ok.setMnemonic(KeyEvent.VK_O);
+    Dictionary.setBoth(ok, "General.OK", "General.OK_Tooltip");
+    cancel = new JButton();
     cancel.setBackground(Gatherer.config.getColor("coloring.button_background", false));
+    cancel.setMnemonic(KeyEvent.VK_C);
+    Dictionary.setBoth(cancel, "General.Cancel", "General.Pure_Cancel_Tooltip");
+
     // Connection
     browse.addActionListener(new BrowseListener());
@@ -143 +165 @@
     extension.addActionListener(new ExtensionListener());
     command.getDocument().addDocumentListener(new CommandListener());
+
     // Layout
     extension_pane.setBorder(BorderFactory.createEmptyBorder(5,0,0,0));
@@ -186 +209 @@
     previous_extension = null;
     }
+
     /** Redisplay the dialog, ensuring that the details (or lack thereof) for a certain extension is apparent. In fact if an extension is provided force the user to add it or cancel.
      * @param new_extension The extension code as a <strong>String</strong>.
@@ -191 +215 @@
     public String display(String new_extension) {
     if(new_extension != null) {
-        ok.setText(get("FileAssociationDialog.Add"));
+        Dictionary.setBoth(ok, "FileAssociationDialog.Add", "FileAssociationDialog.Add_Tooltip");
         int index = extension.add(new_extension);
         extension.setSelectedIndex(index);
@@ -197 +221 @@
     }
     else {
-        ok.setText(get("General.OK"));
+        Dictionary.setBoth(ok, "General.OK", "General.OK_Tooltip");
         extension.setEnabled(true);
     }
@@ -212 +236 @@
     }
     }
-
-    private String get(String key) {
-    return get(key, null);
-    }
-
-    private String get(String key, String args[]) {
-    if(key.indexOf(".") == -1) {
-        key = "FileAssociationDialog." + key;
-    }
-    return Gatherer.dictionary.get(key, args);
-    }    
 
     private String setCommand(String extension, String command, boolean process) {
@@ -239 +252 @@
     /** Open up a simple JFileChooser when the user clicks the button. 
      * @param event An <strong>ActionEvent</strong> containing information about the event.
-            */
+     */
     public void actionPerformed(ActionEvent event) {
         JFileChooser chooser = new JFileChooser(new File(Utility.BASE_DIR));
-        chooser.setDialogTitle(get("FileAssociationDialog.Browse_Title"));
-        chooser.setFileFilter(new ExtensionFileFilter(".bat", get("FileAssociationDialog.Batch_File")));
-        chooser.setFileFilter(new ExtensionFileFilter(".com", get("FileAssociationDialog.Command_File")));
-        chooser.setFileFilter(new ExtensionFileFilter(".exe", get("FileAssociationDialog.Executable_File")));
+        chooser.setDialogTitle(Dictionary.newget("FileAssociationDialog.Browse_Title"));
+        chooser.setFileFilter(new ExtensionFileFilter(".bat", Dictionary.newget("FileAssociationDialog.Batch_File")));
+        chooser.setFileFilter(new ExtensionFileFilter(".com", Dictionary.newget("FileAssociationDialog.Command_File")));
+        chooser.setFileFilter(new ExtensionFileFilter(".exe", Dictionary.newget("FileAssociationDialog.Executable_File")));
         chooser.setAcceptAllFileFilterUsed(true);
         int return_val = chooser.showOpenDialog(null);
@@ -254 +267 @@
     }
     }
+
     /** Listens for actions apon the cancel button, and if detected disposes of the dialog without saving changes. */
     private class CancelListener
@@ -266 +280 @@
     }
     }
+
     /** If any changes occur to the command field, mark it as needing saving before we can change extensions, or dispose of this dialog (other than cancelling. */
     private class CommandListener
@@ -283 +298 @@
     }
     }
+
     /** Whenever the user selects an extension, we should fill out the command field with whatever value has been previously entered for the command (if any). */
     private class ExtensionListener
@@ -305 +321 @@
     }
     }
+
     /** Listen for clicks on the ok button, and dispose when detected. */
     private class OKListener

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

@@ -35 +35 @@
  *########################################################################
  */
-
- 
-
-
-
-
 package org.greenstone.gatherer.gui;
 
-import java.awt.BorderLayout;
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.Graphics2D;
-import java.awt.GridLayout;
-import java.awt.Image;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.geom.AffineTransform;
-import java.awt.image.BufferedImage;
-import javax.swing.BorderFactory;
-import javax.swing.ImageIcon;
-import javax.swing.JButton;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JProgressBar;
-import javax.swing.border.BevelBorder;
+import java.awt.*;
+import java.awt.event.*;
+import javax.swing.*;
+import javax.swing.border.*;
+import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.collection.Job;
@@ -71 +53 @@
 
     private Dimension bar_size = new Dimension(520, 15);
-
-    private Gatherer gatherer;
-
-    private ImageIcon busy_bar;
-    private ImageIcon ready_bar;
 
     private int current_action;
@@ -104 +81 @@
     public JButton cancel;
 
-    //public GProgressBar(Gatherer gatherer, WGet owner, String initial_url) {
-    //    this.gatherer = gatherer;
     public GProgressBar(Job owner, String initial_url, boolean simple) {
     this.owner = owner;
@@ -120 +95 @@
     this.setLayout(new BorderLayout());
     this.setBorder(BorderFactory.createBevelBorder(BevelBorder.RAISED));
-    //this.setMinimumSize(Utility.PROGRESS_BAR_SIZE);
-    //this.setSize(Utility.PROGRESS_BAR_SIZE);
-    //this.setMaximumSize(Utility.PROGRESS_BAR_SIZE);
-    //this.setAlignmentY(Component.LEFT_ALIGNMENT);
-    //this.setHorizontalAlignment(JLabel.LEFT);
 
     this.current_action = Job.STOPPED;
-          
+
     inner_pane = new JPanel(new BorderLayout());
     inner_pane.setBorder(BorderFactory.createEmptyBorder(2,2,2,2));
 
     action = new JButton(Utility.getImage("vcrplay.gif"));
-    //action.setToolTipText(get("Action_Tip"));
-    action.setToolTipText("Start current download");
     action.addActionListener(this);
     action.addActionListener(owner);
+    Dictionary.setTooltip(action, "Mirroring.Job.Start_Tooltip");
 
     center_pane = new JPanel(new GridLayout(3,1));
@@ -146 +115 @@
 
     progress = new JProgressBar();
-    progress.setString("Waiting to start");
     progress.setStringPainted(true);
     progress.setMinimum(0);
     progress.setMaximum(0);
     progress.setEnabled(false);
+    Dictionary.setText(progress, "Mirroring.Job.Waiting");
     inner_pane.add(progress, BorderLayout.CENTER);
 
@@ -158 +127 @@
 
     cancel = new JButton(Utility.getImage("vcrstop.gif"));
-    //cancel.setToolTipText(get("Cancel_Tip"));
-    cancel.setToolTipText("Cancel current download");
     cancel.addActionListener(owner);
     cancel.addActionListener(this);
+    Dictionary.setTooltip(cancel, "Mirroring.Job.Stop_Tooltip");
 
     inner_pane.add(center_pane, BorderLayout.NORTH);
@@ -175 +143 @@
     public void actionPerformed(ActionEvent event) {
     if(event.getSource() == action) {
-        if(current_action == Job.RUNNING) {
+        if (current_action == Job.RUNNING) {
         current_action = Job.STOPPED;
         action.setIcon(Utility.getImage("vcrplay.gif"));
-        action.setToolTipText("Start current download");
+        Dictionary.setTooltip(action, "Mirroring.Job.Start_Tooltip");
         cancel.setEnabled(true);
         }
@@ -184 +152 @@
         current_action = Job.RUNNING;
         action.setIcon(Utility.getImage("vcrpause.gif"));
-        action.setToolTipText("Pause current download");
+        Dictionary.setTooltip(action, "Mirroring.Job.Pause_Tooltip");
         cancel.setEnabled(false);
         }
@@ -212 +180 @@
     }
     progress.setValue(progress.getMaximum());
-    progress.setString("Download Complete.");
+    Dictionary.setText(progress, "Mirroring.Job.Download_Complete");
     refresh();
     }
@@ -232 +200 @@
     }
 
-    public Dimension getPerferredSize() {
+    public Dimension getPreferredSize() {
     return Utility.PROGRESS_BAR_SIZE;
     }
@@ -259 +227 @@
         this.err_count = 0;
         this.warning_count = 0;
-    }               
+    }
     current_action = Job.RUNNING;
     action.setIcon(Utility.getImage("vcrpause.gif"));
-    action.setToolTipText("Pause current download");
+    Dictionary.setTooltip(cancel, "Mirroring.Job.Pause_Tooltip");
     // If this is a simple download, then pause is not available (nor is prematurely stopping!)
     action.setEnabled(!simple);
@@ -283 +251 @@
     }
     progress.setValue(progress.getMaximum());
-    progress.setString("Mirroring Complete.");
+    Dictionary.setText(progress, "Mirroring.Job.Mirror_Complete");
 
     action.setIcon(Utility.getImage("vcrfastforward.gif"));
-    action.setToolTipText("Restart current download");
+    Dictionary.setText(action, "Mirroring.Job.Restart");
     action.setEnabled(true);
     cancel.setEnabled(true);
@@ -298 +266 @@
     file_size = file_size + current;
     if(!progress.isIndeterminate()) {
-                // If current is zero, then this is the 'precall' before the
-                // downloading actually starts.
+        // If current is zero, then this is the 'precall' before the
+        // downloading actually starts.
         if(current == 0) {
         // Remove the old progress bar, then deallocate it.
@@ -305 +273 @@
         progress = null;
         if(expected == 0) {
-            // We don't have a content length. This bar will go from
-            // 0 to 100 only!
+            // We don't have a content length. This bar will go from 0 to 100 only!
             progress = new JProgressBar(0, 100);
         }
         else {
-            // Assign a new progress bar of length expected content
-            // length.
-            progress = 
-            new JProgressBar(0, (new Long(expected)).intValue());
+            // Assign a new progress bar of length expected content length.
+            progress = new JProgressBar(0, (new Long(expected)).intValue());
         }
         progress.setEnabled(true);
@@ -320 +285 @@
         inner_pane.updateUI();
         }
-                // Otherwise if expected is not zero move the progress bar and
-                // update percent complete.
+        // Otherwise if expected is not zero move the progress bar and
+        // update percent complete.
         else if (expected != 0) {
         progress.setValue((new Long(file_size)).intValue());
-        int p_c = 
-            (new Double(
-                progress.getPercentComplete() * 100)).intValue();
+        int p_c = (new Double(progress.getPercentComplete() * 100)).intValue();
         progress.setString(p_c + "%");
         progress.setStringPainted(true);
         }
-                // Finally, in the case we have no content length, we'll instead
-                // write the current number of bytes downloaded again.
+        // Finally, in the case we have no content length, we'll instead
+        // write the current number of bytes downloaded again.
         else {
-        progress.setString( file_size + " bytes");
+        progress.setString(file_size + " b");
         progress.setStringPainted(true);
         }
     }
     refresh();
-    }
-
-    /** Retrieve a String from the dictionary using no arguments.
-     * @param key The String which acts as a key mapping for the 
-     * ResourceBundle.
-     * @return A String which is the value for the given key.
-     */
-    private String get(String key) {
-    return get(key, null);
-    }
-
-    /** Retrieve a String from the dictionary using the given arguments.
-     * @param key The String which acts as a key mapping for the 
-     * ResourceBundle.
-     * @param args A String array of arguments to be filled out inside the
-     * dictionary value.
-     * @return A String which is the value for the given key.
-     */
-    private String get(String key, String args[]) {
-    if(key.indexOf('.') == -1) {
-        return gatherer.dictionary.get("GProgressBar."+key, args);
-    }
-    return gatherer.dictionary.get(key, args);
-    }
-
-    /** The given parameter is taken as the number of bytes and is 
-     * formatted into a strings such as:
-     *   45 bytes
-     * 1.21 Kbytes
-     * 2.12 Mbytes
-     * etc
-     * @param size The number to be formatted, in bytes, as a Long.
-     * @return A String which contains the size formatting into a
-     * nice little number - unit label.
-     */
-    private String formatMetric(long size) {
-    if(size > 1024) {
-        return (size / 1024) + " Kbytes";
-    }
-    return size + " bytes";
     }
 
@@ -389 +312 @@
     String args1[] = new String[1];
     args1[0] = initial_url.toString();
-          
-    //main_status.setText(get("Main_Status", args1));
-    main_status.setText("Mirroring " + args1[0] + ".");
-
-    if(current_url != null) {
-                // Refresh the current label contents.
+    Dictionary.setText(main_status, "Mirroring.Job.Mirroring", args1);
+
+    if (current_url != null) {
+        // Refresh the current label contents.
         String args2[] = new String[1];
         args2[0] = current_url;
-                
-        String cstext = "Downloading " + args2[0];
-        current_status.setText(Utility.trim(cstext, 50));
-    }
-    else if(current_action == Job.STOPPED 
-        || current_action == Job.PAUSED) {
-        current_status.setText("Waiting for user action.");
-    } 
+        Dictionary.setText(current_status, "Mirroring.Job.Downloading", args2);
+    }
+    else if (current_action == Job.STOPPED || current_action == Job.PAUSED) {
+        Dictionary.setText(current_status, "Mirroring.Job.Waiting_User");
+    }
     else {
-        current_status.setText("Mirroring Complete.");
+        Dictionary.setText(current_status, "Mirroring.Job.Mirroring_Complete");
     }
 
@@ -415 +333 @@
     args3[2] = warning_count + "";
     args3[3] = err_count + "";
-
-    results_status.setText("Downloaded " + args3[0] + " of " + 
-                   args3[1] + " files (" + args3[2] + 
-                   " warnings, " + args3[3] + " errors)");
+    Dictionary.setText(results_status, "Mirroring.Job.Status", args3);
 
     this.updateUI();

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

@@ -70 +70 @@
 import org.greenstone.gatherer.gui.PreviewPane;
 import org.greenstone.gatherer.gui.SimpleOpenCollectionDialog;
-import org.greenstone.gatherer.gui.messages.MessagePane;
 import org.greenstone.gatherer.gui.metaaudit.MetaAuditFrame;
 import org.greenstone.gatherer.gui.tree.DragTree;
@@ -99 +98 @@
     /** The menu bar. */
     public MenuBar menu_bar = null;
-    /** The message pane is optional and contains the log of messages sent. */
-    public MessagePane message_pane = null;
-
     public MetaAuditFrame meta_audit;
     /** The metaedit pane is used to assign, edit and remove metadata from files within the collection. */
@@ -335 +331 @@
         showMetaAuditBox();
     }
-    else if(esrc == menu_bar.tools_log) {
-        showLogBox();
-    }
     }
     /** Any actions that should happen after the display of the Gatherer window can be called here. Currently only updates the browser pane if it is active to work around bug in Mozilla renderer implementation.
@@ -641 +634 @@
     return result;
     }
-    /** When called this method causes the Log class in Gatherer to display a nice dialog box which contains the log.
-     */
-    public void showLogBox() {
-    Gatherer.log.display();
-    }
+
     /** When called this method causes the MetaAuditBox class in CollectionManager to display a nice dialog box which contains all the metadata assigned in the collection.
      */

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

@@ -298 +298 @@
         title_final = title.getText();
         if(title_final.length() == 0) {
-        GPrompt err_msg = new GPrompt(self, Dictionary.newget("NewCollectionPrompt.Error"), Dictionary.newget("NewCollectionPrompt.Title_Error"), "error.gif", null);
-        err_msg.display();
-        err_msg.destroy();
-        err_msg = null;
+        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("NewCollectionPrompt.Title_Error"), Dictionary.newget("NewCollectionPrompt.Error"), JOptionPane.ERROR_MESSAGE);
         title.setForeground(Gatherer.config.getColor("coloring.error_foreground", false));
         title.setBackground(Gatherer.config.getColor("coloring.error_background", false));
@@ -313 +310 @@
         for(int i = 0; children != null && i < children.length; i++) {
             if(children[i].getName().equals(name_final)) {
-            GPrompt err_msg = new GPrompt(self, Dictionary.newget("NewCollectionPrompt.Error"), Dictionary.newget("NewCollectionPrompt.Name_Error"), "error.gif", null);
-            err_msg.display();
-            err_msg.destroy();
-            err_msg = null;
+            JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("NewCollectionPrompt.Name_Error"), Dictionary.newget("NewCollectionPrompt.Error"), JOptionPane.ERROR_MESSAGE);
             file.setForeground(Gatherer.config.getColor("coloring.error_foreground", false));
             file.setBackground(Gatherer.config.getColor("coloring.error_background", false));
@@ -324 +318 @@
         }
         else {
-        GPrompt err_msg = new GPrompt(self, Dictionary.newget("NewCollectionPrompt.Error"), Dictionary.newget("NewCollectionPrompt.Name_Error"), "error.gif", null);
-        err_msg.display();
-        err_msg.destroy();
-        err_msg = null;
+        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("NewCollectionPrompt.Name_Error"), Dictionary.newget("NewCollectionPrompt.Error"), JOptionPane.ERROR_MESSAGE);
         file.setForeground(Gatherer.config.getColor("coloring.error_foreground", false));
         file.setBackground(Gatherer.config.getColor("coloring.error_background", false));
@@ -334 +325 @@
         email_final = address.getText() + "@" + host.getText();
         if(email_final.length() == 0 || email_final.startsWith("@") || email_final.endsWith("@")) {
-        GPrompt err_msg = new GPrompt(self, Dictionary.newget("NewCollectionPrompt.Error"), Dictionary.newget("NewCollectionPrompt.Email_Error"), "error.gif", null);
-        err_msg.display();
-        err_msg.destroy();
-        err_msg = null;
+        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("NewCollectionPrompt.Email_Error"), Dictionary.newget("NewCollectionPrompt.Error"), JOptionPane.ERROR_MESSAGE);
         address.setForeground(Gatherer.config.getColor("coloring.error_foreground", false));
         address.setBackground(Gatherer.config.getColor("coloring.error_background", false));
@@ -346 +334 @@
         description_final = description.getText();
         if(description_final.length() == 0) {
-        GPrompt err_msg = new GPrompt(self, Dictionary.newget("NewCollectionPrompt.Error"), Dictionary.newget("NewCollectionPrompt.Description_Error"), "error.gif", null);
-        err_msg.display();
-        err_msg.destroy();
-        err_msg = null;
+        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("NewCollectionPrompt.Description_Error"), Dictionary.newget("NewCollectionPrompt.Error"), JOptionPane.ERROR_MESSAGE);
         description.setForeground(Gatherer.config.getColor("coloring.error_foreground", false));
         description.setBackground(Gatherer.config.getColor("coloring.error_background", false));

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

@@ -7 +7 @@
 import javax.swing.*;
 import javax.swing.event.*;
+import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.checklist.CheckList;
 import org.greenstone.gatherer.checklist.Entry;
-import org.greenstone.gatherer.gui.GUIManager;
 import org.greenstone.gatherer.gui.SimpleMenuBar;
 import org.greenstone.gatherer.gui.ModalDialog;
 import org.greenstone.gatherer.cdm.ElementWrapper;
 import org.greenstone.gatherer.msm.MetadataSet;
-import org.greenstone.gatherer.msm.MetadataSetManager;
 import org.greenstone.gatherer.util.StaticStrings;
 import org.greenstone.gatherer.util.Utility;
@@ -35 +34 @@
     setModal(true);
     setSize(size);
-    setTitle(get("NewCollectionPrompt.Title"));
+    Dictionary.setText(this, "NewCollectionPrompt.Title");
 
     // And the remaining metadata sets.
@@ -53 +52 @@
 
     JPanel instructions_panel = new JPanel();
-    JLabel instructions_label1 = new JLabel(get("NewCollectionPrompt.Metadata_Instructions1"));
-    JLabel instructions_label2 = new JLabel(get("NewCollectionPrompt.Metadata_Instructions2"));
+    JLabel instructions_label1 = new JLabel();
+    Dictionary.setText(instructions_label1, "NewCollectionPrompt.Metadata_Instructions1");
+    JLabel instructions_label2 = new JLabel();
+    Dictionary.setText(instructions_label2, "NewCollectionPrompt.Metadata_Instructions2");
 
     JPanel center_pane = new JPanel();
 
     JPanel sets_list_pane = new JPanel();
-    JLabel sets_list_label = new JLabel(get("NewCollectionPrompt.Select_MDS"));
+    JLabel sets_list_label = new JLabel();
     sets_list_label.setOpaque(false);
+    Dictionary.setText(sets_list_label, "NewCollectionPrompt.Select_MDS");
     sets_list = new CheckList(sets, true);
 
     JPanel elements_list_pane = new JPanel();
-    JLabel elements_list_label = new JLabel(get("NewCollectionPrompt.Metadata_Elements"));
+    JLabel elements_list_label = new JLabel();
+    Dictionary.setText(elements_list_label, "NewCollectionPrompt.Metadata_Elements");
     elements_list = new JList();
     elements_list.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
@@ -72 +75 @@
 
     JPanel button_pane = new JPanel();
-    JButton ok_button = new JButton(get("General.OK"));
-    JButton cancel_button = new JButton(get("General.Cancel"));
+    JButton ok_button = new JButton();
+    ok_button.setMnemonic(KeyEvent.VK_O);
+    Dictionary.setBoth(ok_button, "General.OK", "General.OK_Tooltip");
+    JButton cancel_button = new JButton();
+    cancel_button.setMnemonic(KeyEvent.VK_C);
+    Dictionary.setBoth(cancel_button, "General.Cancel", "General.Pure_Cancel_Tooltip");
+
     // Connection
     ok_button.addActionListener(new OKButtonListener());
     cancel_button.addActionListener(new CancelButtonListener());
     sets_list.addListSelectionListener(new MetadataListSelectionListener());
+
     // Display
     instructions_panel.setLayout(new GridLayout(2,1));
@@ -106 +115 @@
     content_pane.add(center_pane, BorderLayout.CENTER);
     content_pane.add(button_pane, BorderLayout.SOUTH);
+
     // Show
     Dimension screen_size = Gatherer.config.screen_size;
@@ -118 +128 @@
     public boolean isCancelled() {
     return cancelled;
-    }
-
-    /** 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);
     }
 

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

@@ -13 +13 @@
 import org.greenstone.gatherer.checklist.CheckList;
 import org.greenstone.gatherer.checklist.Entry;
-import org.greenstone.gatherer.gui.GUIManager;
 import org.greenstone.gatherer.gui.ModalDialog;
 import org.greenstone.gatherer.gui.NumberField;

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

@@ -1 @@
-package org.greenstone.gatherer.gui;
 /**
  *#########################################################################
@@ -36 +35 @@
  *########################################################################
  */
+package org.greenstone.gatherer.gui;
+
 import calpa.html.*;
 import java.awt.*;
@@ -41 +42 @@
 import java.net.*;
 import javax.swing.*;
+import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.util.GURL;
@@ -67 +69 @@
 
     // Create components
-    back = new JButton(get("Browser.Back"), Utility.getImage("back.gif"));
+    back = new JButton(Utility.getImage("back.gif"));
     back.addActionListener(new BackListener());
     back.setEnabled(false);
-
-    home = new JButton(get("Browser.Home"), Utility.getImage("home.gif"));
+    Dictionary.registerBoth(back, "Browser.Back", "Browser.Back_Tooltip");
+
+    home = new JButton(Utility.getImage("home.gif"));
     home.addActionListener(new HomeListener());
     home.setEnabled(false);
-
-    forward = new JButton(get("Browser.Forward"), Utility.getImage("forward.gif"));
+    Dictionary.registerBoth(home, "Browser.Home", "Browser.Home_Tooltip");
+
+    forward = new JButton(Utility.getImage("forward.gif"));
     forward.addActionListener(new ForwardListener());
     forward.setEnabled(false);
-
-    reload = new JButton(get("Browser.Reload"), Utility.getImage("reload.gif"));
+    Dictionary.registerBoth(forward, "Browser.Forward", "Browser.Forward_Tooltip");
+
+    reload = new JButton(Utility.getImage("reload.gif"));
     reload.addActionListener(new ReloadListener());
     reload.setEnabled(false);
+    Dictionary.registerBoth(reload, "Browser.Reload", "Browser.Reload_Tooltip");
 
     CalHTMLPreferences prefs = new CalHTMLPreferences();
@@ -87 +93 @@
     view = new CalHTMLPane(prefs, observer, "Default");
 
-    status = new JLabel(get("Browser.Ready"));
+    status = new JLabel();
+    Dictionary.registerText(status, "Browser.Ready"); 
     }
 
@@ -101 +108 @@
         // Now load the collection
         homepage = new URL(Gatherer.config.exec_address.toString() + "?a=p&p=about&c=" + Gatherer.c_man.getCollection().getName());
-        ///atherer.println("Loading " + url);
-        status.setText(get("Browser.Loading", homepage.toString()));
+        String[] args = new String[1];
+        args[0] = homepage.toString();
+        Dictionary.registerText(status, "Browser.Loading", args);
         view.showHTMLDocument(homepage, null, true);
         }
@@ -139 +147 @@
             // Now load the collection
             homepage = new URL(Gatherer.config.exec_address.toString() + "?a=p&p=about&c=" + Gatherer.c_man.getCollection().getName());
-            ///atherer.println("Loading " + url);
-            status.setText(get("Browser.Loading", homepage.toString()));
+            String[] args = new String[1];
+            args[0] = homepage.toString();
+            Dictionary.registerText(status, "Browser.Loading", args);
             view.showHTMLDocument(homepage);
         }
@@ -149 +158 @@
     }
     validate();
-    }
-
-    /** Used to retrieve the phrase that matches the given key from the loaded dictionary.
-     */
-    public String get(String key) {
-    return get(key, null);
-    }
-
-    public String get(String key, String arg) {
-    if(key.indexOf(".") == -1) {
-        key = "Browser." + key;
-    }
-    return Gatherer.dictionary.get(key, arg);
     }
 
@@ -231 +227 @@
         validate();
     }
+
     public void linkFocusUpdate(CalHTMLPane pane, URL url) {
-        ///ystem.err.println("Link in focus " + url.toString());
-        status.setText(get("Browser.Follow", url.toString()));
-    }
+        String[] args = new String[1];
+        args[0] = url.toString();
+        Dictionary.registerText(status, "Browser.Follow", args);
+    }
+
     public void statusUpdate(CalHTMLPane pane, int state, URL url, int value, String message) {
         this.state = state;
+        String[] args = new String[1];
+        args[0] = url.toString();
+
         switch(state) {
         // The Pane is attempting to connect to the given URL to receive data.
@@ -245 +247 @@
         case CalCons.PARSE_FAILED:
         ///ystem.err.println("Parse Failed: " + state + " - " + message);
-        status.setText(get("Browser.CannotConnect", url.toString()));
+        Dictionary.registerText(status, "Browser.CannotConnect", args);
         break;
         // The Pane has established a connection to the given URL and is receiving any content.
         case CalCons.CONNECTED:
         ///ystem.err.println("Connected: " + state + " - " + message);
-        status.setText(get("Browser.Loading", url.toString()));
+        Dictionary.registerText(status, "Browser.Loading", args);
         break;
         // The size of the content at the given URL is known and is contained in the value argument.
@@ -263 +265 @@
         case CalCons.PARSE_FAILED_POST_CONNECT:
         ///ystem.err.println("Parse Failed Post Connect: " + state + " - " + message);
-        status.setText(get("Browser.TimedOut", url.toString()));
+        Dictionary.registerText(status, "Browser.TimedOut", args);
         break;
         // The document has been parsed but formatting cannot be completed because the document contains images of unspecified size. The parsing thread is waiting for image updates to give it the information it needs to format and display the document.
@@ -272 +274 @@
         case CalCons.DOC_LOADED:
         ///ystem.err.println("Doc Loaded: " + state + " - " + message);
-        status.setText(get("Browser.Ready"));
+        Dictionary.registerText(status, "Browser.Ready");
         break;
         }

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

@@ -1 +1 @@
 package org.greenstone.gatherer.gui;
+
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
+import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
-import org.greenstone.gatherer.gui.GUIManager;
 import org.greenstone.gatherer.util.Utility;
+
 public class SimpleMenuBar
     extends JMenuBar
     implements ActionListener {
-     
+
     private String page_name;
 
     public SimpleMenuBar(String page_name) {
     this.page_name = page_name;
-    JMenu help = new JMenu(Gatherer.dictionary.get("Menu.Help"));
+    JMenu help = new JMenu();
     help.setIcon(Utility.HELP_ICON);
-          
-    JMenuItem help_help = new JMenuItem(Gatherer.dictionary.get("Menu.Help"));
+    Dictionary.setText(help, "Menu.Help");
+
+    JMenuItem help_help = new JMenuItem();
     help_help.addActionListener(this);
-          
+    Dictionary.setText(help_help, "Menu.Help");
+
     help.add(help_help);
-          
+
     add(Box.createHorizontalGlue());
     add(help);

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

@@ -33 +33 @@
 import javax.swing.*;
 import javax.swing.event.*;
-import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.collection.CollectionConfiguration;
-import org.greenstone.gatherer.gui.GUIManager;
 import org.greenstone.gatherer.gui.ModalDialog;
 import org.greenstone.gatherer.util.StaticStrings;
 import org.greenstone.gatherer.util.Utility;
+
 /** A dialog which provides a straight-forward access to the currently installed collections. It also will contain the ability to continue through to the original OpenCollectionDialog if your source collection is located somewhere other than the gsdl collect folder. */
 public class SimpleOpenCollectionDialog
@@ -66 +65 @@
     super(Gatherer.g_man, "", true);
     setSize(SIZE);
-    setTitle(get("OpenCollectionDialog.Title"));
-    
+    Dictionary.setText(this, "OpenCollectionDialog.Title");
+
     // Creation
     JPanel content_pane = (JPanel) getContentPane();
@@ -74 +73 @@
     
     JPanel collection_list_pane = new JPanel();
-    JLabel collection_list_label = new JLabel(get("OpenCollectionDialog.Available_Collections"));
+    JLabel collection_list_label = new JLabel();
+    Dictionary.setText(collection_list_label, "OpenCollectionDialog.Available_Collections");
     collection_list = new JList(new CollectionListModel());
 
@@ -83 +83 @@
 
     JPanel description_textarea_pane = new JPanel();
-    JLabel description_textarea_label = new JLabel(get("OpenCollectionDialog.Description"));
+    JLabel description_textarea_label = new JLabel();
+    Dictionary.setText(description_textarea_label, "OpenCollectionDialog.Description");
     description_textarea = new JTextArea();
 
     JPanel button_pane = new JPanel();
-    open_button = new JButton(get("OpenCollectionDialog.Open"));
+    open_button = new JButton();
     open_button.setEnabled(false);
     open_button.setMnemonic(KeyEvent.VK_O);
-    advanced_button = new JButton(get("OpenCollectionDialog.Advanced"));
+    Dictionary.setBoth(open_button, "OpenCollectionDialog.Open", "OpenCollectionDialog.Open_Tooltip");
+    advanced_button = new JButton();
     advanced_button.setMnemonic(KeyEvent.VK_B);
-    cancel_button = new JButton(get("General.Cancel"));
+    Dictionary.setBoth(advanced_button, "OpenCollectionDialog.Browse", "OpenCollectionDialog.Browse_Tooltip");
+    cancel_button = new JButton();
     cancel_button.setMnemonic(KeyEvent.VK_C);
+    Dictionary.setBoth(cancel_button, "General.Cancel", "General.Pure_Cancel_Tooltip");
+
     // Connection
     advanced_button.addActionListener(new AdvancedListener());
@@ -99 +104 @@
     open_button.addActionListener(new OpenListener());
     collection_list.addListSelectionListener(new CollectionListSelectionListener());
+
     // Layout
     collection_list_pane.setLayout(new BorderLayout());
@@ -142 +148 @@
     public String getFileName() {
     return filename;
-    }
-
-    private String get(String key) {
-    return Gatherer.dictionary.get(key);
     }
 

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

@@ -7 +7 @@
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
-// import org.greenstone.gatherer.gui.SmarterTextArea;
 import org.greenstone.gatherer.util.FocusChangerTask;
 import org.greenstone.gatherer.util.Utility;

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

@@ -1 @@
-package org.greenstone.gatherer.gui.table;
 /**
  *#########################################################################
@@ -26 +25 @@
  *########################################################################
  */
+package org.greenstone.gatherer.gui.table;
+
 import java.awt.*;
 import java.io.File;
@@ -32 +33 @@
 import javax.swing.table.*;
 import org.greenstone.gatherer.Configuration;
+import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.file.FileNode;
@@ -43 +45 @@
 import org.greenstone.gatherer.util.ArrayTools;
 import org.greenstone.gatherer.util.Utility;
+
 /** Provides the model for a GTable component, filling it with metadata values for the choosen files or folders. The model also provides several different view of this data; assigned folder metadata, assigned file metadata, all assigned metadata, unassigned metadata, and all metadata. It also differentiates between metadata that is common to all of the files or folders, and that which isn't. The building of the actual model is done on a separate thread so that the gui remains responsive, and the gui is intermitantly updated by this thread. Updating of the model is triggered by events recieved from the metadata set manager in terms of new or obsolete metadata. A new model is rebuilt whenever the user selects a different group of files or folders.
  * @author John Thompson, Greenstone Digital Library, University of Waikato
@@ -60 +63 @@
     private ModelBuilder builder = null;
 
-    static final private String[] COLUMN_NAMES = {"", Gatherer.dictionary.get("Metadata.Element"),  Gatherer.dictionary.get("Metadata.Value")};
+    static final private String[] COLUMN_NAMES = {"", Dictionary.newget("Metadata.Element"),  Dictionary.newget("Metadata.Value")};
 
 

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

@@ -113 +113 @@
     // Is row at top of screen?
     if(pt.y + bounds.y <= AUTOSCROLL_MARGIN) {
-                // Yes, scroll up one row
+        // Yes, scroll up one row
         if(row <= 0) {
         row = 0;
@@ -122 +122 @@
     }
     else {
-                // No, scroll down one row
+        // No, scroll down one row
         if(row < getRowCount() - 1) {
         row = row + 1;
@@ -131 +131 @@
 
     /** In order for the appearance to be consistant, given we may be in the situation where the pointer has left our focus but the ghost remains, this method allows other members of the GGroup to tell this component to clear its ghost.
-      */
+     */
     public void clearGhost() {
     // Erase the last ghost image and cue line
@@ -138 +138 @@
 
     /** Any implementation of DragSourceListener must include this method so we can be notified when the drag event ends (somewhere else), which will in turn remove actions.
-      * @param event A <strong>DragSourceDropEvent</strong> containing all the information about the end of the drag event.
-      */
+     * @param event A <strong>DragSourceDropEvent</strong> containing all the information about the end of the drag event.
+     */
     public void dragDropEnd(DragSourceDropEvent event) {
     if(event.getDropSuccess()) {
-                // Do whatever I do when the drop is successful.
+        // Do whatever I do when the drop is successful.
     }
     }
     /** Any implementation of DragSourceListener must include this method so we can be notified when the drag focus enters this component.
-      * @param event A <strong>DragSourceDragEvent</strong> containing all the information
-      * about the drag event.
-      */
+     * @param event A <strong>DragSourceDragEvent</strong> containing all the information
+     * about the drag event.
+     */
     public void dragEnter(DragSourceDragEvent event) {
     // Handled elsewhere.
     }
     /** Any implementation of DropTargetListener must include this method so we can be notified when the drag focus enters this component, which in this case is to grab focus from within our group.
-      * @param event A <strong>DropTargetDragEvent</strong> containing all the information about the drag event.
-      */
+     * @param event A <strong>DropTargetDragEvent</strong> containing all the information about the drag event.
+     */
     public void dragEnter(DropTargetDragEvent event) {
     group.grabFocus(this);
     }
     /** Any implementation of DragSourceListener must include this method so we can be notified when the drag focus leaves this component.
-      * @param event A <strong>DragSourceEvent</strong> containing all the information about the drag event.
-      */
+     * @param event A <strong>DragSourceEvent</strong> containing all the information about the drag event.
+     */
     public void dragExit(DragSourceEvent event) {
     clearGhost();
@@ -166 +166 @@
 
     /** Any implementation of DropTargetListener must include this method
-      * so we can be notified when the drag focus leaves this component.
-      * @param event A DropTargetEvent containing all the information
-      * about the drag event.
-      */
+     * so we can be notified when the drag focus leaves this component.
+     * @param event A DropTargetEvent containing all the information
+     * about the drag event.
+     */
     public void dragExit(DropTargetEvent event) {
     clearGhost();
@@ -175 +175 @@
 
     /** Any implementation of DragGestureListener must include this method
-      * so we can be notified when a drag action has been noticed, thus a
-      * drag action has begun.
-      * @param event A DragGestureEvent containing all the information about
-      * the drag event.
-      */
+     * so we can be notified when a drag action has been noticed, thus a
+     * drag action has begun.
+     * @param event A DragGestureEvent containing all the information about
+     * the drag event.
+     */
     public void dragGestureRecognized(DragGestureEvent event) {
     // Can never drag from MetaEdit tree
@@ -253 +253 @@
 
     /** Implementation side-effect.
-      * @param event A DragSourceDragEvent containing all the information about the drag event.
-      */
+     * @param event A DragSourceDragEvent containing all the information about the drag event.
+     */
     public void dragOver(DragSourceDragEvent event) {
     }
 
     /** Any implementation of DropTargetListener must include this method
-      * so we can be notified when the drag moves in this component.
-      * @param event A DropTargetDragEvent containing all the information
-      * about the drag event.
-      */
+     * so we can be notified when the drag moves in this component.
+     * @param event A DropTargetDragEvent containing all the information
+     * about the drag event.
+     */
     public void dragOver(DropTargetDragEvent event) {
     // Draw the mouse ghost
@@ -324 +324 @@
             target = (FileNode) target_path.getLastPathComponent();
         }
-        //else {
-        //    // Warn that this is an invalid drop.
-        //    MessageTask invalid_target_task = new MessageTask(Gatherer.dictionary.get("General.Error"), Gatherer.dictionary.get("FileActions.InvalidTarget"));
-        //    invalid_target_task.start();
-        //    invalid_target_task = null;
-        //}
         }
         else {
@@ -357 +351 @@
         }
     }
-    //else {
-    //     Warn that this is an invalid drop.
-    //    ///ystem.err.println("About to show a modal dialog box from JOptionPane.");
-    //    MessageTask read_only_task = new MessageTask(Gatherer.dictionary.get("General.Error"), Gatherer.dictionary.get("FileActions.ReadOnlyTarget"));
-    //    read_only_task.start();
-    //    read_only_task = null;
-    //    ///ystem.err.println("Returning from a modal dialog box.");
-    //}
     // Clear up the group.image_ghost
     paintImmediately(ra_ghost.getBounds());
@@ -370 +356 @@
     }
 
-    //private class MessageTask
-    //  extends Thread {
-    //  private String message;
-    //  private String title;
-    //
-    //  MessageTask(String title, String message) {
-    //      this.message = message;
-    //      this.title = title;
-    //  }
-    //
-    //  public void run() {
-    //      JOptionPane.showMessageDialog(Gatherer.g_man, message, title, JOptionPane.ERROR_MESSAGE);
-    //  }
-    //}
 
     /** Any implementation of DragSourceListener must include this method
-      * so we can be notified when the action to be taken upon drop changes.
-      * @param event A DragSourceDragEvent containing all the information
-      * about the drag event.
-      */
+     * so we can be notified when the action to be taken upon drop changes.
+     * @param event A DragSourceDragEvent containing all the information
+     * about the drag event.
+     */
     public void dropActionChanged(DragSourceDragEvent event) {
     }
 
     /** Any implementation of DropTargetListener must include this method
-      * so we can be notified when the action to be taken upon drop changes.
-      * @param event A DropTargetDragEvent containing all the information
-      * about the drag event.
-      */
+     * so we can be notified when the action to be taken upon drop changes.
+     * @param event A DropTargetDragEvent containing all the information
+     * about the drag event.
+     */
     public void dropActionChanged(DropTargetDragEvent event) {
     }
 
     /** Used to notify this component that it has gained focus. It should
-      * make some effort to inform the user of this.
-      */
+     * make some effort to inform the user of this.
+     */
     public void gainFocus() {
     ///ystem.err.println("Gained focus: " + this);
@@ -411 +383 @@
 
     /** Autoscroll Interface...
-      * The following code was borrowed from the book:
-      *              Java Swing
-      *              By Robert Eckstein, Marc Loy & Dave Wood
-      *              Paperback - 1221 pages 1 Ed edition (September 1998)
-      *              O'Reilly & Associates; ISBN: 156592455X
-      *
-      * The relevant chapter of which can be found at:
-      *              http://www.oreilly.com/catalog/jswing/chapter/dnd.beta.pdf
-      * Calculate the insets for the *JTREE*, not the viewport
-      * the tree is in. This makes it a bit messy.
-      */
+     * The following code was borrowed from the book:
+     *              Java Swing
+     *              By Robert Eckstein, Marc Loy & Dave Wood
+     *              Paperback - 1221 pages 1 Ed edition (September 1998)
+     *              O'Reilly & Associates; ISBN: 156592455X
+     *
+     * The relevant chapter of which can be found at:
+     *              http://www.oreilly.com/catalog/jswing/chapter/dnd.beta.pdf
+     * Calculate the insets for the *JTREE*, not the viewport
+     * the tree is in. This makes it a bit messy.
+     */
     public Insets getAutoscrollInsets()
     {
@@ -441 +413 @@
 
     /** This method is used to inform this component when it loses focus,
-      * and should indicate this somehow.
-      */
+     * and should indicate this somehow.
+     */
     public void loseFocus() {
     ///ystem.err.println("Lost focus: " + this);
@@ -501 +473 @@
 
     /** Override the normal setEnabled so the Tree exhibits a little more
-      * change, which in this instance is the background colour changing.
-      * @param state Whether this GTree should be in an enabled state.
-      */
+     * change, which in this instance is the background colour changing.
+     * @param state Whether this GTree should be in an enabled state.
+     */
     public void setEnabled(boolean state) {
     super.setEnabled(state);
@@ -571 +543 @@
         }
         }
-                // 3c. If not found then return as this node can't exists somehow.
+        // 3c. If not found then return as this node can't exists somehow.
         if(!found) {
         return;

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

@@ -35 +35 @@
  *########################################################################
  */
+package org.greenstone.gatherer.shell;
 
- 
-
-
-
-
-package org.greenstone.gatherer.shell;
 /**
  * Title:        The Gatherer<br>