Changeset 10387

Timestamp:

2005-08-02T10:01:40+12:00 (19 years ago)

Author:

mdewsnip

Message:

Tidied up the way collections are saved and closed, and added some stuff in preparation for uploading metadata files to the server.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• Gatherer.java (modified) (1 diff)
• gui/EnrichPane.java (modified) (1 diff)
• gui/GUIManager.java (modified) (6 diffs)
• gui/Preferences.java (modified) (1 diff)

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

@@ -468 +468 @@
      * @see org.greenstone.gatherer.gui.GUIManager
      */
-    public void exit() {
+    public void exit()
+    {
     exit = true;
-    // If we have an open collection make note of it.
-    Configuration.setString("general.open_collection", true, null);
-    if(c_man.ready()) {
-        ///ystem.err.println("Collection open.");
-        if(c_man.saved()) {
-        ///ystem.err.println("Collection has been recently saved, so I'll remember it for next time.");
-        Configuration.setString("general.open_collection", true, c_man.getCollectionFilePath());
-        }
-        c_man.closeCollection();
-    }
-    if(assoc_man != null) {
+
+    // 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
+    if (assoc_man != null) {
         assoc_man.save();
         assoc_man = null;

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

@@ -194 +194 @@
     // Force all of the controls to be updated
     valueChanged(null);
+    }
+
+
+    /** Called to inform this pane that it has just lost focus as an effect of the user clicking on another tab
+     */
+    public void loseFocus()
+    {
+    // Nothing to do
     }
 

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

@@ -150 +150 @@
     }
     else if (esrc == menu_bar.file_close) {
-        tab_pane.setSelectedComponent(gather_pane);  // Must be done before closing the collection
-        Gatherer.c_man.saveCollection();
-        Gatherer.c_man.closeCollection();
+        saveThenCloseCurrentCollection();
     }
     else if (esrc == menu_bar.file_delete) {
         DeleteCollectionPrompt dcp = new DeleteCollectionPrompt();
         if (dcp.display()) {
-        Gatherer.c_man.closeCollection();
+        saveThenCloseCurrentCollection();
         }
         dcp.destroy();
@@ -176 +174 @@
     }
     else if (esrc == menu_bar.file_exit) {
+        returnToInitialPane();
         exit();
     }
@@ -188 +187 @@
         // If there is already a collection open, save and close it
         if (Gatherer.c_man.ready()) {
-            tab_pane.setSelectedComponent(gather_pane);  // Must be done before closing the collection
-            Gatherer.c_man.saveCollection();
-            Gatherer.c_man.closeCollection();
+            saveThenCloseCurrentCollection();
         }
 
@@ -286 +283 @@
 
 
-    public void closeCurrentCollection() {
+    public void saveThenCloseCurrentCollection()
+    {
+    tab_pane.setSelectedComponent(gather_pane);
     Gatherer.c_man.saveCollection();
     Gatherer.c_man.closeCollection();
-    tab_pane.setSelectedComponent(gather_pane);
     }
 
@@ -690 +688 @@
         // If there is already a collection open, save and close it.
         if (Gatherer.c_man.ready()) {
-        Gatherer.c_man.saveCollection();
-        Gatherer.c_man.closeCollection();
+        saveThenCloseCurrentCollection();
         }
 
@@ -745 +742 @@
      * @param event A ChangeEvent containing information about the event that fired this call.
      */
-    public void stateChanged(ChangeEvent event) {
-    if(previous_pane != null) {
-        if(previous_pane == create_pane) {
+    public void stateChanged(ChangeEvent event)
+    {
+    // Tell the previous pane that it has lost focus
+    if (previous_pane != null) {
+        if (previous_pane == enrich_pane) {
+        enrich_pane.loseFocus();
+        }
+        else if (previous_pane == design_pane) {
+        design_pane.loseFocus();
+        }
+        else if (previous_pane == create_pane) {
         create_pane.loseFocus();
-        }
-        else if(previous_pane == design_pane) {
-           design_pane.loseFocus();
         }
     }

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

@@ -718 +718 @@
         // shut down the collection
         System.err.println("shutting down teh collection");
-        Gatherer.g_man.closeCurrentCollection();
+        Gatherer.g_man.saveThenCloseCurrentCollection();
         }