Changeset 9864

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

Files:

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

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

@@ -557 +557 @@
     WarningDialog dialog;
     if (GS3) {
-        dialog = new WarningDialog("warning.MissingEXEC_GS3", "MissingEXEC_GS3.Title", "MissingEXEC_GS3.Message", "general.library_url", false);
+        dialog = new WarningDialog("warning.MissingEXEC_GS3", "MissingEXEC_GS3.Title", Dictionary.get("MissingEXEC_GS3.Message"), "general.library_url", false);
     }
     else {
-        dialog = new WarningDialog("warning.MissingEXEC", "MissingEXEC.Title", "MissingEXEC.Message", "general.library_url", false);
+        dialog = new WarningDialog("warning.MissingEXEC", "MissingEXEC.Title", Dictionary.get("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)));
@@ -582 +582 @@
      */
     static public void missingGSDL() {
-    WarningDialog dialog = new WarningDialog("warning.MissingGSDL", "MissingGSDL.Title", "MissingGSDL.Message", null, false);
+    WarningDialog dialog = new WarningDialog("warning.MissingGSDL", "MissingGSDL.Title", Dictionary.get("MissingGSDL.Message"), null, false);
     dialog.display();
     dialog.dispose();
@@ -590 +590 @@
     /** Prints a warning message about missing a valid ImageMagick path, which although not fatal means building image collections won't work */
     static public void missingImageMagick() {
-    WarningDialog dialog = new WarningDialog("warning.MissingImageMagick", "MissingImageMagick.Title", "MissingImageMagick.Message", null, false);
+    WarningDialog dialog = new WarningDialog("warning.MissingImageMagick", "MissingImageMagick.Title", Dictionary.get("MissingImageMagick.Message"), null, false);
     dialog.display();
     dialog.dispose();
@@ -598 +598 @@
     /** Prints a warning message about missing a valid PERL path, which although not fatal pretty much ensures no collection creation/building will work properly in the GLI. */
     static public void missingPERL() {
-    WarningDialog dialog = new WarningDialog("warning.MissingPERL", "MissingPERL.Title", "MissingPERL.Message", null, false);
+    WarningDialog dialog = new WarningDialog("warning.MissingPERL", "MissingPERL.Title", Dictionary.get("MissingPERL.Message"), null, false);
     dialog.display();
     dialog.dispose();
@@ -606 +606 @@
     /** Prints a warning message about missing a valid WGet path, which although not fatal means mirroring won't work */
     static public void missingWGET() {
-    WarningDialog dialog = new WarningDialog("warning.MissingWGET", "MissingWGET.Title", "MissingWGET.Message", null, false);
+    WarningDialog dialog = new WarningDialog("warning.MissingWGET", "MissingWGET.Title", Dictionary.get("MissingWGET.Message"), null, false);
     dialog.display();
     dialog.dispose();
@@ -614 +614 @@
     /** 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", "OldWGET.Title", "OldWGET.Message", null, false);
+    WarningDialog dialog = new WarningDialog("warning.OldWGET", "OldWGET.Title", Dictionary.get("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", "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

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

@@ -1004 +1004 @@
 
         // Now display a message dialog saying its all built
-        WarningDialog collection_built_warning_dialog = new WarningDialog("warning.CollectionBuilt", "CollectionBuilt.Title", "CollectionBuilt.Message", null, false);
+        WarningDialog collection_built_warning_dialog = new WarningDialog("warning.CollectionBuilt", "CollectionBuilt.Title", Dictionary.get("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/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();

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

@@ -224 +224 @@
         // If we're adding metadata to folders display the warning
         if (!file_nodes[0].isLeaf()) {
-        WarningDialog dialog = new WarningDialog("warning.DirectoryLevelMetadata", "DirectoryLevelMetadata.Title", "DirectoryLevelMetadata.Message", null, true);
+        WarningDialog dialog = new WarningDialog("warning.DirectoryLevelMetadata", "DirectoryLevelMetadata.Title", Dictionary.get("DirectoryLevelMetadata.Message"), null, true);
         int dialog_result = dialog.display();
         dialog.dispose();
@@ -451 +451 @@
         Runnable task = new Runnable() {
             public void run() {
-            WarningDialog dialog = new WarningDialog("warning.ExtractedMetadata", "ExtractedMetadata.Title", "ExtractedMetadata.Message", null, false);
+            WarningDialog dialog = new WarningDialog("warning.ExtractedMetadata", "ExtractedMetadata.Title", Dictionary.get("ExtractedMetadata.Message"), null, false);
             dialog.display();
             dialog.dispose();