Changeset 5056

Timestamp:

2003-07-29T10:46:37+12:00 (21 years ago)

Author:

jmt12

Message:

Modified calls for warning dialogs to include dicitonary, and to allow for a 'NoSettingDialog' like effect.

File:

• trunk/gli/src/org/greenstone/gatherer/Gatherer.java (modified) (8 diffs)

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

@@ -185 +185 @@
         dictionary = new Dictionary(config.getLocale("general.locale", true), config.getFont("general.font", true));
 
+        if(gsdl_path == null) {
+        missingGSDL(dictionary);
+        }
+
         // If we were given a server run it if neccessary.
         if(config.exec_file != null) {
@@ -194 +198 @@
         if(config.exec_file == null && config.exec_address == null) {
         missingEXEC(dictionary);
-        }
-        if(gsdl_path == null) {
-        missingGSDL(dictionary);
         }
         // Perl path is a little different as it is perfectly ok to start the Gatherer without providing a perl path
@@ -575 +576 @@
     Splash splash = new Splash();
 
-    // We take appropriate action when an empty gsdl_path is detected.
-    if(gsdl_path == null) {
-        // Check for the presence of the path.cfg file.
-        File path_file = new File("path.cfg");
-        if(path_file.exists()) {
-        try {
-            // Read in then add each property to the Java Environment.
-            FileInputStream prop_file = new FileInputStream(path_file);
-            Properties p = new Properties();
-            p.load(prop_file);
-            extra = p.getProperty(KEY);
-        }
-        catch (Exception error) {
-            System.out.println("Error in main():");
-            error.printStackTrace();
-            System.exit(1);
-        }
-        }
-        else {
-        missingGSDL(dictionary);
-        }
-    }
-    // We take appropriate action when an empty bin_path is detected.
     gatherer.run(size, gsdl_path, exec_path, debug, perl_path, no_load, splash, filename);
     }
+
     /** Prints a warning message about a missing library path, which means the final collection cannot be previewed in the Gatherer.
      */
     static public void missingEXEC(Dictionary dictionary) {
-    NoSettingDialog dialog = new NoSettingDialog("warning.MissingEXEC", "NoSettingEXEC.Message", false);
+    WarningDialog dialog = new WarningDialog("warning.MissingEXEC", "general.exec_address", dictionary);
+    //NoSettingDialog dialog = new NoSettingDialog("warning.MissingEXEC", "NoSettingEXEC.Message", false, dictionary);
     dialog.display();
     dialog.dispose();
@@ -609 +589 @@
     ///ystem.out.println(dictionary.get("General.Missing_EXEC"));
     }
+
     /** Prints a warning message about a missing GSDL path, which although not fatal pretty much ensures nothing will work properly in the Gatherer.
      */
     static public void missingGSDL(Dictionary dictionary) {
-    WarningDialog dialog = new WarningDialog("warning.MissingGSDL", false);
+    WarningDialog dialog = new WarningDialog("warning.MissingGSDL", false, dictionary);
     dialog.display();
     dialog.dispose();
@@ -618 +599 @@
     ///ystem.out.println(dictionary.get("General.Missing_GSDL"));
     }
+
     /** 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(Dictionary dictionary) {
-    WarningDialog dialog = new WarningDialog("warning.MissingPERL", false);
+    WarningDialog dialog = new WarningDialog("warning.MissingPERL", false, dictionary);
     dialog.display();
     dialog.dispose();
@@ -626 +608 @@
     ///ystem.out.println(dictionary.get("General.Missing_PERL"));
     }
+
     /** Print a message to the debug stream. */
     static synchronized public void println(String message) {
@@ -633 +616 @@
     }
     }
+
     /** Print a stack trace to the debug stream. */
     static synchronized public void printStackTrace(Exception exception) {
@@ -923 +907 @@
     }
     }
+
     /** This class is intented to detect a specific SIGNAL, in this case SIGINT, and exit properly, rather than letting the Gatherer be interrupted which has the potential to leave erroneous lock files. */
     private class CTRLCHandler