Changeset 9039

Timestamp:

2005-02-15T12:11:37+13:00 (19 years ago)

Author:

mdewsnip

Message:

Added a progress bar for loading collections. This involved changing collection loading to be on a thread, so the progress dialog box is modal to prevent users from messing with anything while the collection is loaded.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• Gatherer.java (modified) (2 diffs)
• GathererApplet.java (modified) (2 diffs)
• GathererProg.java (modified) (1 diff)
• collection/CollectionManager.java (modified) (18 diffs)
• gui/ModalProgressPopup.java (added)

trunk/gli/src/org/greenstone/gatherer/Gatherer.java

@@ -69 +69 @@
     /** All of the external applications that must exit before we close the Gatherer. */
     public Vector apps = new Vector();
+    static public String open_collection_file_path = null;
     /** A public reference to the FileAssociationManager. */
     static public FileAssociationManager assoc_man;
@@ -310 +311 @@
         }
 
-        // If there was an open collection last session, reopen it.
-        if (open_collection == null) {
-        open_collection = Configuration.getString("general.open_collection", true);
-        }
-        if (!no_load && open_collection.length() > 0) {
-        c_man.loadCollection(open_collection);
+        open_collection_file_path = open_collection;
+        if (open_collection_file_path == null) {
+        open_collection_file_path = Configuration.getString("general.open_collection", true);
+        }
+        if (no_load || open_collection_file_path.equals("")) {
+        open_collection_file_path = null;
         }
     }

trunk/gli/src/org/greenstone/gatherer/GathererApplet.java

@@ -171 +171 @@
                     go.servlet_path, go.wget_version_str, go.wget_path);
 
-
     JButton bttn = new JButton("Launch Greenstone Librarian Interface ...");
     bttn.addActionListener(this);
@@ -204 +203 @@
 
     gatherer.run(size, splash, g_man);
+
+    // If there was an open collection last session, reopen it.
+    if (Gatherer.open_collection_file_path != null) {
+        Gatherer.c_man.loadCollection(Gatherer.open_collection_file_path);
+    }
     }
 

trunk/gli/src/org/greenstone/gatherer/GathererProg.java

@@ -95 +95 @@
                  go.servlet_path, go.wget_version_str, go.wget_path);
     gatherer.run(size,splash,g_man);
+
+    // If there was an open collection last session, reopen it.
+    if (Gatherer.open_collection_file_path != null) {
+        Gatherer.c_man.loadCollection(Gatherer.open_collection_file_path);
+    }
     }
 }

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

@@ -53 +53 @@
 import org.greenstone.gatherer.cdm.CollectionMetaManager;
 import org.greenstone.gatherer.cdm.CommandTokenizer;
+import org.greenstone.gatherer.gui.ExternalCollectionPrompt;
 import org.greenstone.gatherer.gui.LockFileDialog;
+import org.greenstone.gatherer.gui.ModalProgressPopup;
 import org.greenstone.gatherer.gui.NewCollectionMetadataPrompt;
-import org.greenstone.gatherer.gui.ExternalCollectionPrompt;
 import org.greenstone.gatherer.gui.WarningDialog;
 import org.greenstone.gatherer.metadata.DocXMLFileManager;
@@ -317 +318 @@
         collect_dir.mkdirs();
         }
-        // Create a progress monitor.
-        ProgressMonitor progress = new ProgressMonitor(Gatherer.g_man, Dictionary.get("CollectionManager.Creating_New"), "mkcol.pl", 0, 7);
+
+        // Create a progress monitor
+        ProgressMonitor progress = new ProgressMonitor(Gatherer.g_man, Dictionary.get("CollectionManager.Creating_New"), "mkcol.pl", 0, 4);
+
         // Create the new collection.
         makeCollection(description, email, name, title);
+        progress.setProgress(1);
         
         // *******************
@@ -337 +341 @@
         return;
         }
-        progress.setProgress(1);
         
         // ACTIVE_DIR/log/
@@ -343 +346 @@
         File log_dir = log_dir_temp.getParentFile();
         log_dir.mkdirs();
-        if(progress != null) {
-        progress.setNote(Dictionary.get("CollectionManager.Log_Created"));
-        }
+        progress.setNote(Dictionary.get("CollectionManager.Log_Created"));
 
         // Make sure an import folder exists
