Changeset 8606

Timestamp:

2004-11-19T15:27:04+13:00 (19 years ago)

Author:

mdewsnip

Message:

Made just one WarningDialog constructor.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

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

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

@@ -550 +550 @@
         message_name = "warning.MissingEXEC";
     }
-    WarningDialog dialog = new WarningDialog(message_name, "general.exec_address" );
+    WarningDialog dialog = new WarningDialog(message_name, "general.exec_address", 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();
@@ -570 +570 @@
      */
     static public void missingGSDL() {
-    WarningDialog dialog = new WarningDialog("warning.MissingGSDL", false);
+    WarningDialog dialog = new WarningDialog("warning.MissingGSDL", null, false);
     dialog.display();
     dialog.dispose();
@@ -578 +578 @@
     /** 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", false);
+    WarningDialog dialog = new WarningDialog("warning.MissingPERL", null, false);
     dialog.display();
     dialog.dispose();
@@ -586 +586 @@
     /** 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", false);
+    WarningDialog dialog = new WarningDialog("warning.MissingWGET", null, false);
     dialog.display();
     dialog.dispose();
@@ -593 +593 @@
     /** 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", false);
+    WarningDialog dialog = new WarningDialog("warning.OldWGET", 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", true);
+        WarningDialog dialog = new WarningDialog("warning.TitleClashes", 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", true);
+            WarningDialog dialog = new WarningDialog("warning.TitleClashes", 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

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

@@ -504 +504 @@
     MetadataValue previously_selected_metadata_value = metadata_value_table.getSelectedMetadataValueTableEntry();
     metadata_value_table.rebuildAndSelectRowWithValueClosestTo(previously_selected_metadata_value);
-
-//  // Update the meta-audit view to show the current selection, if any.
-//  Gatherer.g_man.meta_audit.setRecords(file_nodes);
     }
 
@@ -528 +525 @@
         // If we're adding metadata to folders display the warning
         if (!file_nodes[0].isLeaf()) {
-        WarningDialog dialog = new WarningDialog("warning.DirectoryLevelMetadata", true);
+        WarningDialog dialog = new WarningDialog("warning.DirectoryLevelMetadata", null, true);
         int dialog_result = dialog.display();
         dialog.dispose();

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

@@ -309 +309 @@
         cancelled = false;
         if(selected_sets.size() == 0) {
-        WarningDialog dialog = new WarningDialog("warning.NoMetadataSetsSelected", true);
+        WarningDialog dialog = new WarningDialog("warning.NoMetadataSetsSelected", null, true);
         if(dialog.display() == JOptionPane.OK_OPTION) {
             // Otherwise we are free to go

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

@@ -55 +55 @@
 
 
-    public WarningDialog(String full_property, boolean can_cancel) {
-    this(full_property, can_cancel, null);
-    }
-
-    public WarningDialog(String full_property, String affected_property) {
-    this(full_property, false, affected_property);
-    }
-
-
-    private WarningDialog(String full_property, boolean can_cancel, String affected_property) {
+    public WarningDialog(String full_property, String affected_property, boolean can_cancel)
+    {
     super(Gatherer.g_man, "Warning", true);
 
@@ -268 +260 @@
     }
 }
-
-
-
-
-
-
-
-

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

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