Changeset 4371

Timestamp:

2003-05-27T17:08:59+12:00 (21 years ago)

Author:

jmt12

Message:

Modified so that an open collection isn't closed if a user selects File->Open then decides to cancel - John

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• collection/CollectionManager.java (modified) (2 diffs)
• gui/GUIManager.java (modified) (3 diffs)

trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java

@@ -162 +162 @@
     }
     /** Used to determine whether the currently active collection has been built.
-      * @return A boolean indicating the built status of the collection.
-      */
+     * @return A boolean indicating the built status of the collection.
+     */
     public boolean built() {
     if(collection != null) {
@@ -171 +171 @@
     }
     /** Called to close the current collection and remove its lock file.
-      * @see org.greenstone.gatherer.Gatherer
-      * @see org.greenstone.gatherer.collection.Collection
-      * @see org.greenstone.gatherer.util.Utility
-      */
+     * @see org.greenstone.gatherer.Gatherer
+     * @see org.greenstone.gatherer.collection.Collection
+     * @see org.greenstone.gatherer.util.Utility
+     */
     public void closeCollection() {
     // Remove the lock on this file, then remove the collection.

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

@@ -204 +204 @@
         }
         if(cont) {
-        try {
-            while(Gatherer.c_man.ready()) {
-            wait(10);
-            }
-        }
-        catch(Exception error) {
-        }
-        if(!showLoadCollectionBox()) {
-            collectionChanged(false);
-        }
+        //if(!
+        showLoadCollectionBox();
+        //) {
+        //collectionChanged(false);
+        //}
         }
     }
@@ -618 +613 @@
     // User can cancel action.
     if(filename != null) {
+        // 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) {
+        }
+        }
         result = Gatherer.c_man.loadCollection(filename);
     }
@@ -706 +713 @@
     //switch(result) {
     //case SaveCollectionBox.SAVE_YES:
-    Gatherer.c_man.saveCollection(close_after, exit_after);
+    Gatherer.c_man.saveCollection(false, exit_after);
     //content_pane.paintImmediately(bounds);
     return true;