@@ -369 +370 @@
         ProfileXMLFileManager.loadProfileXMLFile(new File(collection_dir, Utility.META_DIR));
 
-        // Before we create the CollectionDesignManager we have to check if we are basing it upon some other collection.
+        // Before creating the CollectionDesignManager check if we are basing it upon some other collection
         if (base_collection_directory != null) {
         DebugStream.println("Basing new collection on existing one: " + base_collection_directory);
@@ -460 +461 @@
         out = null;
 
-        progress.setProgress(7);
+        progress.setProgress(4);
         progress.setNote(Dictionary.get("CollectionManager.Session_Ready", name));
         progress.close();
@@ -809 +810 @@
     }
 
+
+    public void loadCollection(String collection_file_path)
+    {
+    ModalProgressPopup load_collection_progress_popup = new ModalProgressPopup(Dictionary.get("CollectionManager.Loading_Collection"));
+    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!
+    }
+
+
+    private class LoadCollectionTask
+    extends Thread
+    {
+    private String collection_file_path = null;
+    private ModalProgressPopup load_collection_progress_popup = null;
+
+    public LoadCollectionTask(String collection_file_path, ModalProgressPopup load_collection_progress_popup)
+    {
+        this.collection_file_path = collection_file_path;
+        this.load_collection_progress_popup = load_collection_progress_popup;
+    }
+
+    public void run()
+    {
+        loadCollectionInternal(collection_file_path);
+        load_collection_progress_popup.setVisible(false);
+    }
+    }
+
+
     /** Attempts to load the given collection. Currently uses simple serialization of the collection class.
      * @param location The path to the collection as a <strong>String</strong>.
@@ -816 +847 @@
      * @see org.greenstone.gatherer.util.Utility
      */
-    public boolean loadCollection(String location)
+    private void loadCollectionInternal(String location)
     {
     DebugStream.println("Loading collection " + location + "...");
-    boolean non_gatherer_collection = false;
+    boolean non_gli_collection = false;
 
     // Check we have actually been given a .col file.
@@ -825 +856 @@
         JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CollectionManager.Not_Col_File", location), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
         DebugStream.println("CollectionManager.loadCollection: Haven't been given a .col file.");
-        return false;
+        return;
     }
 
@@ -835 +866 @@
         // we cant open this
         collection_directory = null;
-        return false;
+        return;
     }
     File collection_config_file = new File(collection_directory, Utility.CONFIG_FILE);
@@ -842 +873 @@
         collection_directory = null;
         collection_config_file = null;
-        return false;
+        return;
     }
 
@@ -849 +880 @@
     if (!collection_metadata_directory.exists()) {
         DebugStream.println("Loading non-gatherer collection...");
-        non_gatherer_collection = true;
+        non_gli_collection = true;
     }
 
@@ -866 +897 @@
         collection_directory = null;
         collection_config_file = null;
-        return false;
+        return;
         }
 
@@ -872 +903 @@
     }
 
-    boolean result = false;
     try {
         // Create a lock file.
@@ -885 +915 @@
         JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CollectionManager.Cannot_Open_With_Reason", args), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
         args = null;
-        return false;
+        return;
         }
 
@@ -905 +935 @@
  
         // If this is a non-GLI (legacy) collection, ask the user to choose some metadata sets
-        if (non_gatherer_collection) {
+        if (non_gli_collection) {
         if (!addSomeMetadataSets(collection_directory)) {
             lock_file = null;
             collection_directory = null;
             closeCollection();
-            return false;
+            return;
         }
 
@@ -928 +958 @@
 
         collection.cdm = new CollectionDesignManager(collection_config_file);
-        if (non_gatherer_collection) {
+        if (non_gli_collection) {
         // Change the classifiers to use the namespaced element names
         LegacyCollectionImporter.updateClassifiers(collection.cdm);
         }
 
-        // Tell everyone that it worked.
+        // We're done. Let everyone know.
         DebugStream.println(Dictionary.get("CollectionManager.Loading_Successful", name));
-
-        // We're done. Let everyone know.
         Gatherer.refresh(Gatherer.COLLECTION_OPENED);
-        result = true;
     }
     catch (Exception error) {
@@ -957 +984 @@
     collection_directory = null;
     collection_config_file = null;
-
-    return result;
     }