Changeset 9350 for trunk/gli/src/org/greenstone/gatherer/cdm

Timestamp:

2005-03-10T11:54:56+13:00 (19 years ago)

Author:

mdewsnip

Message:

Changed WarningDialog to take the dialog title and message as arguments. This means that these strings are marked as used when running showkeyusage.pl.

Location:

trunk/gli/src/org/greenstone/gatherer/cdm

Files:

• GeneralManager.java (modified) (2 diffs)
• PluginManager.java (modified) (1 diff)

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

@@ -385 +385 @@
         if(NewCollectionDetailsPrompt.titleClashes(title, CollectionDesignManager.collect_config.getFile())) {
         // Determine if the user wants to be warned about this
-        WarningDialog dialog = new WarningDialog("warning.TitleClashes", null, true);
+        WarningDialog dialog = new WarningDialog("warning.TitleClashes", "TitleClashes.Title", "TitleClashes.Message", null, true);
         if(dialog.display() == JOptionPane.OK_OPTION) {
             // If they have said yes, then carry on with the assignement
@@ -434 +434 @@
         if(!has_been_warned && NewCollectionDetailsPrompt.titleClashes(title, CollectionDesignManager.collect_config.getFile())) {
             // Determine if the user wants to be warned about this
-            WarningDialog dialog = new WarningDialog("warning.TitleClashes", null, true);
+            WarningDialog dialog = new WarningDialog("warning.TitleClashes", "TitleClashes.Title", "TitleClashes.Message", null, true);
             if(dialog.display() == JOptionPane.OK_OPTION) {
             // If they have said yes, then carry on with the assignement

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

@@ -157 +157 @@
         String[] args = new String[1];
         args[0] = file.getName();
-        WarningDialog warning_dialog = new WarningDialog("warning.NoPluginExpectedToProcessFile", args, null, false);
+        WarningDialog warning_dialog = new WarningDialog("warning.NoPluginExpectedToProcessFile", "NoPluginExpectedToProcessFile.Title", Dictionary.get("NoPluginExpectedToProcessFile.Message", args), null, false);
         warning_dialog.display();
         warning_dialog.dispose();