Changeset 4392

Timestamp:

2003-05-28T13:46:54+12:00 (21 years ago)

Author:

jmt12

Message:

Now close collection actually closes collection (after yesterdays save prompt fix) and new collection can also be cancelled without the current open collection being prematurely closed.

File:

• trunk/gli/src/org/greenstone/gatherer/gui/GUIManager.java (modified) (4 diffs)

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

@@ -187 +187 @@
         else if(esrc == menu_bar.file_new) {
         if(!Gatherer.c_man.saved()) {
-        cont = showSaveCollectionBox(true, false);
+        cont = showSaveCollectionBox(false, false);
         }
         if(cont) {
-        try {
-            while(Gatherer.c_man.ready()) {
-            wait(10);
-            }
-        }
-        catch(Exception error) {
-        }
         showNewCollectionPrompt();
         }
@@ -202 +195 @@
     else if(esrc == menu_bar.file_open) {
         if(!Gatherer.c_man.saved()) {
-        cont = showSaveCollectionBox(true, false);
+        cont = showSaveCollectionBox(false, false);
         }
         if(cont) {
@@ -666 +659 @@
     // Create the new collection (if not cancelled) in a new thread.
     if(!ncd_prompt.isCancelled() && (ncm_prompt == null || !ncm_prompt.isCancelled())) {
-                // Create new collection.
+        // If there is already a collection open, close it.
+        if(Gatherer.c_man.ready()) {
+        Gatherer.c_man.closeCollection();
+        // Wait until it is closed.
+        try {
+            while(Gatherer.c_man.ready()) {
+            wait(10);
+            }
+        }
+        catch(Exception error) {
+        }
+        }
+        // Create new collection.
         CreationTask task = new CreationTask(ncd_prompt, ncm_prompt);
         SwingUtilities.invokeLater(task);
-                // Close prompt.
+        // Close prompt.
     }
     // Done
@@ -714 +719 @@
     //switch(result) {
     //case SaveCollectionBox.SAVE_YES:
-    Gatherer.c_man.saveCollection(false, exit_after);
+    Gatherer.c_man.saveCollection(close_after, exit_after);
     //content_pane.paintImmediately(bounds);
     return true;