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

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/gui

Files:

• EnrichPane.java (modified) (1 diff)
• NewCollectionMetadataPrompt.java (modified) (1 diff)
• WarningDialog.java (modified) (5 diffs)

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

@@ -194 +194 @@
         // If we're adding metadata to folders display the warning
         if (esrc == add && !file_nodes[0].isLeaf()) {
-        WarningDialog dialog = new WarningDialog("warning.DirectoryLevelMetadata", null, true);
+        WarningDialog dialog = new WarningDialog("warning.DirectoryLevelMetadata", "DirectoryLevelMetadata.Title", "DirectoryLevelMetadata.Message", null, true);
         int dialog_result = dialog.display();
         dialog.dispose();

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

@@ -211 +211 @@
         cancelled = false;
         if (metadata_sets_list.isNothingTicked()) {
-        WarningDialog dialog = new WarningDialog("warning.NoMetadataSetsSelected", null, true);
+        WarningDialog dialog = new WarningDialog("warning.NoMetadataSetsSelected", "NoMetadataSetsSelected.Title", "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

@@ -39 +39 @@
 public class WarningDialog
     extends ModalDialog 
-    implements ActionListener, KeyListener {
-
+    implements ActionListener, KeyListener
+{
     static final private Dimension NORMAL_SIZE = new Dimension(450, 160);
     static final private Dimension SETTING_SIZE = new Dimension(450, 200);
@@ -52 +52 @@
     private String affected_property;
     private String full_property;
-    private String warning_name;
-
-
-    public WarningDialog(String full_property, String affected_property, boolean can_cancel)
-    {
-    this(full_property, null, affected_property, can_cancel);
-    }
-
-
-    public WarningDialog(String full_property, String[] args, String affected_property, boolean can_cancel)
+
+
+    public WarningDialog(String warning_name, String warning_title, String warning_message, String affected_property, boolean can_cancel)
     {
     super(Gatherer.g_man, "Warning", true);
@@ -67 +60 @@
     // Determine the name of this prompt.
     this.affected_property = affected_property;
-    this.full_property = full_property;
-    warning_name = full_property.substring(full_property.indexOf(".") + 1);
+    this.full_property = warning_name;
 
     // Now build dialog.
@@ -77 +69 @@
         setSize(NORMAL_SIZE);
     }
-    Dictionary.setText(this, warning_name + ".Title");
+    Dictionary.setText(this, warning_title);
 
     // Creation
@@ -89 +81 @@
     text_area.setLineWrap(true);
     text_area.setWrapStyleWord(true);
-    Dictionary.setText(text_area, warning_name + ".Message", args);
+    Dictionary.setText(text_area, warning_message);
 
     value_panel = new JPanel();