Changeset 5347 for trunk/gli/src/org/greenstone/gatherer/collection

Timestamp:

2003-08-29T10:52:44+12:00 (21 years ago)

Author:

mdewsnip

Message:

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

Location:

trunk/gli/src/org/greenstone/gatherer/collection

Files:

• CollectionManager.java (modified) (8 diffs)
• DeleteCollectionPrompt.java (modified) (6 diffs)

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

@@ -223 +223 @@
     try {
         // Create a progress monitor.
-        ProgressMonitor progress = new ProgressMonitor(Gatherer.g_man, get("Creating_New"), "mkcol.pl", 0, 7);
+        ProgressMonitor progress = new ProgressMonitor(Gatherer.g_man, get("CollectionManager.Creating_New"), "mkcol.pl", 0, 7);
         // Create the new collection.
         makeCollection(description, email, name, title);
@@ -235 +235 @@
         gcache_dir.mkdirs();
         if(progress != null) {
-        progress.setNote(get("Gcache_Created"));
+        progress.setNote(get("CollectionManager.Gcache_Created"));
         }
 
@@ -243 +243 @@
         log_dir.mkdirs();
         if(progress != null) {
-        progress.setNote(get("Log_Created"));
+        progress.setNote(get("CollectionManager.Log_Created"));
         }
 
@@ -395 +395 @@
         String args[] = new String[1];
         args[0] = name;
-        progress.setNote(get("Session_Ready", args));
+        progress.setNote(get("CollectionManager.Session_Ready", args));
         progress.close();
     }
@@ -783 +783 @@
                 collection.gdm = new GDMManager();
                 // Tell everyone that it worked.
-                Gatherer.println(get("Loading_Successful", name));
+                Gatherer.println(get("CollectionManager.Loading_Successful", name));
                 // Now we need to hook up classes that depend on messages from the metadata set manager to keep their content fresh.
                 collection.msm.addMSMListener(this);
@@ -796 +796 @@
                 // There is obviously no existing collection present.
                 Gatherer.printStackTrace(error);
-                JOptionPane.showMessageDialog(Gatherer.g_man, get("Cannot_Open", args2), get("General.Error"), JOptionPane.ERROR_MESSAGE);
+                JOptionPane.showMessageDialog(Gatherer.g_man, get("CollectionManager.Cannot_Open", args2), get("General.Error"), JOptionPane.ERROR_MESSAGE);
             }
             }
@@ -808 +808 @@
     }
     else {
-        JOptionPane.showMessageDialog(Gatherer.g_man, get("Not_Col_File", args2), get("General.Error"), JOptionPane.ERROR_MESSAGE);
+        JOptionPane.showMessageDialog(Gatherer.g_man, get("CollectionManager.Not_Col_File", args2), get("General.Error"), JOptionPane.ERROR_MESSAGE);
         Gatherer.println("Not a Gatherer Collection.");
     }
@@ -929 +929 @@
         workspace_model = null;
         Gatherer.g_man.collectionChanged(ready());
-        JOptionPane.showMessageDialog(Gatherer.g_man, get("Preview_Ready"), get("Preview_Ready_Title"), JOptionPane.INFORMATION_MESSAGE);
+        JOptionPane.showMessageDialog(Gatherer.g_man, get("CollectionManager.Preview_Ready"), get("CollectionManager.Preview_Ready_Title"), JOptionPane.INFORMATION_MESSAGE);
     }
     else if(event.getStatus() == GShell.ERROR) {
-        JOptionPane.showMessageDialog(Gatherer.g_man, get("Preview_Ready_Failed"), get("Preview_Ready_Title"), JOptionPane.ERROR_MESSAGE);
+        JOptionPane.showMessageDialog(Gatherer.g_man, get("CollectionManager.Preview_Ready_Failed"), get("CollectionManager.Preview_Ready_Title"), JOptionPane.ERROR_MESSAGE);
         Gatherer.g_man.collectionChanged(ready()); 
     }

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

@@ -91 +91 @@
     super(Gatherer.g_man);
     this.close_button = new JButton(get("General.Close", null));
-    this.confirmation = new JCheckBox(get("Confirm_Delete", null));
+    this.confirmation = new JCheckBox(get("DeleteCollectionPrompt.Confirm_Delete", null));
     this.details = new JTextArea();
-    this.details_label = new JLabel(get("Collection_Details", null));
+    this.details_label = new JLabel(get("DeleteCollectionPrompt.Collection_Details", null));
     this.list = new JList();
-    this.list_label = new JLabel(get("Collection_List", null));
+    this.list_label = new JLabel(get("DeleteCollectionPrompt.Collection_List", null));
     this.list_model = new DefaultListModel();
     this.ok_button = new JButton(get("General.OK", null));
@@ -101 +101 @@
     this.setModal(true);
     this.setSize(SIZE);
-    this.setTitle(get("Title", null));
+    this.setTitle(get("DeleteCollectionPrompt.Title", null));
     this.setJMenuBar(new SimpleMenuBar("0")); // need to find an appropriate help page to open at
     close_button.addActionListener(new CloseButtonListener());
@@ -108 +108 @@
     confirmation.setSelected(false);
     details.setFont(Gatherer.config.getFont("general.tooltip_font", false));
-    details.setText(get("No_Collection", null));
+    details.setText(get("DeleteCollectionPrompt.No_Collection", null));
     list.addListSelectionListener(new CollectionListListener());
     list.clearSelection();
@@ -184 +184 @@
     args[0] = collection.getName();
     if(success) {
-        JOptionPane.showMessageDialog(prompt,get("Successful_Delete", args),get("Successful_Title", null),JOptionPane.INFORMATION_MESSAGE);
+        JOptionPane.showMessageDialog(prompt,get("DeleteCollectionPrompt.Successful_Delete", args),get("DeleteCollectionPrompt.Successful_Title", null),JOptionPane.INFORMATION_MESSAGE);
     }
     else {
-        JOptionPane.showMessageDialog(prompt,get("Failed_Delete", args),get("Failed_Title", null),JOptionPane.WARNING_MESSAGE);
+        JOptionPane.showMessageDialog(prompt,get("DeleteCollectionPrompt.Failed_Delete", args),get("DeleteCollectionPrompt.Failed_Title", null),JOptionPane.WARNING_MESSAGE);
     }
     }
@@ -264 +264 @@
         args[3] = collection.getMaintainer();
         args[4] = collection.getDescription();
-        details.setText(get("Details", args));
+        details.setText(get("DeleteCollectionPrompt.Details", args));
         details.setCaretPosition(0);
         }
         else {
         confirmation.setEnabled(false);
-        details.setText(get("No_Collection", null));
+        details.setText(get("DeleteCollectionPrompt.No_Collection", null));
         }
     }
@@ -314 +314 @@
         resultPrompt(true);
         list_model.removeElement(collection);
-        details.setText(get("No_Collection", null));
+        details.setText(get("DeleteCollectionPrompt.No_Collection", null));
         confirmation.setEnabled(false);
         confirmation.setSelected(false);