Changeset 5593 for trunk/gli/src/org/greenstone/gatherer/msm

Timestamp:

2003-10-07T15:35:23+13:00 (21 years ago)

Author:

mdewsnip

Message:

Changed calls to the Dictionary.

Location:

trunk/gli/src/org/greenstone/gatherer/msm

Files:

• ExportMDSPrompt.java (modified) (1 diff)
• GreenstoneArchiveParser.java (modified) (1 diff)
• MDSFileFilter.java (modified) (1 diff)
• MSMPrompt.java (modified) (7 diffs)
• MetadataSet.java (modified) (2 diffs)
• MetadataSetManager.java (modified) (1 diff)

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

@@ -221 +221 @@
         JFileChooser chooser = new JFileChooser(new File(Utility.METADATA_DIR));
         javax.swing.filechooser.FileFilter filter = new MDSFileFilter();
-        chooser.setApproveButtonText(Dictionary.newget("General.OK"));
+        chooser.setApproveButtonText(Dictionary.get("General.OK"));
         chooser.setFileFilter(filter);
         int returnVal = chooser.showSaveDialog(Gatherer.g_man);

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

@@ -82 +82 @@
             args[0] = document_directories[i].getName();
             args[1] = String.valueOf(count);
-            shell.fireMessage(GShell.IMPORT, shell.typeAsString(GShell.IMPORT) + "> " + Dictionary.newget("GShell.Extracted", args), GShell.OK);
+            shell.fireMessage(GShell.IMPORT, shell.typeAsString(GShell.IMPORT) + "> " + Dictionary.get("GShell.Extracted", args), GShell.OK);
             args = null;
             progress.increment();

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

@@ -51 +51 @@
      */
     public MDSFileFilter() {
-    description = Dictionary.newget("MSMPrompt.File_Filter_Description");
+    description = Dictionary.get("MSMPrompt.File_Filter_Description");
     }
 

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

@@ -109 +109 @@
     String args[] = new String[2];
     args[0] = mde_new.getAttribute("name");
-    args[1] = Dictionary.newget(reason);
-    JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("MSMPrompt.Add_Failed", args), Dictionary.newget("MSMPrompt.Add_Failed_Title"), JOptionPane.ERROR_MESSAGE);
+    args[1] = Dictionary.get(reason);
+    JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("MSMPrompt.Add_Failed", args), Dictionary.get("MSMPrompt.Add_Failed_Title"), JOptionPane.ERROR_MESSAGE);
     }
 
@@ -215 +215 @@
     JPanel current_pane = new JPanel();
     current_pane.setLayout(new BorderLayout());
-    current_pane.setBorder(BorderFactory.createTitledBorder(Dictionary.newget("MSMPrompt.Current_Values")));
+    current_pane.setBorder(BorderFactory.createTitledBorder(Dictionary.get("MSMPrompt.Current_Values")));
     JScrollPane scroll = new JScrollPane(cur_values);
     current_pane.add(scroll, BorderLayout.CENTER);
 
     JPanel new_pane = new JPanel();
-    new_pane.setBorder(BorderFactory.createTitledBorder(Dictionary.newget("MSMPrompt.New_Value")));
+    new_pane.setBorder(BorderFactory.createTitledBorder(Dictionary.get("MSMPrompt.New_Value")));
     new_pane.setLayout(new BorderLayout());
     JLabel new_att = new JLabel(MSMUtils.getValue(att_new));
@@ -349 +349 @@
         String opt_cur[] = MSMUtils.getOptionListDetails(mde_cur);
         String ass_cur[] = MSMUtils.getAssignedValuesDetails(mds_cur, mde_cur);
