Changeset 10587

Timestamp:

2005-08-31T12:47:34+12:00 (19 years ago)

Author:

mdewsnip

Message:

Merged showNewCollectionPrompt into NewCollectionTask, to make things easier for the West Yorkshire code.

File:

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

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

@@ -178 +178 @@
     }
         else if (esrc == menu_bar.file_new) {
-        showNewCollectionPrompt();
+        new NewCollectionTask().start();
     }
     else if (esrc == menu_bar.file_open) {
@@ -705 +705 @@
     wait(false);
     }
-    /** This method is used to open the new collection box on the screen.
-     */
-    private void showNewCollectionPrompt() {
-    NewCollectionMetadataPrompt ncm_prompt = null;
-    // Create the collection details prompt from new collection prompt
-    NewCollectionDetailsPrompt ncd_prompt = new NewCollectionDetailsPrompt();
-    // If no previous collection was indicated as a model design, then show the metadata selection prompt from new collection prompt
-    if(!ncd_prompt.isCancelled() && (ncd_prompt.getBase() == null)) {
-        ncm_prompt = new NewCollectionMetadataPrompt();
-    }
-    // Create the new collection (if not cancelled) in a new thread.
-    if (!ncd_prompt.isCancelled() && (ncm_prompt == null || !ncm_prompt.isCancelled())) {
-        // If there is already a collection open, save and close it.
-        if (Gatherer.c_man.ready()) {
-        saveThenCloseCurrentCollection();
-        }
-
-        // Create new collection.
-        NewCollectionTask new_collection_task = new NewCollectionTask(ncd_prompt, ncm_prompt);
-        new_collection_task.start();
-    }
-    // Done
-    ncd_prompt = null;
-    ncm_prompt = null;
-    }
 
 
     private class NewCollectionTask
-        extends Thread
-    {
-    private NewCollectionDetailsPrompt ncd_prompt = null;
-    private NewCollectionMetadataPrompt ncm_prompt = null;
-
-    public NewCollectionTask(NewCollectionDetailsPrompt ncd_prompt, NewCollectionMetadataPrompt ncm_prompt)
-    {
-        this.ncd_prompt = ncd_prompt;
-        this.ncm_prompt = ncm_prompt;
-    }
-
+    extends Thread
+    {
     public void run()
     {
-        if (ncm_prompt == null) {
-        Gatherer.c_man.createCollection(ncd_prompt.getDescription(), Configuration.getEmail(), ncd_prompt.getName(), ncd_prompt.getTitle(), ncd_prompt.getBase(), null);
-        }
-        else {
-        Gatherer.c_man.createCollection(ncd_prompt.getDescription(), Configuration.getEmail(), ncd_prompt.getName(), ncd_prompt.getTitle(), null, ncm_prompt.getSets());
-        ncm_prompt.dispose();
-        ncm_prompt = null;
-        }
-
-        ncd_prompt.dispose();
+        NewCollectionMetadataPrompt ncm_prompt = null;
+        // Create the collection details prompt from new collection prompt
+        NewCollectionDetailsPrompt ncd_prompt = new NewCollectionDetailsPrompt();
+        // If no previous collection was indicated as a model design, then show the metadata selection prompt from new collection prompt
+        if(!ncd_prompt.isCancelled() && (ncd_prompt.getBase() == null)) {
+        ncm_prompt = new NewCollectionMetadataPrompt();
+        }
+        // Create the new collection (if not cancelled) in a new thread.
+        if (!ncd_prompt.isCancelled() && (ncm_prompt == null || !ncm_prompt.isCancelled())) {
+        // If there is already a collection open, save and close it.
+        if (Gatherer.c_man.ready()) {
+            saveThenCloseCurrentCollection();
+        }
+
+        // Create new collection.
+        if (ncm_prompt == null) {
+            Gatherer.c_man.createCollection(ncd_prompt.getDescription(), Configuration.getEmail(), ncd_prompt.getName(), ncd_prompt.getTitle(), ncd_prompt.getBase(), null);
+        }
+        else {
+            Gatherer.c_man.createCollection(ncd_prompt.getDescription(), Configuration.getEmail(), ncd_prompt.getName(), ncd_prompt.getTitle(), null, ncm_prompt.getSets());
+            ncm_prompt.dispose();
+        }
+
+        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);
+        }
+
+        // Done
         ncd_prompt = null;
-
-        // 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);
+        ncm_prompt = null;
     }
     }