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

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).

Location:

trunk/gli/src/org/greenstone/gatherer/gui

Files:

• NewCollectionMetadataPrompt.java (modified) (1 diff)
• WarningDialog.java (modified) (3 diffs)

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

@@ -211 +211 @@
         cancelled = false;
         if (metadata_sets_list.isNothingTicked()) {
-        WarningDialog dialog = new WarningDialog("warning.NoMetadataSetsSelected", "NoMetadataSetsSelected.Title", "NoMetadataSetsSelected.Message", null, true);
+        WarningDialog dialog = new WarningDialog("warning.NoMetadataSetsSelected", "NoMetadataSetsSelected.Title", Dictionary.get("NoMetadataSetsSelected.Message"), null, true);
         if (dialog.display() == JOptionPane.OK_OPTION) {
             // Otherwise we are free to go

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

@@ -54 +54 @@
 
 
-    public WarningDialog(String warning_name, String warning_title, String warning_message, String affected_property, boolean can_cancel)
+    public WarningDialog(String warning_name, String warning_title_key, String warning_message, String affected_property, boolean can_cancel)
     {
     super(Gatherer.g_man, "Warning", true);
@@ -69 +69 @@
         setSize(NORMAL_SIZE);
     }
-    Dictionary.setText(this, warning_title);
+    Dictionary.setText(this, warning_title_key);
 
     // Creation
@@ -80 +80 @@
     text_area.setEditable(false);
     text_area.setLineWrap(true);
+    text_area.setText(warning_message);
     text_area.setWrapStyleWord(true);
-    Dictionary.setText(text_area, warning_message);
 
     value_panel = new JPanel();