Changeset 12739

Timestamp:

2006-09-14T12:46:05+12:00 (18 years ago)

Author:

mdewsnip

Message:

Changed the "creating collection" progress dialog to be consistent with the "loading collection" dialog.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• collection/CollectionManager.java (modified) (7 diffs)
• gui/GUIManager.java (modified) (1 diff)

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

@@ -332 +332 @@
     public void createCollection(String description, String email, String name, String title, File base_collection_directory, ArrayList metadata_sets)
     {
+    // Display a modal progress popup to indicate that the collection is being loaded
+    ModalProgressPopup create_collection_progress_popup = new ModalProgressPopup(Dictionary.get("CollectionManager.Creating_Collection"), Dictionary.get("CollectionManager.Creating_Collection_Please_Wait"));
+    create_collection_progress_popup.display();
+
+    // Create the collection on a separate thread so the progress bar updates correctly
+    (new CreateCollectionTask(description, email, name, title, base_collection_directory, metadata_sets, create_collection_progress_popup)).start();
+    }
+
+
+    private class CreateCollectionTask
+    extends Thread
+    {
+    private String description = null;
+    private String email = null;
+    private String name = null;
+    private String title = null;
+    private File base_collection_directory = null;
+    private ArrayList metadata_sets = null;
+    private ModalProgressPopup create_collection_progress_popup = null;
+
+    public CreateCollectionTask(String description, String email, String name, String title, File base_collection_directory, ArrayList metadata_sets, ModalProgressPopup create_collection_progress_popup)
+    {
+        this.description = description;
+        this.email = email;
+        this.name = name;
+        this.title = title;
+        this.base_collection_directory = base_collection_directory;
+        this.metadata_sets = metadata_sets;
+        this.create_collection_progress_popup = create_collection_progress_popup;
+    }
+
+    public void run()
+    {
+        createCollectionInternal(description, email, name, title, base_collection_directory, metadata_sets);
+        create_collection_progress_popup.close();
+    }
+    }
+
+
+    private void createCollectionInternal(String description, String email, String name, String title, File base_collection_directory, ArrayList metadata_sets)
+    {
     try {
         // first make sure that the collect directory exists
@@ -339 +380 @@
         }
 
-        // 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(name, email);
-        progress.setProgress(1);
 
         // Check that the collection has been created successfully
@@ -351 +388 @@
         // If there is no collection directory then the creation was unsuccessful, or cancelled
         System.err.println("No collection directory...");
-        progress.close();
         return;
         }
@@ -360 +396 @@
         System.err.println("Error: no collect.cfg file has been created!");
         JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CollectionManager.Cannot_Create_Collection_With_Reason", Dictionary.get("CollectionManager.No_Config_File")), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE); 
-        progress.close();
         return;
         }
@@ -367 +402 @@
         File log_dir = new File(collection_directory_path + "log");
         log_dir.mkdirs();
-        progress.setNote(Dictionary.get("CollectionManager.Log_Created"));
 
         // Make sure an import folder exists
@@ -374 +408 @@
         import_directory.mkdirs();
         }
-
-        progress.setProgress(2);
 
         // Now create the collection object around the directory.
@@ -465 +497 @@
 
         collection.cdm.save(true);
-        progress.setProgress(3);
 
         // Create a lock file
         createLockFile(new File(collection_directory_path, LOCK_FILE));
 
-        progress.setProgress(4);
-        progress.setNote(Dictionary.get("CollectionManager.Session_Ready", name));
-        progress.close();
+        // We're done. Let everyone know.
+        Gatherer.refresh(Gatherer.COLLECTION_OPENED);
     }
     catch (Exception error) {

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

@@ -786 +786 @@
         Gatherer.c_man.createCollection(ncd_prompt.getDescription(), Configuration.getEmail(), ncd_prompt.getName(), ncd_prompt.getTitle(), ncd_prompt.getBase(), metadata_sets);
         ncd_prompt.dispose();
-
-        // Return to some initial pane (Gather)
-        returnToInitialPane();
-
-        // Refresh the workspace tree to allow for the new collection
-        refreshWorkspaceTree(WorkspaceTree.LIBRARY_CONTENTS_CHANGED);
-
-        // Refresh the rest of the GLI
-        Gatherer.refresh(Gatherer.COLLECTION_OPENED);
         }