Changeset 12123 for trunk/gli/src/org/greenstone/gatherer/cdm/PluginManager.java

Timestamp:

2006-07-10T15:02:33+12:00 (18 years ago)

Author:

kjdon

Message:

Changed text handling to use Dictionary.get rather than Dictionary.setText or Dictionary.registerBoth etc. also removed mnemonics cos they suck for other languages.

File:

• trunk/gli/src/org/greenstone/gatherer/cdm/PluginManager.java (modified) (6 diffs)

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

@@ -701 +701 @@
     public PluginControl() {
         // Create
-        add = new GLIButton();
-        add.setMnemonic(KeyEvent.VK_A);
-        Dictionary.registerBoth(add, "CDM.PlugInManager.Add", "CDM.PlugInManager.Add_Tooltip");
-
+        add = new GLIButton(Dictionary.get("CDM.PlugInManager.Add"), Dictionary.get("CDM.PlugInManager.Add_Tooltip"));
+        
         button_pane = new JPanel();
         central_pane = new JPanel();
 
-        configure = new GLIButton();
+        configure = new GLIButton(Dictionary.get("CDM.PlugInManager.Configure"), Dictionary.get("CDM.PlugInManager.Configure_Tooltip"));
         configure.setEnabled(false);
-        configure.setMnemonic(KeyEvent.VK_C);
-        Dictionary.registerBoth(configure, "CDM.PlugInManager.Configure", "CDM.PlugInManager.Configure_Tooltip");
-
+        
         JPanel header_pane = new DesignPaneHeader("CDM.GUI.Plugins", "plugins");
-        move_up_button = new GLIButton("", JarTools.getImage("arrow-up.gif"));
+        move_up_button = new GLIButton(Dictionary.get("CDM.Move.Move_Up"), JarTools.getImage("arrow-up.gif"), Dictionary.get("CDM.Move.Move_Up_Tooltip"));
         move_up_button.setEnabled(false);
-        move_up_button.setMnemonic(KeyEvent.VK_U);
-        Dictionary.registerBoth(move_up_button, "CDM.Move.Move_Up", "CDM.Move.Move_Up_Tooltip");
-
-        move_down_button = new GLIButton("", JarTools.getImage("arrow-down.gif"));
+        
+        move_down_button = new GLIButton(Dictionary.get("CDM.Move.Move_Down"), JarTools.getImage("arrow-down.gif"), Dictionary.get("CDM.Move.Move_Down_Tooltip"));
         move_down_button.setEnabled(false);
-        move_down_button.setMnemonic(KeyEvent.VK_D);
-        Dictionary.registerBoth(move_down_button, "CDM.Move.Move_Down", "CDM.Move.Move_Down_Tooltip");
-
+        
         movement_pane = new JPanel();
 
@@ -735 +727 @@
         picl.itemStateChanged(new ItemEvent(plugin, 0, null, ItemEvent.SELECTED));
 
-        plugin_label = new JLabel();
-        Dictionary.registerText(plugin_label, "CDM.PlugInManager.PlugIn");
-
+        plugin_label = new JLabel(Dictionary.get("CDM.PlugInManager.PlugIn"));
+        
         plugin_list = new JList(model);
         plugin_list.setCellRenderer(new ListRenderer());
         plugin_list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-        plugin_list_label = new JLabel();
+        plugin_list_label = new JLabel(Dictionary.get("CDM.PlugInManager.Assigned"));
         //plugin_list_label.setHorizontalAlignment(JLabel.CENTER);
         plugin_list_label.setOpaque(true);
-        Dictionary.registerText(plugin_list_label, "CDM.PlugInManager.Assigned");
-
+        
         plugin_list_pane = new JPanel();
         plugin_pane = new JPanel();
 
-        remove = new GLIButton();
+        remove = new GLIButton(Dictionary.get("CDM.PlugInManager.Remove"), Dictionary.get("CDM.PlugInManager.Remove_Tooltip"));
         remove.setEnabled(false);
-        remove.setMnemonic(KeyEvent.VK_R);
-        Dictionary.registerBoth(remove, "CDM.PlugInManager.Remove", "CDM.PlugInManager.Remove_Tooltip");
-
+        
         // Listeners
         add.addActionListener(new AddListener()); //all_change_listener is listening to the ArgumentConfiguration
@@ -1074 +1062 @@
                 // And reset the tooltip. If the plugin is null or is a string, then go back to the default message
                 if(current_selection == null || current_selection instanceof String) {
-                    Dictionary.registerTooltip(plugin, "CDM.PlugInManager.PlugIn_Tooltip");
+            plugin.setToolTipText(Dictionary.get("CDM.PlugInManager.PlugIn_Tooltip"));
                 }
                 else {
                     Plugin current_plugin = (Plugin) current_selection;
-                    Dictionary.registerTooltipText(plugin, Utility.formatHTMLWidth(current_plugin.getDescription(), 40));
+            plugin.setToolTipText(Utility.formatHTMLWidth(current_plugin.getDescription(), 40));
                     current_plugin = null;
                 }
@@ -1154 +1142 @@
         setModal(true);
         setSize(size);
-        Dictionary.setText(this, "CDM.PluginManager.SuggestedPluginListTitle");
+        setTitle(Dictionary.get("CDM.PluginManager.SuggestedPluginListTitle"));
 
         String[] args = new String[1];
         args[0] = filename;
 
-        JTextArea instructions_textarea = new JTextArea();
+        JTextArea instructions_textarea = new JTextArea(Dictionary.get("CDM.PluginManager.Plugin_Suggestion_Prompt", args));
         instructions_textarea.setCaretPosition(0);
         instructions_textarea.setEditable(false);
@@ -1165 +1153 @@
         instructions_textarea.setRows(5);
         instructions_textarea.setWrapStyleWord(true);
-        Dictionary.setText(instructions_textarea, "CDM.PluginManager.Plugin_Suggestion_Prompt", args);
-
-        JLabel suitable_plugins_label = new JLabel();
-        Dictionary.registerText(suitable_plugins_label, "CDM.PlugInManager.PlugIn");
+
+        JLabel suitable_plugins_label = new JLabel(Dictionary.get("CDM.PlugInManager.PlugIn"));
         suitable_plugins_label.setBorder(BorderFactory.createEmptyBorder(0,0,5,0));
 
@@ -1183 +1169 @@
         suitable_plugins_pane.add(suitable_plugins_combobox, BorderLayout.CENTER);
 
-        add_button = new GLIButton();
-        Dictionary.setBoth(add_button, "CDM.PlugInManager.QuickAdd", "CDM.PlugInManager.Add_Tooltip");
-        ignore_button = new GLIButton();
-        Dictionary.setBoth(ignore_button, "CDM.PlugInManager.Ignore","CDM.PlugInManager.Ignore_Tooltip" );
-
+        add_button = new GLIButton(Dictionary.get("CDM.PlugInManager.QuickAdd"), Dictionary.get("CDM.PlugInManager.Add_Tooltip"));
+        ignore_button = new GLIButton(Dictionary.get("CDM.PlugInManager.Ignore"), Dictionary.get("CDM.PlugInManager.Ignore_Tooltip"));
+        
         add_button.addActionListener(this);
         ignore_button.addActionListener(this);