Changeset 5355 for trunk/gli

Timestamp:

2003-08-29T12:00:36+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:

• collection/SaveCollectionBox.java (modified) (2 diffs)
• gui/Filter.java (modified) (4 diffs)
• gui/NewCollectionMetadataPrompt.java (modified) (2 diffs)
• msm/ExportMDSPrompt.java (modified) (2 diffs)

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

@@ -67 +67 @@
     // Dialog setup
     this.setModal(true);
-    this.setTitle(get("Title"));
+    this.setTitle(get("SaveCollectionBox.Title"));
     this.setSize(360,100);
     }
@@ -103 +103 @@
     String args[] = new String[1];
     args[0] = name;
-    JLabel save_label = new JLabel(get("Label", args));
+    JLabel save_label = new JLabel(get("SaveCollectionBox.Label", args));
     content_pane.add(save_label);
     JPanel button_pane = new JPanel(new GridLayout(1,3));

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

@@ -106 +106 @@
     }
     combobox.setEditable(true);
-    label = new JLabel(get("Filter_Tree"));
+    label = new JLabel(get("Filter.Filter_Tree"));
     label.setPreferredSize(SIZE);
     // Add listeners.
@@ -246 +246 @@
             ///ystem.err.println("Filter = " + temp_str);
             // Ignore any string which matches a predefined filter, starting with All Files.
-            if(temp_str.equals(get("All_Files"))) {
+            if(temp_str.equals(get("Filter.All_Files"))) {
             }
             // HTM & HTML
-            else if(temp_str.equals(get("0"))) {
+            else if(temp_str.equals(get("Filter.0"))) {
             }
             // XML
-            else if(temp_str.equals(get("1"))) {
+            else if(temp_str.equals(get("Filter.1"))) {
             }
             // Text files
-            else if(temp_str.equals(get("2"))) {
+            else if(temp_str.equals(get("Filter.2"))) {
             }
             // Images
-            else if(temp_str.equals(get("3"))) {
+            else if(temp_str.equals(get("Filter.3"))) {
             }
             else {
@@ -281 +281 @@
         catch (PatternSyntaxException error) {
         if(first) {
-            JOptionPane.showMessageDialog(Gatherer.g_man, get("Invalid_Pattern"), get("General.Error"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(Gatherer.g_man, get("Filter.Invalid_Pattern"), get("General.Error"), JOptionPane.ERROR_MESSAGE);
         }
         }
@@ -326 +326 @@
         }
         else if(pattern == null) {
-        result = get("All_Files");
+        result = get("Filter.All_Files");
         }
         else {

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

@@ -35 +35 @@
     setModal(true);
     setSize(size);
-    setTitle(get("Title"));
+    setTitle(get("NewCollectionPrompt.Title"));
 
     // And the remaining metadata sets.
@@ -53 +53 @@
 
     JPanel instructions_panel = new JPanel();
-    JLabel instructions_label1 = new JLabel(get("Metadata_Instructions1"));
-    JLabel instructions_label2 = new JLabel(get("Metadata_Instructions2"));
+    JLabel instructions_label1 = new JLabel(get("NewCollectionPrompt.Metadata_Instructions1"));
+    JLabel instructions_label2 = new JLabel(get("NewCollectionPrompt.Metadata_Instructions2"));
 
     JPanel center_pane = new JPanel();
 
     JPanel sets_list_pane = new JPanel();
-    JLabel sets_list_label = new JLabel(get("Select_MDS"));
+    JLabel sets_list_label = new JLabel(get("NewCollectionPrompt.Select_MDS"));
     sets_list_label.setOpaque(false);
     sets_list = new CheckList(sets, true);
 
     JPanel elements_list_pane = new JPanel();
-    JLabel elements_list_label = new JLabel(get("Metadata_Elements"));
+    JLabel elements_list_label = new JLabel(get("NewCollectionPrompt.Metadata_Elements"));
     elements_list = new JList();
     elements_list.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));

trunk/gli/src/org/greenstone/gatherer/msm/ExportMDSPrompt.java

@@ -97 +97 @@
     if(export) {
         setSize(EXPORT_SIZE);
-        setTitle(get("Export_Title"));
+        setTitle(get("MSMPrompt.Export_Title"));
         setJMenuBar(new SimpleMenuBar("0")); // need to find an appropriate help page to open at
     }
     else {
         setSize(IMPORT_SIZE);
-        setTitle(get("Import_Title"));
+        setTitle(get("MSMPrompt.Import_Title"));
         setJMenuBar(new SimpleMenuBar("0")); // need to find an appropriate help page to open at
     }
     JPanel content_pane = (JPanel) getContentPane();
     JPanel control_pane = new JPanel();
-    JLabel set_label = new JLabel(get("Export_Set"));
+    JLabel set_label = new JLabel(get("MSMPrompt.Export_Set"));
     sets = new JComboBox(manager.getSets());
-    JLabel condition_label = new JLabel(get("Export_Conditions"));
+    JLabel condition_label = new JLabel(get("MSMPrompt.Export_Conditions"));
     JPanel condition_pane = new JPanel();
     ButtonGroup condition_group = new ButtonGroup();
-    all_values = new JRadioButton(get("Export_All_Values"));
+    all_values = new JRadioButton(get("MSMPrompt.Export_All_Values"));
     all_values.setOpaque(false);
     condition_group.add(all_values);
-    no_values = new JRadioButton(get("Export_No_Values"));
+    no_values = new JRadioButton(get("MSMPrompt.Export_No_Values"));
     no_values.setOpaque(false);
     condition_group.add(no_values);
-    structure_only = new JRadioButton(get("Export_Subjects_Only"));
+    structure_only = new JRadioButton(get("MSMPrompt.Export_Subjects_Only"));
     structure_only.setOpaque(false);
     condition_group.add(structure_only);
     all_values.setSelected(true);
-    JLabel file_label = new JLabel(get("Export_File"));
+    JLabel file_label = new JLabel(get("MSMPrompt.Export_File"));
     JPanel file_pane = new JPanel();
     file_name = new JTextField(Utility.METADATA_DIR);
@@ -128 +128 @@
     JPanel button_pane = new JPanel();
     if(export) {
-        export_button = new JButton(get("File_Export"));
+        export_button = new JButton(get("MSMPrompt.File_Export"));
         export_button.setEnabled(false);
     }
     else {
-        export_button = new JButton(get("File_Import"));
+        export_button = new JButton(get("MSMPrompt.File_Import"));
         export_button.setEnabled(true);
     }