Changeset 5869

Timestamp:

2003-11-18T14:10:45+13:00 (20 years ago)

Author:

mdewsnip

Message:

More improvements to workspace tree refreshing... still not perfect though.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

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

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

@@ -3 +3 @@
 import org.greenstone.gatherer.collection.CollectionManager;
 import org.greenstone.gatherer.file.FileNode;
+import org.greenstone.gatherer.gui.MirrorPane;
 import org.greenstone.gatherer.util.SynchronizedTreeModelTools;
 
@@ -12 +13 @@
     static private WorkspaceTreeModel workspace_tree_model = null;
     static private FileNode greenstone_collections_mapping = null;
+    static private FileNode public_web_cache_mapping = null;
+    static private FileNode private_web_cache_mapping = null;
     static private FileNode[] collection_specific_mappings = null;
 
@@ -37 +40 @@
     workspace_tree_root.insert(FileSystem.getUserHomeMapping());
 
-    // If mirroring is enabled show the public and private caches
-//      if (Gatherer.config.get("workflow.mirror", false)) {
-//          // Add Public workspace
-//          FileNode public_root = new FileNode(new File(Utility.CACHE_DIR), Dictionary.get("Tree.Public"));
-//          workspace_root.insert(public_root);
-//          // Add Private workspace if a collection has been loaded.
-//          if(ready()) {
-//          FileNode private_root = new FileNode(new File(getCollectionCache()), Dictionary.get("Tree.Private"));
-//          workspace_root.insert(private_root);
-//          }
-//      }
+    // Add public and private web caches if applicable
+    loadWebCacheMappings();
 
     // Add any collection specific mappings
+    loadCollectionSpecificMappings();
+
+    return workspace_tree_model;
+    }
+
+
+    static private void loadWebCacheMappings()
+    {
+    // If mirroring is enabled show the public and private caches
+    public_web_cache_mapping = MirrorPane.getPublicWebCacheMapping();
+    if (public_web_cache_mapping != null) {
+        workspace_tree_root.insert(public_web_cache_mapping);
+    }
+    private_web_cache_mapping = MirrorPane.getPrivateWebCacheMapping();
+    if (private_web_cache_mapping != null) {
+        workspace_tree_root.insert(private_web_cache_mapping);
+    }
+    }
+
+
+    static private void loadCollectionSpecificMappings()
+    {
+    // Add the current collection specific mappings
     collection_specific_mappings = CollectionManager.getCollectionSpecificMappings();
     if (collection_specific_mappings != null) {
@@ -58 +75 @@
         }
     }
-
-    return workspace_tree_model;
     }
 
 
+    // !! NEEDS WORK !!
     static public void refreshGreenstoneCollectionsMapping()
     {
+    ((FileSystemModel) workspace_tree_model).refresh(
     greenstone_collections_mapping.unmap();
     greenstone_collections_mapping.map();
@@ -70 +87 @@
 
 
+    // !! NEEDS WORK !!
+    static public void refreshWebCacheMappings()
+    {
+    if (public_web_cache_mapping != null) {
+        SynchronizedTreeModelTools.removeNodeFromParent(workspace_tree_model,
+                                public_web_cache_mapping);
+    }
+    if (private_web_cache_mapping != null) {
+        SynchronizedTreeModelTools.removeNodeFromParent(workspace_tree_model,
+                                private_web_cache_mapping);
+    }
+
+    loadWebCacheMappings();
+    }
+
+
+    // !! NEEDS WORK !!
     static public void refreshCollectionSpecificMappings()
     {
@@ -80 +114 @@
     }
 
-    // Add the current collection specific mappings
-    collection_specific_mappings = CollectionManager.getCollectionSpecificMappings();
-    if (collection_specific_mappings != null) {
-        for (int i = 0; i < collection_specific_mappings.length; i++) {
-        SynchronizedTreeModelTools.insertNodeInto(workspace_tree_model,
-                              workspace_tree_root,
-                              collection_specific_mappings[i]);
-        }
-    }
+    loadCollectionSpecificMappings();
     }
 }

trunk/gli/src/org/greenstone/gatherer/gui/MirrorPane.java

@@ -39 +39 @@
 import java.awt.*;
 import java.awt.event.*;
+import java.io.File;
 import java.net.*;
 import javax.swing.*;
@@ -47 +48 @@
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.WGet;
+import org.greenstone.gatherer.file.FileNode;
 import org.greenstone.gatherer.util.Utility;
 
@@ -193 +195 @@
     }
 
+
+    static public FileNode getPublicWebCacheMapping()
+    {
+    if (Gatherer.config.get("workflow.mirror", false)) {
+        return new FileNode(new File(Utility.CACHE_DIR), Dictionary.get("Tree.Public"));
+    }
+
+    return null;
+    }
+
+
+    static public FileNode getPrivateWebCacheMapping()
+    {
+    if (Gatherer.config.get("workflow.mirror", false) && Gatherer.c_man.ready()) {
+        return new FileNode(new File(Gatherer.c_man.getCollectionCache()), Dictionary.get("Tree.Private"));
+    }
+
+    return null;
+    }
+
+
     private class DownloadButtonListener
     implements ActionListener {

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

@@ -55 +55 @@
     if (refresh_reason == WorkspaceTree.MAPPED_DIRECTORIES_CHANGED) {
         System.err.println("Reason: mapped directories changed.");
+        WorkspaceTreeModel.refreshWebCacheMappings();
         WorkspaceTreeModel.refreshCollectionSpecificMappings();
+        updateUI();
     }
     }