Changeset 10559

Timestamp:

2005-08-25T09:19:03+12:00 (19 years ago)

Author:

mdewsnip

Message:

Moved opening a collection onto its own thread, so the progress bar works when using a remote Greenstone.

File:

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

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

@@ -181 +181 @@
     }
     else if (esrc == menu_bar.file_open) {
-        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()) {
-            saveThenCloseCurrentCollection();
-        }
-
-        // Open the selected collection
-        Gatherer.c_man.loadCollection(collection_file_path);
-        }
+        new OpenCollectionTask().start();
     }
     else if (esrc == menu_bar.file_options) {
@@ -404 +393 @@
         Dictionary.register(tab_pane);
         content_pane.add(tab_pane, BorderLayout.CENTER);
+
         // Call refresh to update all controls to reflect current collection status.
         refresh(-1, Gatherer.c_man.ready());
@@ -645 +635 @@
 
 
-    /** When the load collection option is choosen this method is called to produce the modal file load prompt.
+    private class OpenCollectionTask
+        extends Thread
+    {
+    public void run()
+    {
+        // If using a remote Greenstone check if the collection configurations have been downloaded; do so if not
+        if (Gatherer.isGsdlRemote) {
+        File collect_directory = new File(Gatherer.getCollectDirectoryPath());
+        if (!collect_directory.exists() || collect_directory.listFiles().length == 0) {
+            if (!RemoteGreenstoneServer.downloadCollectionConfigurations()) {
+            // Something went wrong downloading the collection configurations
+            return;
+            }
+        }
+        }
+
+        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()) {
+            saveThenCloseCurrentCollection();
+        }
+
+        // Open the selected collection
+        Gatherer.c_man.loadCollection(collection_file_path);
+        }
+    }
+    }
+
+
+    /** When the load collection option is chosen this method is called to produce the modal file load prompt.
      */
     private String showOpenCollectionDialog()
     {
-    // If using a remote Greenstone check if the collection configurations have been downloaded; do so if not
-    File collect_directory = new File(Gatherer.getCollectDirectoryPath());
-    if (Gatherer.isGsdlRemote && (!collect_directory.exists() || collect_directory.listFiles().length == 0)) {
-        if (!RemoteGreenstoneServer.downloadCollectionConfigurations()) {
-        // Something went wrong downloading the collection configurations
-        return null;
-        }
-    }
-
     // We first try the simple open collection dialog
     SimpleOpenCollectionDialog dialog = new SimpleOpenCollectionDialog();
@@ -668 +681 @@
 
     // Chosen to use the advanced 'browse' dialog
+    File collect_directory = null;
     if (user_choice == SimpleOpenCollectionDialog.BROWSE_OPTION) {
         if (Gatherer.GS3) {