Changeset 9458

Timestamp:

2005-03-17T12:11:44+13:00 (19 years ago)

Author:

kjdon

Message:

fixed up the map function for GS3 - made it closer to what it used to be in FileNode.java back before Michael tidied it up :-) Now the site folders have some contents.

File:

• trunk/gli/src/org/greenstone/gatherer/file/WorkspaceTreeNode.java (modified) (4 diffs)

trunk/gli/src/org/greenstone/gatherer/file/WorkspaceTreeNode.java

@@ -98 +98 @@
     {
     // Special Case: "Documents in Greenstone Collections" -- map the collections installed in Greenstone
-    if (file == null && title.equals(Dictionary.get("Tree.World"))) {
-        // If this node has already been mapped, don't bother doing it again
+    if (file == null) { // a special mapping folder
         if (child_nodes != null) {
+        // don't bother mapping again if we already have children
         return;
         }
         child_nodes = new ArrayList();
-
-        if (Gatherer.GS3) {
+        if (title.equals(Dictionary.get("Tree.World")) && Gatherer.GS3) {
         // the Greenstone collections folder for GS3 - this contains a 
         // folder for each site
+
         File start = new File(Utility.getSitesDir(Configuration.gsdl3_path));
         File sites[] = start.listFiles();
@@ -119 +119 @@
             WorkspaceTreeNode child = new WorkspaceTreeNode(null, sites[i].getName());
             child.is_gs3_site_node = true;
+            child.unmap();
             child.setModel(model);
             child.setParent(this);
+            child.map();
             child_nodes.add(child);
         }
-        }
-        else {
+        model.nodeStructureChanged(this);
+        
+        } else if (title.equals(Dictionary.get("Tree.World")) || is_gs3_site_node) {
         // For each of the children directories, which are collections...
         File start;
@@ -159 +162 @@
         model.nodeStructureChanged(this);
         }
-    }
-
-    // Special Case: "Local Filespace" on Windows -- create a node for each filesystem root (drive letter)
-    else if (file == null && title.equals(Dictionary.get("Tree.Root"))) {
-        // If this node has already been mapped, don't bother doing it again
-        if (child_nodes != null) {
-        return;
-        }
-        child_nodes = new ArrayList();
-
-        // Sort the roots into alphabetical order
-        File[] roots = File.listRoots();
-        ArrayTools.sort(roots);
-        for (int i = 0; i < roots.length; i++) {
-        // Only add root if it isn't a floppy drive
-        if (!FileSystemView.getFileSystemView().isFloppyDrive(roots[i])) {
-            child_nodes.add(addChildNode(roots[i]));
+        else if (title.equals(Dictionary.get("Tree.Root"))) {
+        // Special Case: "Local Filespace" on Windows -- create a node for each filesystem root (drive letter)
+        
+        // Sort the roots into alphabetical order
+        File[] roots = File.listRoots();
+        ArrayTools.sort(roots);
+        for (int i = 0; i < roots.length; i++) {
+            // Only add root if it isn't a floppy drive
+            if (!FileSystemView.getFileSystemView().isFloppyDrive(roots[i])) {
+            child_nodes.add(addChildNode(roots[i]));
+            }
         }
         }
-    }
-
+    } // if file == null
+    
     // General case
     else {
@@ -195 +192 @@
     return super.toString();
     }
+
 }