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

Timestamp:

2005-05-13T10:42:26+12:00 (19 years ago)

Author:

mdewsnip

Message:

Changed WarningDialog to take the direct message text, rather than the message text key. This makes it more flexible, allowing arguments in the message text (eg. used by PluginManager).

File:

• trunk/gli/src/org/greenstone/gatherer/cdm/GeneralManager.java (modified) (2 diffs)

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", "TitleClashes.Title", "TitleClashes.Message", null, true);
+        WarningDialog dialog = new WarningDialog("warning.TitleClashes", "TitleClashes.Title", Dictionary.get("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", "TitleClashes.Title", "TitleClashes.Message", null, true);
+            WarningDialog dialog = new WarningDialog("warning.TitleClashes", "TitleClashes.Title", Dictionary.get("TitleClashes.Message"), null, true);
             if(dialog.display() == JOptionPane.OK_OPTION) {
             // If they have said yes, then carry on with the assignement