Changeset 9350

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

Files:

• Gatherer.java (modified) (3 diffs)
• cdm/GeneralManager.java (modified) (2 diffs)
• cdm/PluginManager.java (modified) (1 diff)
• collection/CollectionManager.java (modified) (1 diff)
• gui/EnrichPane.java (modified) (1 diff)
• gui/NewCollectionMetadataPrompt.java (modified) (1 diff)
• gui/WarningDialog.java (modified) (5 diffs)
• metadata/MetadataValueTableModel.java (modified) (2 diffs)

trunk/gli/src/org/greenstone/gatherer/Gatherer.java

@@ -546 +546 @@
      */
     static public void missingEXEC() {
-    String message_name;
+    WarningDialog dialog;
     if (GS3) {
-        message_name = "warning.MissingEXEC_GS3";
-    } else {
-        message_name = "warning.MissingEXEC";
-    }
-    WarningDialog dialog = new WarningDialog(message_name, "general.library_url", false);
+        dialog = new WarningDialog("warning.MissingEXEC_GS3", "MissingEXEC_GS3.Title", "MissingEXEC_GS3.Message", "general.library_url", false);
+    }
+    else {
+        dialog = new WarningDialog("warning.MissingEXEC", "MissingEXEC.Title", "MissingEXEC.Message", "general.library_url", false);
+    }
     dialog.setValueField(new URLField(Configuration.getColor("coloring.editable_foreground", false), Configuration.getColor("coloring.editable_background", false), Configuration.getColor("coloring.error_foreground", false), Configuration.getColor("coloring.error_background", false)));
     dialog.display();
@@ -573 +573 @@
      */
     static public void missingGSDL() {
-    WarningDialog dialog = new WarningDialog("warning.MissingGSDL", null, false);
+    WarningDialog dialog = new WarningDialog("warning.MissingGSDL", "MissingGSDL.Title", "MissingGSDL.Message", null, false);
     dialog.display();
     dialog.dispose();
@@ -581 +581 @@
     /** Prints a warning message about a missing PERL path, which although not fatal pretty much ensures no collection creation/building will work properly in the Gatherer. */
     static public void missingPERL() {
-    WarningDialog dialog = new WarningDialog("warning.MissingPERL", null, false);
+    WarningDialog dialog = new WarningDialog("warning.MissingPERL", "MissingPERL.Title", "MissingPERL.Message", null, false);
     dialog.display();
     dialog.dispose();
     dialog = null;
     }
-    
+
     /** Prints a warning message about a missing a valid WGet path. not fatal, but mirroring won't work */
     static public void missingWGET() {
-    WarningDialog dialog = new WarningDialog("warning.MissingWGET", null, false);
+    WarningDialog dialog = new WarningDialog("warning.MissingWGET", "MissingWGET.Title", "MissingWGET.Message", null, false);
     dialog.display();
     dialog.dispose();
     dialog = null;
     }
+
     /** Prints a warning message about having an old version of WGet. not fatal, but mirroring may not work properly */
     static public void oldWGET() {
-    WarningDialog dialog = new WarningDialog("warning.OldWGET", null, false);
+    WarningDialog dialog = new WarningDialog("warning.OldWGET", "OldWGET.Title", "OldWGET.Message", null, false);
     dialog.display();
     dialog.dispose();

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();

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

@@ -1059 +1059 @@
 
         // Now display a message dialog saying its all built
-        WarningDialog collection_built_warning_dialog = new WarningDialog("warning.CollectionBuilt", null, false);
+        WarningDialog collection_built_warning_dialog = new WarningDialog("warning.CollectionBuilt", "CollectionBuilt.Title", "CollectionBuilt.Message", null, false);
         collection_built_warning_dialog.setMessageOnly(true); // Not a warning
         collection_built_warning_dialog.display();

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();

trunk/gli/src/org/greenstone/gatherer/metadata/MetadataValueTableModel.java

@@ -256 +256 @@
         Runnable task = new Runnable() {
             public void run() {
-            WarningDialog dialog = new WarningDialog("warning.ExtractedMetadata", null, false);
+            WarningDialog dialog = new WarningDialog("warning.ExtractedMetadata", "ExtractedMetadata.Title", "ExtractedMetadata.Message", null, false);
             dialog.display();
             dialog.dispose();
@@ -270 +270 @@
         Runnable task = new Runnable() {
             public void run() {
-            WarningDialog dialog = new WarningDialog("warning.InheritedMetadata", null, false);
+            WarningDialog dialog = new WarningDialog("warning.InheritedMetadata", "InheritedMetadata.Title", "InheritedMetadata.Message", null, false);
             dialog.display();
             dialog.dispose();