Changeset 5350 for trunk

Timestamp:

2003-08-29T11:38:22+12:00 (21 years ago)

Author:

mdewsnip

Message:

Changed dictionary get()s to have the whole key.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• cdm/MetadataSetView.java (modified) (4 diffs)
• gui/CollectionPane.java (modified) (2 diffs)
• gui/OptionsPane.java (modified) (2 diffs)
• sarm/SearchAndReplace.java (modified) (4 diffs)

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

@@ -197 +197 @@
                 // Create visual components
         central_pane = new JPanel();
-        element_label = new JLabel(get("Elements"));
+        element_label = new JLabel(get("CDM.MetadataSetManager.Elements"));
         element_label.setHorizontalAlignment(JLabel.CENTER);
         element_label.setOpaque(true);
@@ -204 +204 @@
         element_pane = new JPanel();
         header_pane = new JPanel();
-        instructions = new JTextArea(get("Instructions"));
+        instructions = new JTextArea(get("CDM.MetadataSetManager.Instructions"));
         instructions.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
         instructions.setEditable(false);
@@ -210 +210 @@
         instructions.setRows(6);
         instructions.setWrapStyleWord(true);
-        set_label = new JLabel(get("Sets"));
+        set_label = new JLabel(get("CDM.MetadataSetManager.Sets"));
         set_label.setHorizontalAlignment(JLabel.CENTER);
         set_label.setOpaque(true);
@@ -216 +216 @@
         set_list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         set_pane = new JPanel();
-        title = new JLabel(get("Title"));
+        title = new JLabel(get("CDM.MetadataSetManager.Title"));
         title.setHorizontalAlignment(JLabel.CENTER);
         title.setOpaque(true);

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

