Changeset 6086 for trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java

Timestamp:

2003-12-02T17:15:47+13:00 (20 years ago)

Author:

jmt12

Message:

Moved the special folder 'shortcuts' from collection based to shared for the installation of gli. This caused some added fun when it turned out one of the workspace tree refreshes was blocking the AWTEvent thread, despite me putting tests in place to stop that from happening. It had never reared its ugly head before, as there were never any shortcut collections being mapped when a collection had been closed, or when GLI was exiting before.

File:

• trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java (modified) (4 diffs)

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

@@ -139 +139 @@
      */
     public void addDirectoryMapping(String name, File file) {
-    if(ready()) {
-        // Update the information stored in the collection
-        collection.addDirectoryMapping(name, file);
-        // Now update the tree
-        Gatherer.g_man.collection_pane.refreshWorkspaceTree(WorkspaceTree.MAPPED_DIRECTORIES_CHANGED);
-    }
+    // Update the information stored in the Gatherer config
+    Gatherer.config.addDirectoryMapping(name, file);
+    // Now update the tree
+    Gatherer.g_man.collection_pane.refreshWorkspaceTree(WorkspaceTree.MAPPED_DIRECTORIES_CHANGED);
     }
     /** This method calls the builcol.pl scripts via a GShell so as to not lock up the processor.
@@ -667 +665 @@
     static public FileNode[] getCollectionSpecificMappings()
     {
-    if (!ready()) {
-        return null;
-    }
-
     // Return any predefined special directories
-    HashMap mappings = collection.getDirectoryMappings();
+    HashMap mappings = Gatherer.config.getDirectoryMappings();
     FileNode[] mapping_nodes = new FileNode[mappings.size()];
     Iterator mappings_iterator = mappings.keySet().iterator();
@@ -680 +674 @@
         mapping_nodes[i] = new FileNode(mapping_file, mapping_name);
     }
-
     return mapping_nodes;
     }
@@ -1136 +1129 @@
      */
     public File removeDirectoryMapping(FileNode target) {
-    File file = null;
-    if(ready()) {
-        // Remove from collection, remembering file
-        file = collection.removeDirectoryMapping(target.toString());
-        // Update tree.
-        Gatherer.g_man.collection_pane.refreshWorkspaceTree(WorkspaceTree.MAPPED_DIRECTORIES_CHANGED);
-    }
+    // Remove from config, remembering file
+    File file = Gatherer.config.removeDirectoryMapping(target.toString());
+    // Update tree.
+    Gatherer.g_man.collection_pane.refreshWorkspaceTree(WorkspaceTree.MAPPED_DIRECTORIES_CHANGED);
     return file;
     }