Changeset 9341

Timestamp:

2005-03-09T14:16:49+13:00 (19 years ago)

Author:

mdewsnip

Message:

Changed to use the new ModalProgressPopup to prevent race conditions when opening locked collections.

File:

• trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java (modified) (3 diffs)

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

@@ -731 +731 @@
     public void loadCollection(String collection_file_path)
     {
+    // Display a modal progress popup to indicate that the collection is being loaded
     ModalProgressPopup load_collection_progress_popup = new ModalProgressPopup(Dictionary.get("CollectionManager.Loading_Collection"), Dictionary.get("CollectionManager.Loading_Collection_Please_Wait"));
-    LoadCollectionTask load_collection_task = new LoadCollectionTask(collection_file_path, load_collection_progress_popup);
-    load_collection_task.start();
-    load_collection_progress_popup.display();  // Blocks, so must go *after* starting the task!
+    load_collection_progress_popup.display();
+
+    // Load the collection on a separate thread so the progress bar updates correctly
+    (new LoadCollectionTask(collection_file_path, load_collection_progress_popup)).start();
     }
 
@@ -753 +755 @@
     {
         loadCollectionInternal(collection_file_path);
-        load_collection_progress_popup.setVisible(false);
+        load_collection_progress_popup.close();
     }
     }
@@ -777 +779 @@
     }
 
-    // Check that there is the collection configuration file available
+    // Check that the collection configuration file is available
     File collection_file = new File(location);
-    // Ensure that the directory exists.
+
+    // Ensure that the directory exists
     File collection_directory = collection_file.getParentFile();
-    if (!collection_directory.exists()) {
-        // we cant open this
-        collection_directory = null;
+    if (collection_directory == null || !collection_directory.exists()) {
+        // We can't open this
+        System.err.println("CollectionManager.loadCollection: No collection directory.");
         return;
     }
+
     File collection_config_file = new File(collection_directory, Utility.CONFIG_FILE);
     if (!collection_config_file.exists()) {
-        DebugStream.println("CollectionManager.loadCollection: No config file");
+        System.err.println("CollectionManager.loadCollection: No config file.");
         collection_directory = null;
         collection_config_file = null;