Changeset 10242 for trunk/gli/src/org/greenstone/gatherer/GathererProg.java

Timestamp:

2005-07-13T14:10:18+12:00 (19 years ago)

Author:

mdewsnip

Message:

Moved a lot of the duplicated code out of GathererProg and GathererApplet and into Gatherer.

File:

• trunk/gli/src/org/greenstone/gatherer/GathererProg.java (modified) (3 diffs)

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

@@ -6 +6 @@
  * University of Waikato, New Zealand.
  *
- * Author: John Thompson, Greenstone Digital Library, University of Waikato
+ * Author: John Thompson, NZDL Project, University of Waikato
  *
- * Copyright (C) 1999 New Zealand Digital Library Project
+ * Copyright (C) 2005 New Zealand Digital Library Project
  *
  * This program is free software; you can redistribute it and/or modify
@@ -28 +28 @@
 
 
-import java.awt.*;
 import java.io.*;
-import java.util.*;
 import javax.swing.*;
-import org.greenstone.gatherer.feedback.ActionRecorderDialog;
-import org.greenstone.gatherer.gui.GUIManager;
 import org.greenstone.gatherer.util.Utility;
 
 
-/** Containing the main() method for the Gatherer, this class is the
- * starting point for the rest of the application. Using GetOpt and
- * GathererBase it first parses the command line arguments, preparing to
- * update the configuration as required. Next it loads several important
- * support classes such as the Configuration and Dictionary. Finally it
- * creates the other important managers and sends them on their way.
- * @author John Thompson, Greenstone Digital Library, University of Waikato
- * @version 2.3
+/**
+ * Containing the main() method, this class is the entry point for the
+ * stand-alone (non-Applet) GLI. The main point of this class is to set
+ * some stand-alone specific properties and then create an instance of the
+ * Gatherer class.
+ * @author John Thompson, NZDL Project, University of Waikato
  */
 public class GathererProg
 {
-    /** The entry point into the Gatherer. Parses arguments.
+    /** The entry point into the stand-alone GLI.
      * @param args A collection of arguments that may include: initial screen size, dictionary, path to the GSDL etc.
-     * @see java.io.File
-     * @see java.io.FileInputStream
-     * @see java.lang.Exception
-     * @see java.util.Properties
-     * @see org.greenstone.gatherer.Dictionary
-     * @see org.greenstone.gatherer.Gatherer
      */
-    static public void main(String[] args) {
+    static public void main(String[] args)
+    {
     // A serious hack, but its good enough to stop crappy 'Could not
     // lock user prefs' error messages.  Thanks to Walter Schatz from
     // the java forums.
     System.setProperty("java.util.prefs.syncInterval","2000000"); 
-    // => results in One message every 600 hours!
+    // => results in one message every 600 hours!
 
     // Ensure platform specific LAF
@@ -73 +62 @@
 
     // Ensure the GLI user directory exists
-    File gli_user_directory = Utility.setGLIUserFolder(null); // # defaults to user's home area
-    if (!gli_user_directory.exists()) {
-        gli_user_directory.mkdirs();
+        File gli_user_directory = Utility.setGLIUserFolder(null);  // Defaults to user's home area
+    if (!gli_user_directory.exists() && !gli_user_directory.mkdirs()) {
+        System.err.println("Error: Unable to make directory: " + gli_user_directory.toString());
     }
 
-    Gatherer gatherer = new Gatherer();
+    // Create an instance of the Gatherer class, which will parse the args and prepare the rest of the GLI
+    Gatherer gatherer = new Gatherer(args);
 
-    Dimension size = new Dimension(800, 540);
+    // Display the GUI immediately
+    gatherer.openGUI();
 
-    GetOpt go = new GetOpt(args);
-
-    if (go.feedback_enabled) {
-        // If feedback is enabled, set up the recorder dialog.
-        // Use the default locale for now - this will be changed by the
-        // Gatherer run method
-        Locale currLocale = Locale.getDefault(); 
-        ActionRecorderDialog dlg = new ActionRecorderDialog (currLocale);
-        gatherer.feedback_enabled = true;
-        gatherer.feedback_dialog = dlg;
-    }
-
-    if (go.collect_directory_path != null) {
-        // Use non-standard collect directory (for when running one GLI in a network environment)
-        Gatherer.setCollectDirectoryPath(go.collect_directory_path);
-    }
-
-    GUIManager g_man 
-        = gatherer.init(size, go.gsdl_path, go.gsdl3_path, go.local_library_path,
-                 go.library_url_string, go.debug, go.perl_path, 
-                 go.no_load, go.filename, go.site_name, 
-                 go.servlet_path, go.wget_path);
-    gatherer.run(size, g_man);
-
-    // If there was an open collection last session, reopen it.
+    // If there was an open collection last session, reopen it
     if (Gatherer.open_collection_file_path != null) {
         Gatherer.c_man.loadCollection(Gatherer.open_collection_file_path);