Changeset 9017 for trunk/gli

Timestamp:

2005-02-14T11:07:52+13:00 (19 years ago)

Author:

mdewsnip

Message:

Moved some GUI stuff out of CollectionManager and into GUIManager.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• collection/CollectionManager.java (modified) (3 diffs)
• collection/DeleteCollectionPrompt.java (modified) (2 diffs)
• gui/GUIManager.java (modified) (2 diffs)

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.file.WorkspaceTree;  // !!! Don't like this here
 import org.greenstone.gatherer.gui.LockFileDialog;
 import org.greenstone.gatherer.gui.NewCollectionMetadataPrompt;
@@ -469 +468 @@
         DebugStream.printStackTrace(error);
     }
-
-    // Done, so refresh interface
-    if (Gatherer.g_man != null) {
-        // Return to some initial pane (Gather)
-        Gatherer.g_man.returnToInitialPane();
-
-        // Refresh the workspace tree to allow for the new collection
-        Gatherer.g_man.refreshWorkspaceTree(WorkspaceTree.LIBRARY_CONTENTS_CHANGED);
-
-        Gatherer.refresh(Gatherer.COLLECTION_OPENED);
-    }
     }
 
@@ -519 +507 @@
     }
 
-    if (Utility.delete(collection_directory)) {
-        // Refresh the collections shown in the workspace tree
-        Gatherer.g_man.refreshWorkspaceTree(WorkspaceTree.LIBRARY_CONTENTS_CHANGED);
-        return true;
-    }
-
-    return false;
+    return Utility.delete(collection_directory);
     }
 

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

@@ -48 +48 @@
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.LocalLibraryServer;
+import org.greenstone.gatherer.file.WorkspaceTree;  // !!! Don't like this here
 import org.greenstone.gatherer.gui.GLIButton;
 import org.greenstone.gatherer.gui.ModalDialog;
@@ -348 +349 @@
 
         if (Gatherer.c_man.deleteCollection(collection.getShortName())) {
+        // Refresh the collections shown in the workspace tree
+        Gatherer.g_man.refreshWorkspaceTree(WorkspaceTree.LIBRARY_CONTENTS_CHANGED);
+
         if (Gatherer.c_man.getCollection() != null && collection.getShortName().equals(Gatherer.c_man.getCollection().getName())) {
             current_coll_deleted = true;

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

@@ -57 +57 @@
 import org.greenstone.gatherer.collection.ExportCollectionPrompt;
 import org.greenstone.gatherer.file.FileOpenActionListener;
+import org.greenstone.gatherer.file.WorkspaceTree;
 import org.greenstone.gatherer.gui.metaaudit.MetaAuditFrame;
 import org.greenstone.gatherer.gui.tree.DragTree;
@@ -695 +696 @@
     ncm_prompt = null;
     }
+
+
     private class CreationTask
-        extends Thread {
+        extends Thread
+    {
     private NewCollectionDetailsPrompt ncd_prompt = null;
     private NewCollectionMetadataPrompt ncm_prompt = null;
-    public CreationTask(NewCollectionDetailsPrompt ncd_prompt, NewCollectionMetadataPrompt ncm_prompt) {
+
+    public CreationTask(NewCollectionDetailsPrompt ncd_prompt, NewCollectionMetadataPrompt ncm_prompt)
+    {
         this.ncd_prompt = ncd_prompt;
         this.ncm_prompt = ncm_prompt;
     }
 
-    public void run() {
-        ///ystem.err.println("Running CreationTask...");
-        if(ncm_prompt == null) {
+    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());
-        }
-        // Now that the collection specific settings are loaded we can set the 'view extracted metadata' property
-        // do we want to have this in here???
-        //Configuration.set("general.view_extracted_metadata", Configuration.COLLECTION_SPECIFIC, true);
+        ncm_prompt.dispose();
+        ncm_prompt = null;
+        }
+
         ncd_prompt.dispose();
         ncd_prompt = null;
-        if(ncm_prompt != null) {
-        ncm_prompt.dispose();
-        ncm_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);
     }
     }