Changeset 4390

Timestamp:

2003-05-28T13:44:50+12:00 (21 years ago)

Author:

jmt12

Message:

Changed getWorkspace a tiny bit.

File:

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

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

@@ -546 +546 @@
     public TreeModel getRecordSet() {
     if(collection_model == null && collection != null) {
-                // Check if the gimport directory exists, and if so use it.
+        // Check if the gimport directory exists, and if so use it.
         File gimport_directory = new File(getCollectionImport());
         if(gimport_directory.exists()) {
@@ -558 +558 @@
         collection_model = new FileSystemModel(new FileNode(new File(getCollectionOldImport()), false));
         }
-                // Ensure that the manager is a change listener for the tree.
+        // Ensure that the manager is a change listener for the tree.
         if(fm_tree_model_listener == null) {
         fm_tree_model_listener = new FMTreeModelListener();
@@ -570 +570 @@
     if(workspace_model != null) {
         return workspace_model;
+    }
+    // Determine the local collection directory if any
+    String current_collection_directory = null;
+    if(collection != null) {
+        current_collection_directory = Utility.getCollectionDir(Gatherer.config.gsdl_path) + collection.getName();
     }
     // Create the workspace tree.
@@ -584 +589 @@
     // We add their import and gimport directories, but only if its not our current collection.
     for(int i = 0; cols != null && i < cols.length; i++) {
-        if(collection == null || !(Utility.getCollectionDir(Gatherer.config.gsdl_path) + collection.getName()).equals(cols[i].getAbsolutePath())) {
+        if(collection == null || !current_collection_directory.equals(cols[i].getAbsolutePath())) {
         File dirs[] = cols[i].listFiles();
         ArrayTools.sort(dirs);
@@ -610 +615 @@
         workspace_root.insert(file_root);
         }
-                // Otherwise build a dummy node which has these nodes as
-                // children.
+        // Otherwise build a dummy node which has these nodes as children.
         else {
         file_root = new FileNode(name);