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

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

@@ -138 +138 @@
         JPanel fields_panel = new JPanel();
 
-        creator_label = new JLabel();
-        Dictionary.registerText(creator_label, "CDM.General.Email.Creator");
-
+        creator_label = new JLabel(Dictionary.get("CDM.General.Email.Creator"));
+        
         creator_emailfield = new EmailField(Configuration.getColor("coloring.error_background", false));
-        Dictionary.registerTooltip(creator_emailfield, "CDM.General.Email.Creator_Tooltip");
-
-        maintainer_label = new JLabel();
-        Dictionary.registerText(maintainer_label, "CDM.General.Email.Maintainer");
-
+        creator_emailfield.setToolTipText(Dictionary.get("CDM.General.Email.Creator_Tooltip"));
+        
+        maintainer_label = new JLabel(Dictionary.get("CDM.General.Email.Maintainer"));
+        
         maintainer_emailfield = new EmailField(Configuration.getColor("coloring.error_background", false));
-        Dictionary.registerTooltip(maintainer_emailfield, "CDM.General.Email.Maintainer_Tooltip");
-
-        name_label = new JLabel();
-        Dictionary.registerText(name_label, "CDM.General.Collection_Name");
-        name_textfield = new JTextField("CDM.General.Collection_Name");
-        Dictionary.registerTooltip(name_textfield, "CDM.General.Collection_Name_Tooltip");
-        JLabel short_name_label = new JLabel();
-        Dictionary.registerText(short_name_label, "NewCollectionPrompt.Collection_Name");
+        maintainer_emailfield.setToolTipText(Dictionary.get("CDM.General.Email.Maintainer_Tooltip"));
+        
+        name_label = new JLabel(Dictionary.get("CDM.General.Collection_Name"));
+        name_textfield = new JTextField();
+        name_textfield.setToolTipText(Dictionary.get("CDM.General.Collection_Name_Tooltip"));
+        
+        JLabel short_name_label = new JLabel(Dictionary.get("NewCollectionPrompt.Collection_Name"));
         JTextField short_name_textfield = new JTextField(Gatherer.c_man.getCollection().getName());
         short_name_textfield.setEditable(false);
         short_name_textfield.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
         JPanel icon_panel = new JPanel();
-        icon_label = new JLabel();
-        Dictionary.registerText(icon_label, "CDM.General.Icon_Collection");
-        icon_textfield = new JTextField("CDM.General.Icon_Collection");
-        Dictionary.registerTooltip(icon_textfield, "CDM.General.Icon_Collection_Tooltip");
-        browse_about_icon_button = new GLIButton();
-        browse_about_icon_button.setMnemonic(KeyEvent.VK_A);
-        Dictionary.registerText(browse_about_icon_button, "General.Browse");
+        icon_label = new JLabel(Dictionary.get("CDM.General.Icon_Collection"));
+        icon_textfield = new JTextField();
+        icon_textfield.setToolTipText(Dictionary.get("CDM.General.Icon_Collection_Tooltip")); 
+        browse_about_icon_button = new GLIButton(Dictionary.get("General.Browse"));
         JPanel small_icon_panel = new JPanel();
-        small_icon_label = new JLabel("CDM.General.Icon_Collection_Small");
-        Dictionary.registerText(small_icon_label, "CDM.General.Icon_Collection_Small");
-        small_icon_textfield = new JTextField("CDM.General.Icon_Collection_Small");
-        Dictionary.registerTooltip(small_icon_textfield, "CDM.General.Icon_Collection_Small_Tooltip");
-        browse_home_icon_button = new GLIButton();
-        browse_home_icon_button.setMnemonic(KeyEvent.VK_A);
-        Dictionary.registerText(browse_home_icon_button, "General.Browse");
+        small_icon_label = new JLabel(Dictionary.get("CDM.General.Icon_Collection_Small"));
+        small_icon_textfield = new JTextField();
+        small_icon_textfield.setToolTipText(Dictionary.get("CDM.General.Icon_Collection_Small_Tooltip"));
+        browse_home_icon_button = new GLIButton(Dictionary.get("General.Browse"));
 
         // public
         JPanel box_panel = new JPanel();
-        public_checkbox = new JCheckBox("", public_collectionmeta.getValue(CollectionMeta.TEXT).equals(CollectionConfiguration.TRUE_STR));
-        Dictionary.registerText(public_checkbox, "CDM.General.Access");
-
+        public_checkbox = new JCheckBox(Dictionary.get("CDM.General.Access"), public_collectionmeta.getValue(CollectionMeta.TEXT).equals(CollectionConfiguration.TRUE_STR));
+        
         JPanel description_panel = new JPanel();
-        description_label = new JLabel();
-        Dictionary.registerText(description_label, "CDM.General.Collection_Extra");
+        description_label = new JLabel(Dictionary.get("CDM.General.Collection_Extra"));
+        
         description_textarea = new JTextArea();
         description_textarea.setBackground(Configuration.getColor("coloring.editable_background", false));
-        Dictionary.registerTooltip(description_textarea, "CDM.General.Collection_Extra_Tooltip");
+        description_textarea.setToolTipText(Dictionary.get("CDM.General.Collection_Extra_Tooltip"));
+        
         // Connection
         BrowseListener browse_listener = new BrowseListener(StaticStrings.IMAGES_PATH_RELATIVE_TO_GSDL_PREFIX);