Changeset 7633

Timestamp:

2004-06-23T14:35:58+12:00 (20 years ago)

Author:

mdewsnip

Message:

Some function and variable name changes, and added the web cache/downloaded files mapping back in.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• file/FileSystem.java (modified) (3 diffs)
• file/WorkspaceTreeModel.java (modified) (4 diffs)
• gui/tree/WorkspaceTree.java (modified) (1 diff)

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

@@ -7 +7 @@
 import org.greenstone.gatherer.file.FileNode;
 import org.greenstone.gatherer.util.ArrayTools;
+import org.greenstone.gatherer.util.Utility;
 
 
 public class FileSystem
 {
-    static public FileNode getLocalFileSystem(FileSystemModel model)
-    // static public FileNode getLocalFileSystem()
+    static public FileNode getLocalFilespaceNode(FileSystemModel model)
     {
     FileNode file_system_root = null;
@@ -46 +46 @@
 
 
-    static public FileNode getUserHomeMapping()
+    static public FileNode getHomeFolderNode()
     {
     // Get the name of the OS we're running on
@@ -69 +69 @@
     // Generate a special mapping to the user home folder
     File home_folder = new File(home_folder_str);
-    String[] args = new String[1];
-    args[0] = home_folder.getName();
-    return new FileNode(home_folder, Dictionary.get("Tree.Home", args));
+    return new FileNode(home_folder, Dictionary.get("Tree.Home", home_folder.getName()));
+    }
+
+
+    static public FileNode getDownloadedFilesNode()
+    {
+    return new FileNode(Utility.getCacheDir(), "Downloaded Files");
     }
 }

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

@@ -15 +15 @@
     static private WorkspaceTreeModel workspace_tree_model = null;
 
-    static private FileNode greenstone_collections_mapping = null;
-    static private FileNode local_filespace_mapping = null;
-    // static private FileNode web_cache_mapping = null;
+    static private FileNode greenstone_collections_node = null;
+    static private FileNode local_filespace_node = null;
+    static private FileNode downloaded_files_node = null;
     static private FileNode[] folder_shortcuts = null;
 
@@ -33 +33 @@
     workspace_tree_model = new WorkspaceTreeModel(workspace_tree_root);
 
-    // Add the Greenstone Collections mapping
-    greenstone_collections_mapping = CollectionManager.getGreenstoneCollectionsMapping();
-    workspace_tree_root.insert(greenstone_collections_mapping);
+    // Add the "Documents in Greenstone Collections" node
+    greenstone_collections_node = CollectionManager.getGreenstoneCollectionsMapping();
+    workspace_tree_root.insert(greenstone_collections_node);
 
-    // Add the local filespace
-    local_filespace_mapping = FileSystem.getLocalFileSystem(workspace_tree_model);
-    workspace_tree_root.insert(local_filespace_mapping);
+    // Add the "Local Filespace" node
+    local_filespace_node = FileSystem.getLocalFilespaceNode(workspace_tree_model);
+    workspace_tree_root.insert(local_filespace_node);
 
-    // Add a mapping to the user home folder
-    workspace_tree_root.insert(FileSystem.getUserHomeMapping());
+    // Add the "Home Folder" node
+    workspace_tree_root.insert(FileSystem.getHomeFolderNode());
 
-    // Add public and private web caches if applicable
-    // loadWebCacheMappings();
+    // 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);
+    }
 
     // Add any folder shortcuts the user has created
@@ -54 +57 @@
 
 
-    static public void refreshGreenstoneCollectionsMapping()
+    static public void refreshGreenstoneCollectionsNode()
     {
-    greenstone_collections_mapping.refresh();
+    greenstone_collections_node.refresh();
     }
 
@@ -105 +108 @@
 
     // Refresh the local filespace tree specially (it is not unmapped so not refreshed)
-    for (int i = 0; i < local_filespace_mapping.getChildCount(); i++) {
-        FileNode child_node = (FileNode) local_filespace_mapping.getChildAt(i);
+    for (int i = 0; i < local_filespace_node.getChildCount(); i++) {
+        FileNode child_node = (FileNode) local_filespace_node.getChildAt(i);
         super.refresh(new TreePath(child_node.getPath()));
     }

trunk/gli/src/org/greenstone/gatherer/gui/tree/WorkspaceTree.java

@@ -50 +50 @@
         String collect_directory_str = Gatherer.config.gsdl_path + Utility.COL_DIR;
         refreshEveryNodeShowingFolder(collect_directory_str);
-        WorkspaceTreeModel.refreshGreenstoneCollectionsMapping();
+        WorkspaceTreeModel.refreshGreenstoneCollectionsNode();
     }