Changeset 9801 for trunk/gli/src/org/greenstone/gatherer/gui/GUIManager.java

Timestamp:

2005-05-03T13:28:34+12:00 (19 years ago)

Author:

mdewsnip

Message:

Tidied up opening collections, and showLoadCollectionBox (now showOpenCollectionDialog) in particular. Now switches back to the Gather pane correctly before closing an open collection, as it needs to do to prevent nasty problems.

File:

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

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

@@ -181 +181 @@
     }
     else if (esrc == menu_bar.file_open) {
-        if (showLoadCollectionBox()) {
-        tab_pane.setSelectedComponent(gather_pane);
+        String collection_file_path = showOpenCollectionDialog();
+
+        // User has selected a collection to open
+        if (collection_file_path != null) {
+        // 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();
+        }
+
+        // Open the selected collection
+        Gatherer.c_man.loadCollection(collection_file_path);
         }
     }
@@ -619 +630 @@
     }
 
+
     /** When the load collection option is choosen this method is called to produce the modal file load prompt.
      */
-    private boolean showLoadCollectionBox() {
-    boolean result = false;
+    private String showOpenCollectionDialog()
+    {
     // We first try the simple open collection dialog
     SimpleOpenCollectionDialog dialog = new SimpleOpenCollectionDialog();
     int user_choice = dialog.display();
-    String filename = null;
-    // The user may choose to go to the advanced 'browse' dialog
-    if(user_choice == SimpleOpenCollectionDialog.OK_OPTION) {
-        filename = dialog.getFileName();
-    }
-    else if(user_choice == SimpleOpenCollectionDialog.BROWSE_OPTION) {
+
+    // Used simple collection list
+    if (user_choice == SimpleOpenCollectionDialog.OK_OPTION) {
+        return dialog.getFileName();
+    }
+
+    // Chosen to use the advanced 'browse' dialog
+    if (user_choice == SimpleOpenCollectionDialog.BROWSE_OPTION) {
         File collect_directory;
         if (Gatherer.GS3) {
@@ -640 +654 @@
         }
         OpenCollectionDialog chooser = new OpenCollectionDialog(collect_directory);
-        filename = chooser.getFileName();
-        chooser.destroy();
-        chooser = null;
-    }
-    dialog.destroy();
-    dialog = null;
-    // User can cancel action.
-    if(filename != null) {
-        // If there is already a collection open, save and close it.
-        if (Gatherer.c_man.ready()) {
-        Gatherer.c_man.saveCollection();
-        Gatherer.c_man.closeCollection();
-        }
-
-        Gatherer.c_man.loadCollection(filename);
-
-        filename = null;
-    }
-    return result;
+        return chooser.getFileName();
+    }
+
+    // User must have cancelled the action
+    return null;
     }