-        String details_cur = Dictionary.newget("MSMPrompt.Structural", str_cur);
+        String details_cur = Dictionary.get("MSMPrompt.Structural", str_cur);
         if(opt_cur != null) {
-        details_cur = details_cur + "\n" + Dictionary.newget("MSMPrompt.OptionList", opt_cur);
+        details_cur = details_cur + "\n" + Dictionary.get("MSMPrompt.OptionList", opt_cur);
         }
         if(ass_cur != null) {
-        details_cur = details_cur + "\n" + Dictionary.newget("MSMPrompt.AssignedValues", ass_cur);
+        details_cur = details_cur + "\n" + Dictionary.get("MSMPrompt.AssignedValues", ass_cur);
         }
         current_details.setText(details_cur);
@@ -376 +376 @@
     String opt_new[] = MSMUtils.getOptionListDetails(mde_new);
     String ass_new[] = MSMUtils.getAssignedValuesDetails(mds_new, mde_new);
-    String details_new = Dictionary.newget("MSMPrompt.Structural", str_new);
+    String details_new = Dictionary.get("MSMPrompt.Structural", str_new);
     if(opt_new != null) {
-        details_new = details_new + "\n" + Dictionary.newget("MSMPrompt.OptionList", opt_new);
+        details_new = details_new + "\n" + Dictionary.get("MSMPrompt.OptionList", opt_new);
     }
     if(ass_new != null) {
-        details_new = details_new + "\n" + Dictionary.newget("MSMPrompt.AssignedValues", ass_new);
+        details_new = details_new + "\n" + Dictionary.get("MSMPrompt.AssignedValues", ass_new);
     }
     new_details.setText(details_new);
@@ -564 +564 @@
     String args[] = new String[2];
     args[0] = mde_cur.getAttribute("name");
-    args[1] = Dictionary.newget(reason);
-    JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("MSMPrompt.Remove_Failed", args), Dictionary.newget("MSMPrompt.Remove_Failed_Title"), JOptionPane.ERROR_MESSAGE);
+    args[1] = Dictionary.get(reason);
+    JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("MSMPrompt.Remove_Failed", args), Dictionary.get("MSMPrompt.Remove_Failed_Title"), JOptionPane.ERROR_MESSAGE);
     }
 
@@ -577 +577 @@
     args[0] = mde_new.getAttribute("name");
     args[1] = new_name;
-    args[2] = Dictionary.newget(reason);
-    JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("MSMPrompt.Rename_Failed", args), Dictionary.newget("MSMPrompt.Rename_Failed_Title"), JOptionPane.ERROR_MESSAGE);
+    args[2] = Dictionary.get(reason);
+    JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("MSMPrompt.Rename_Failed", args), Dictionary.get("MSMPrompt.Rename_Failed_Title"), JOptionPane.ERROR_MESSAGE);
     }
 
@@ -883 +883 @@
     JComboBox set = new JComboBox();
     set.setBackground(Color.white);
-    set.addItem(Dictionary.newget("MSMPrompt.Select_Set_None"));
+    set.addItem(Dictionary.get("MSMPrompt.Select_Set_None"));
     Vector sets = manager.getSets();
     for(int i = sets.size() - 1; i >= 0; i--) {

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

@@ -341 +341 @@
                 // Failing all that set an error message
         if(description == null) {
-        description = Dictionary.newget("MSM.No_Description");
+        description = Dictionary.get("MSM.No_Description");
         }
     }
@@ -448 +448 @@
                 // Failing all that set an error message
         if(name == null) {
-        name = Dictionary.newget("MSM.No_Name");
+        name = Dictionary.get("MSM.No_Name");
         }
     }

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

@@ -548 +548 @@
     javax.swing.filechooser.FileFilter filter = new MDSFileFilter();
     chooser.setFileFilter(filter);
-    int returnVal = chooser.showDialog(Gatherer.g_man, Dictionary.newget("MSMPrompt.File_Import"));
+    int returnVal = chooser.showDialog(Gatherer.g_man, Dictionary.get("MSMPrompt.File_Import"));
     if(returnVal == JFileChooser.APPROVE_OPTION) {
         return importMDS(chooser.getSelectedFile(), true);