Changeset 8787

Timestamp:

2004-12-13T14:50:39+13:00 (19 years ago)

Author:

mdewsnip

Message:

Fixed up some of the new file tree code for Windows.

Location:

trunk/gli/src/org/greenstone/gatherer/file

Files:

• FileNode.java (modified) (2 diffs)
• FileSystem.java (modified) (4 diffs)
• WorkspaceTreeModel.java (modified) (1 diff)
• WorkspaceTreeNode.java (modified) (3 diffs)

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

@@ -157 +157 @@
 
 
+    public void add(MutableTreeNode child)
+    {
+    insert(child, child_nodes.size());
+    }
+
+
     protected abstract FileNode addChildNode(File file);
 
@@ -208 +214 @@
     }
     return path;
-    }
-
-
-    public void insert(MutableTreeNode child) {
-    insert(child, child_nodes.size());
     }
 

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

@@ -2 +2 @@
 
 import java.io.File;
-import javax.swing.filechooser.FileSystemView;
 import org.greenstone.gatherer.DebugStream;
 import org.greenstone.gatherer.Dictionary;
@@ -13 +12 @@
     static public WorkspaceTreeNode getLocalFilespaceNode(FileSystemModel model)
     {
-    WorkspaceTreeNode file_system_root = null;
-
     // Get all the available roots mounted on the filesystem
     File[] roots = File.listRoots();
@@ -21 +18 @@
     }
 
-    // If there is just one root use it as the tree root (Linux)
+    // If there is just one root use it as the tree root (Unix)
     if (roots.length == 1) {
-        file_system_root = new WorkspaceTreeNode(roots[0], Dictionary.get("Tree.Root"));
+        return new WorkspaceTreeNode(roots[0], Dictionary.get("Tree.Root"));
     }
 
-    // Otherwise build a dummy node which has the roots as children
+    // Otherwise build a dummy node which has the roots as children (Windows)
     else {
-        file_system_root = new WorkspaceTreeNode(null, Dictionary.get("Tree.Root"));
-        file_system_root.setModel(model);
-
-        // Sort the roots into alphabetical order
-        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])) {
-            file_system_root.insert(new WorkspaceTreeNode(roots[i]));
-        }
-        }
+        return new WorkspaceTreeNode(null, Dictionary.get("Tree.Root"));
     }
-
-    return file_system_root;
     }
 
@@ -74 +59 @@
     static public WorkspaceTreeNode getDownloadedFilesNode()
     {
-    return new WorkspaceTreeNode(Utility.getCacheDir(), "Downloaded Files");
+    // Return a mapping to the downloaded files folder
+    return new WorkspaceTreeNode(Utility.getCacheDir(), Dictionary.get("Tree.DownloadedFiles"));
     }
 }

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

@@ -78 +78 @@
     // Add the "Documents in Greenstone Collections" node
     greenstone_collections_node = new WorkspaceTreeNode(null, Dictionary.get("Tree.World"));
-    workspace_tree_root.insert(greenstone_collections_node);
+    workspace_tree_root.add(greenstone_collections_node);
 
     // Add the "Local Filespace" node
     local_filespace_node = FileSystem.getLocalFilespaceNode(workspace_tree_model);
-    workspace_tree_root.insert(local_filespace_node);
+    workspace_tree_root.add(local_filespace_node);
 
     // Add the "Home Folder" node
-    workspace_tree_root.insert(FileSystem.getHomeFolderNode());
+    workspace_tree_root.add(FileSystem.getHomeFolderNode());
 
     // Add the "Downloaded Files" node, if Mirroring is enabled
     if (Gatherer.g_man.mirror_pane != null) {
         downloaded_files_node = FileSystem.getDownloadedFilesNode();
-        workspace_tree_root.insert(downloaded_files_node);
+        workspace_tree_root.add(downloaded_files_node);
     }
 

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

@@ -30 +30 @@
 import java.io.*;
 import java.util.*;
+import javax.swing.filechooser.FileSystemView;
 import org.greenstone.gatherer.Configuration;
 import org.greenstone.gatherer.Dictionary;
@@ -96 +97 @@
     public void map()
     {
-    // Special Case: if the name of this node is the Tree.World string, then we actually map the collections installed in greenstone. The file in this case will actually be the collect directory of greenstone.
+    // 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
@@ -160 +161 @@
     }
 
+    // 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]));
+        }
+        }
+    }
+
     // General case
     else {