Changeset 10396

Timestamp:

2005-08-02T15:35:54+12:00 (19 years ago)

Author:

mdewsnip

Message:

Tidied up the Gatherer and GUIManager exit() functions to make sure the loaded collection is saved when the user closes the GLI applet window.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• Gatherer.java (modified) (3 diffs)
• GathererApplet.java (modified) (1 diff)
• gui/GUIManager.java (modified) (3 diffs)

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

@@ -470 +470 @@
     public void exit()
     {
+    System.err.println("In Gatherer.exit()...");
     exit = true;
-
-    // If we have an open collection remember it for next time, then save it and close it
-    if (c_man.ready()) {
-        Configuration.setString("general.open_collection", true, c_man.getCollectionFilePath());
-        g_man.saveThenCloseCurrentCollection();
-    }
-    else {
-        Configuration.setString("general.open_collection", true, null);
-    }
 
     // Save the file associations
@@ -487 +479 @@
     }
 
-    // Store the current position and size (if reasonable) of the Gatherer for next time
-    Rectangle bounds = g_man.getBounds();
-    Configuration.setBounds("general.bounds", true, bounds);
-
-    // Save configuration.
-    Configuration.save();
-
     // Get the gui to deallocate
-    g_man.setVisible(false);
     g_man.destroy();
     g_man_built = false;
@@ -509 +493 @@
     // Make sure we haven't started up any processes that are still running
     if (apps.size() == 0) {
-        if (Gatherer.isApplet) {
-        // If we're running as an applet we don't actually quit, just delete the main GLI window
-        g_man = null;
-        }
-        else {
+        // If we're running as an applet we don't actually quit (just hide the main GLI window)
+        if (!Gatherer.isApplet) {
         // This is the end...
         System.exit(0);

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

@@ -185 +185 @@
 
     // If there was an open collection last session, reopen it
-    if (Gatherer.open_collection_file_path != null) {
+    Gatherer.open_collection_file_path = Configuration.getString("general.open_collection", true);
+    if (Gatherer.open_collection_file_path != null && !Gatherer.open_collection_file_path.equals("")) {
         Gatherer.c_man.loadCollection(Gatherer.open_collection_file_path);
     }

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

@@ -174 +174 @@
     }
     else if (esrc == menu_bar.file_exit) {
-        returnToInitialPane();
         exit();
     }
@@ -291 +290 @@
 
 
-    public void destroy() {
+    /** This is called when we're absolutely finished with the GLI. It is *not* called when the applet is suspended.
+     */
+    public void destroy()
+    {
     // Destroying create pane ensures the latest log has been closed
     if (create_pane != null) {
         create_pane.destroy();
+    }
+
+    // Deal to help
+    if (help != null) {
+        help.destroy();
+        help = null;
     }
     }
@@ -409 +417 @@
     /** This method ensures that all the things needing saving are saved before Gatherer.exit() is called.
      */
-    public void exit() {
-    // Tell everyone who cares that they are losing focus
-    DebugStream.println("**** GUIManager exit called!");
-
-    if (!Gatherer.c_man.ready() || design_pane.canSave()) {
-        // If we're running as an applet we don't actually quit, just hide the main GLI window
-        if (Gatherer.isApplet) {
-        // consider saving???
-        setVisible(false);
-        }
-        else {
-        if (Gatherer.c_man.ready() && !Gatherer.c_man.saved()) {
-            Gatherer.c_man.saveCollection();
-        }
-
-        // Deal to help
-        if (help != null) {
-            help.destroy();
-            help = null;
-        }
-        DebugStream.println("**** Calling Gatherer.self.exit");
-        Gatherer.self.exit();
-        }
+    public void exit()
+    {
+    // If we have a collection open remember it for next time, then save it and close it
+    if (Gatherer.c_man.ready()) {
+        Configuration.setString("general.open_collection", true, Gatherer.c_man.getCollectionFilePath());
+        saveThenCloseCurrentCollection();
+    }
+    else {
+        Configuration.setString("general.open_collection", true, null);
+    }
+
+    // Store the current position and size of the GLI for next time
+    Configuration.setBounds("general.bounds", true, getBounds());
+
+    // Save configuration
+    Configuration.save();
+
+    // Hide the main window
+    setVisible(false);
+
+    // If we're running as an applet we don't quit here (we quit when the browser calls GathererApplet.destroy())
+    if (!Gatherer.isApplet) {
+        Gatherer.self.exit();
     }
     }