@@ -565 +565 @@
         }
         if(tree == collection_tree && node != null && node.getFile() != null && node.getFile().isDirectory() && !node.isReadOnly()) {
-            new_folder = new JMenuItem(get("New_Folder"), KeyEvent.VK_N);
+            new_folder = new JMenuItem(get("CollectionPopupMenu.New_Folder"), KeyEvent.VK_N);
             new_folder.addActionListener(this);
             add(new_folder);
@@ -571 +571 @@
         }
         if(node == null || (node != null && !node.isReadOnly())) {
-            delete = new JMenuItem(get("Delete"), KeyEvent.VK_D);
+            delete = new JMenuItem(get("CollectionPopupMenu.Delete"), KeyEvent.VK_D);
             delete.addActionListener(this);
             add(delete);

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

@@ -179 +179 @@
         log_list.addListSelectionListener(new LogListListener());
 
-        JLabel log_history_label = new JLabel(get("LogHistory"));
+        JLabel log_history_label = new JLabel(get("OptionsPane.LogHistory"));
         JPanel log_history_pane = new JPanel();
         log_history_pane.setPreferredSize(new Dimension(600, 100));
@@ -562 +562 @@
         switch (success) {
         case SUCCESSFUL:
-            d.append(get("Successful"));
+            d.append(get("OptionsPane.Successful"));
             break;
         case UNSUCCESSFUL:
-            d.append(get("Unsuccessful"));
+            d.append(get("OptionsPane.Unsuccessful"));
             break;
         case CANCELLED:
-            d.append(get("Cancelled"));
+            d.append(get("OptionsPane.Cancelled"));
             break;
         default:
-            d.append(get("Unknown"));
+            d.append(get("OptionsPane.Unknown"));
         }
         display = d.toString();

trunk/gli/src/org/greenstone/gatherer/sarm/SearchAndReplace.java

@@ -137 +137 @@
     setModal(false);
     setSize(SIZE);
-    setTitle(get("Title"));
+    setTitle(get("SearchAndReplace.Title"));
     setJMenuBar(new SimpleMenuBar("10.1"));  
     JPanel content_pane = (JPanel) getContentPane();
@@ -144 +144 @@
 
     JPanel search_pane = new JPanel();
-    JLabel search_label = new JLabel(get("Search"));
+    JLabel search_label = new JLabel(get("SearchAndReplace.Search"));
     search_label.setPreferredSize(LABEL_SIZE);
     search = new JTextField("");
 
     JPanel replace_pane = new JPanel();
-    JLabel replace_label = new JLabel(get("Replace"));
+    JLabel replace_label = new JLabel(get("SearchAndReplace.Replace"));
     replace_label.setPreferredSize(LABEL_SIZE);
     replace = new JTextField("");
@@ -158 +158 @@
 
     JPanel options_pane = new JPanel();
-    JLabel options_label = new JLabel(get("Options"));
+    JLabel options_label = new JLabel(get("SearchAndReplace.Options"));
     options_label.setPreferredSize(LABEL_SIZE);
     JPanel inner_options_pane = new JPanel();
-    case_sensitive = new JCheckBox(get("Case_Sensitive"));
-    regular_expression = new JCheckBox(get("Regular_Expression"));
+    case_sensitive = new JCheckBox(get("SearchAndReplace.Case_Sensitive"));
+    regular_expression = new JCheckBox(get("SearchAndReplace.Regular_Expression"));
           
     JPanel options2_pane = new JPanel();
-    JLabel options2_label = new JLabel(get("Search_In"));
+    JLabel options2_label = new JLabel(get("SearchAndReplace.Search_In"));
     options2_label.setPreferredSize(LABEL_SIZE);
     JPanel inner_options2_pane = new JPanel();
-    search_elements = new JCheckBox(get("Search_Elements"));
+    search_elements = new JCheckBox(get("SearchAndReplace.Search_Elements"));
     search_elements.setSelected(true);
-    search_records = new JCheckBox(get("Search_Records"));
+    search_records = new JCheckBox(get("SearchAndReplace.Search_Records"));
     search_records.setSelected(true);
-    search_values = new JCheckBox(get("Search_Values"));
+    search_values = new JCheckBox(get("SearchAndReplace.Search_Values"));
     search_values.setSelected(true);
 
     JPanel results_pane = new JPanel();
-    status = new JLabel(get("Status"));
+    status = new JLabel(get("SearchAndReplace.Status"));
 
     JPanel buttons_pane = new JPanel();
-    find_button = new JButton(get("Find_Button"));
+    find_button = new JButton(get("SearchAndReplace.Find_Button"));
     find_button.setMnemonic(KeyEvent.VK_F);
-    find_next_button = new JButton(get("Find_Next_Button"));
+    find_next_button = new JButton(get("SearchAndReplace.Find_Next_Button"));
     find_next_button.setEnabled(false);
     find_next_button.setMnemonic(KeyEvent.VK_N);
-    replace_button = new JButton(get("Replace_Button"));
+    replace_button = new JButton(get("SearchAndReplace.Replace_Button"));
     replace_button.setEnabled(false);
     replace_button.setMnemonic(KeyEvent.VK_R);
-    replace_all_button = new JButton(get("Replace_All_Button"));
+    replace_all_button = new JButton(get("SearchAndReplace.Replace_All_Button"));
     replace_all_button.setEnabled(false);
     replace_all_button.setMnemonic(KeyEvent.VK_N);
-    reset_button = new JButton(get("Reset"));
+    reset_button = new JButton(get("SearchAndReplace.Reset"));
     reset_button.setEnabled(false);
     reset_button.setMnemonic(KeyEvent.VK_ESCAPE);
-    undo_button = new JButton(get("Undo"));
+    undo_button = new JButton(get("SearchAndReplace.Undo"));
     undo_button.setEnabled(false);
     undo_button.setMnemonic(KeyEvent.VK_U);
-    redo_button = new JButton(get("Redo"));
+    redo_button = new JButton(get("SearchAndReplace.Redo"));
     redo_button.setEnabled(false);
     redo_button.setMnemonic(KeyEvent.VK_D);
@@ -293 +293 @@
     if(key != null) {
         args[0] = search.getText();
-        status.setText(get("Status") + ": " + get(key, args));
+        status.setText(get("SearchAndReplace.Status") + ": " + get(key, args));
     }
     else {
-        status.setText(get("Status"));
+        status.setText(get("SearchAndReplace.Status"));
     }
     }