Changeset 12123 for trunk/gli/src/org/greenstone/gatherer/cdm/SubcollectionManager.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/SubcollectionManager.java (modified) (3 diffs)

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

@@ -186 +186 @@
 
         JPanel button_pane_3 = new JPanel();
-        add_button = new GLIButton();
-        add_button.setMnemonic(KeyEvent.VK_A);
+        add_button = new GLIButton(Dictionary.get("CDM.SubcollectionManager.Add"), Dictionary.get("CDM.SubcollectionManager.Add_Tooltip"));
         add_button.setEnabled(false);
-        Dictionary.registerBoth(add_button, "CDM.SubcollectionManager.Add", "CDM.SubcollectionManager.Add_Tooltip");
-        remove_button = new GLIButton();
-        remove_button.setMnemonic(KeyEvent.VK_R);
+        
+        remove_button = new GLIButton(Dictionary.get("CDM.SubcollectionManager.Remove"), Dictionary.get("CDM.SubcollectionManager.Remove_Tooltip"));
         remove_button.setEnabled(false);
-        Dictionary.registerBoth(remove_button, "CDM.SubcollectionManager.Remove", "CDM.SubcollectionManager.Remove_Tooltip");
-        update_button = new GLIButton();
-        update_button.setMnemonic(KeyEvent.VK_C);
+        
+        update_button = new GLIButton(Dictionary.get("CDM.SubcollectionManager.Replace"), Dictionary.get("CDM.SubcollectionManager.Replace_Tooltip"));
         update_button.setEnabled(false);
-        Dictionary.registerBoth(update_button, "CDM.SubcollectionManager.Replace", "CDM.SubcollectionManager.Replace_Tooltip");
-
+        
         JPanel button_pane = new JPanel();
         JPanel button_pane_1 = new JPanel();
-        include_button = new JRadioButton();
+        include_button = new JRadioButton(Dictionary.get("CDM.SubcollectionManager.Include"));
         include_button.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
-        include_button.setMnemonic(KeyEvent.VK_I);
         include_button.setOpaque(false);
-        Dictionary.registerText(include_button, "CDM.SubcollectionManager.Include");
-        exclude_button = new JRadioButton();
+        
+        exclude_button = new JRadioButton(Dictionary.get("CDM.SubcollectionManager.Exclude"));
         exclude_button.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
-        exclude_button.setMnemonic(KeyEvent.VK_X);
         exclude_button.setOpaque(false);
-        Dictionary.registerText(exclude_button, "CDM.SubcollectionManager.Exclude");
-
-        JLabel flags_label = new JLabel();
-        Dictionary.registerText(flags_label, "CDM.SubcollectionManager.Flags");
+        
+        JLabel flags_label = new JLabel(Dictionary.get("CDM.SubcollectionManager.Flags"));
+        
         flags_field = new NonWhitespaceField();
-        Dictionary.registerTooltip(flags_field, "CDM.SubcollectionManager.Flags_Tooltip");
+        flags_field.setToolTipText(Dictionary.get("CDM.SubcollectionManager.Flags_Tooltip"));
 
         JPanel inclusive_pane = new JPanel();
-        JLabel inclusive_label = new JLabel();
-        Dictionary.registerText(inclusive_label, "CDM.SubcollectionManager.Inclusive");
-
-        JLabel match_label = new JLabel();
-        Dictionary.registerText(match_label, "CDM.SubcollectionManager.Match");
+        JLabel inclusive_label = new JLabel(Dictionary.get("CDM.SubcollectionManager.Inclusive"));
+        
+        JLabel match_label = new JLabel(Dictionary.get("CDM.SubcollectionManager.Match"));
+        
         match_field = new JTextField();
-        Dictionary.registerTooltip(match_field, "CDM.SubcollectionManager.Match_Tooltip");
-
-        JLabel name_label = new JLabel();
-        Dictionary.registerText(name_label, "CDM.SubcollectionManager.Name");
+        match_field.setToolTipText(Dictionary.get("CDM.SubcollectionManager.Match_Tooltip"));
+        
+        JLabel name_label = new JLabel(Dictionary.get("CDM.SubcollectionManager.Name"));
+        
         name_field = new NonWhitespaceField();
-        Dictionary.registerTooltip(name_field, "CDM.SubcollectionManager.Name_Tooltip");
-
-        JLabel source_label = new JLabel();
-        Dictionary.registerText(source_label, "CDM.SubcollectionManager.Source");
+        name_field.setToolTipText(Dictionary.get("CDM.SubcollectionManager.Name_Tooltip"));
+        
+        JLabel source_label = new JLabel(Dictionary.get("CDM.SubcollectionManager.Source"));
+        
         ArrayList every_metadata_set_element = MetadataSetManager.getEveryMetadataSetElement();
         Vector source_model = new Vector(every_metadata_set_element);
         source_model.add(0, StaticStrings.FILENAME_STR);
         source_combobox = new JComboBox(source_model);
-        Dictionary.registerTooltip(source_combobox, "CDM.SubcollectionManager.Source_Tooltip");
-
+        source_combobox.setToolTipText(Dictionary.get("CDM.SubcollectionManager.Source_Tooltip"));
+        
         subcollection_list = new JList(model);
         subcollection_list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
@@ -247 +239 @@
         include_button.setSelected(true);
         JPanel subcollection_list_pane = new JPanel();
-        JLabel subcollection_list_label = new JLabel();
-        Dictionary.registerText(subcollection_list_label, "CDM.SubcollectionManager.Assigned");
-
+        JLabel subcollection_list_label = new JLabel(Dictionary.get("CDM.SubcollectionManager.Assigned"));
+        
         // Create a message pane which explains why these controls are not currently active
         JPanel message_pane = new JPanel();
@@ -256 +247 @@
         args[1] = Dictionary.get("Preferences.Mode.Systems");
         args[2] = Dictionary.get("Preferences.Mode.Expert");
-        JTextArea message_textarea = new JTextArea();
-        Dictionary.registerText(message_textarea, "CDM.SubcollectionManager.Partitions_Disabled", args);
+        JTextArea message_textarea = new JTextArea(Dictionary.get("CDM.SubcollectionManager.Partitions_Disabled", args));
+        
         message_textarea.setEditable(false);
         message_textarea.setHighlighter(null); // Prevent highlighting