Changeset 5157

Timestamp:

2003-08-18T14:00:55+12:00 (21 years ago)

Author:

jmt12

Message:

Fix 203B008

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• collection/DeleteCollectionPrompt.java (modified) (5 diffs)
• gui/CollectionPane.java (modified) (2 diffs)
• gui/GUIManager.java (modified) (5 diffs)
• gui/MirrorPane.java (modified) (1 diff)

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

@@ -43 +43 @@
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.collection.Collection;
+import org.greenstone.gatherer.collection.CollectionManager;
 import org.greenstone.gatherer.gui.ModalDialog;
 import org.greenstone.gatherer.gui.SimpleMenuBar;
 import org.greenstone.gatherer.util.ArrayTools;
 import org.greenstone.gatherer.util.GSDLSiteConfig;
+import org.greenstone.gatherer.util.StaticStrings;
 import org.greenstone.gatherer.util.Utility;
 /** This class provides the functionality to delete current collections from the GSDLHOME/collect/ directory. The user chooses the collection from a list, where each entry also displays details about itself, confirms the delete of a collection by checking a checkbox then presses the ok button to actually delete the collection.
@@ -117 +119 @@
     /** Destructor. */
     public void destroy() {
+    list_model.clear();
+    list_model = null;
     close_button = null;
     confirmation = null;
     details = null;
     details_label = null;
-    list_model.clear();
-    list_model = null;
     list = null;
     ok_button = null;
@@ -216 +218 @@
         ArrayTools.sort(collections);
         for(int i = 0; collections != null && i < collections.length; i++) {
-        File config_file = Utility.findConfigFile(collections[i]);
-        if (config_file != null) {
-            CollectionConfiguration config = new CollectionConfiguration(config_file);
-            if (config != null) {
-            CollectionEntry col = new CollectionEntry(collections[i].getName(), config);
-            list_model.addElement(col);
-            }    
+        if(!collections[i].getName().equals(StaticStrings.MODEL_COLLECTION_NAME)) {
+            File config_file = Utility.findConfigFile(collections[i]);
+            if (config_file != null) {
+            CollectionConfiguration config = new CollectionConfiguration(config_file);
+            if (config != null) {
+                CollectionEntry col = new CollectionEntry(collections[i].getName(), config);
+                list_model.addElement(col);
+            }    
+            }
         }
         }
@@ -235 +239 @@
             */
     public void actionPerformed(ActionEvent event) {
+        // Ask the collection manager to refresh the 'Greenstone Collections' folder
+        Gatherer.c_man.refreshGreenstoneCollections();
+        // Done
         prompt.dispose();
     }
@@ -243 +250 @@
     implements ListSelectionListener {
     /** Any implementation of ListSelectionListener must include this method so we can be informed when the list selection changes.
-     * @param event A <strong>ListSelectionEvent</strong> containing all the relevant information garnered from the event itself.
-            */
+     * @param  event a <strong>ListSelectionEvent</strong> containing all the relevant information garnered from the event itself
+     */
     public void valueChanged(ListSelectionEvent event) {
+        ok_button.setEnabled(false);
+        confirmation.setSelected(false);
         if(!list.isSelectionEmpty()) {
         confirmation.setEnabled(true);

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

@@ -239 +239 @@
     collection_tree_sync.add(collection_tree);
 
-    workspace = Gatherer.c_man.getWorkspace();
-    workspace_tree.setModel(workspace);
-    workspace_tree_sync.add(workspace_tree);
+    refreshWorkspace();
 
     // Enable or disable the control buttons
@@ -491 +489 @@
     public void refreshTrees() {
     collection_tree.refresh(null);
+    workspace_tree.refresh(null);
+    }
+
+    public void refreshWorkspace() {
+    workspace = Gatherer.c_man.getWorkspace();
+    workspace_tree.setModel(workspace);
+    workspace_tree_sync.add(workspace_tree);
     }
 

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

@@ -47 +47 @@
 import javax.swing.plaf.*;
 import javax.swing.text.*;
+import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.collection.Collection;
@@ -177 +178 @@
     else if(esrc == menu_bar.file_delete) {
         DeleteCollectionPrompt dcp = new DeleteCollectionPrompt();
-        dcp.display();
+        if(dcp.display()) {
+        Gatherer.c_man.closeCollection();
+        }
         dcp.destroy();
         dcp = null;
@@ -544 +547 @@
     // Of course we may not have this tab available.
     if(index != -1) {
-                // Some tabs are also dependant on if a collection is ready
+        // Some tabs are also dependant on if a collection is ready
         Component component = tab_pane.getComponentAt(index);
         if(component == preview_pane) {
@@ -569 +572 @@
         }
         }
+    }
+    // If the rawname was mirror then rebuild workspace tree to remove caches.
+    if(rawname.equals("Mirroring")) {
+        collection_pane.refreshWorkspace();
     }
     }
@@ -683 +690 @@
         Gatherer.c_man.createCollection(ncd_prompt.getDescription(), ncd_prompt.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
+        Gatherer.config.set("general.view_extracted_metadata", Configuration.COLLECTION_SPECIFIC, ncd_prompt.viewExtractedMetadata()); 
+
         ncd_prompt.dispose();
         ncd_prompt = null;

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

@@ -347 +347 @@
     }
 
+    public void refreshTrees() {
+    workspace_tree.refresh(null);
+    }
+
     public void setURL(String url) {
     source_url.setText(url);