Changeset 7484 for trunk/gli/src/org/greenstone/gatherer/file

Timestamp:

2004-05-28T13:41:13+12:00 (20 years ago)

Author:

mdewsnip

Message:

Many more improvements to the workspace and collection trees and their refreshing.

Location:

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

Files:

• FileManager.java (modified) (1 diff)
• WorkspaceTreeModel.java (modified) (6 diffs)

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

@@ -131 +131 @@
         FileNode folder_node = new FileNode(folder_file);
         SynchronizedTreeModelTools.insertNodeInto(model, parent_node, folder_node);
+
+        // Refresh workspace tree (collection tree is done automatically)
+        Gatherer.g_man.refreshWorkspaceTree(DragTree.COLLECTION_CONTENTS_CHANGED);
+
         folder_node = null;
         }

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

@@ -2 +2 @@
 
 import javax.swing.tree.TreePath;
+import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.collection.CollectionManager;
 import org.greenstone.gatherer.file.FileNode;
@@ -13 +14 @@
     static private FileNode workspace_tree_root = null;
     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[] collection_specific_mappings = null;
+    // static private FileNode web_cache_mapping = null;
+    static private FileNode[] folder_shortcuts = null;
 
 
@@ -43 +45 @@
 
     // Add public and private web caches if applicable
-    loadWebCacheMappings();
+    // loadWebCacheMappings();
 
-    // Add any collection specific mappings
-    loadCollectionSpecificMappings();
+    // Add any folder shortcuts the user has created
+    refreshFolderShortcuts();
 
     return workspace_tree_model;
@@ -52 +54 @@
 
 
-    static private void loadWebCacheMappings()
-    {
-    // If mirroring is enabled show the public and private caches
-    web_cache_mapping = MirrorPane.getWebCacheMapping();
-    if (web_cache_mapping != null) {
-        workspace_tree_root.insert(web_cache_mapping);
-    }
-    }
-
-
-    static private void loadCollectionSpecificMappings()
-    {
-    ///ystem.err.print("Load Collection Specific Mappings... ");
-    // Add the current collection specific mappings
-    collection_specific_mappings = CollectionManager.getCollectionSpecificMappings();
-    ///ystem.err.print("Retrieved Mappings... ");
-    if (collection_specific_mappings != null) {
-        for (int i = 0; i < collection_specific_mappings.length; i++) {
-        ///ystem.err.print("Setting " + i + " Mapping... ");
-        SynchronizedTreeModelTools.insertNodeInto(workspace_tree_model, workspace_tree_root, collection_specific_mappings[i], false);
-        }
-    }
-    ///ystem.err.println("Done.");
-    }
-
-
-    // !! NEEDS WORK !!
     static public void refreshGreenstoneCollectionsMapping()
     {
@@ -86 +61 @@
 
 
-    // !! NEEDS WORK !!
-    static public void refreshWebCacheMappings()
+    static public void refreshFolderShortcuts()
     {
-    if (web_cache_mapping != null) {
-        SynchronizedTreeModelTools.removeNodeFromParent(workspace_tree_model, web_cache_mapping);
-    }
+    // Check for new/deleted folder shortcuts
+    FileNode[] old_folder_shortcuts = folder_shortcuts;
+    folder_shortcuts = CollectionManager.getFolderShortcuts();
 
-    loadWebCacheMappings();
-        
-    }
-
-
-    // !! NEEDS WORK !!
-    static public void refreshCollectionSpecificMappings()
-    {
-    // Remove all the old collection specific mappings
-    if (collection_specific_mappings != null) {
-        for (int i = 0; i < collection_specific_mappings.length; i++) {
-        SynchronizedTreeModelTools.removeNodeFromParent(workspace_tree_model,
-                                collection_specific_mappings[i]);
+    // Remove any deleted shortcuts from the tree
+    if (old_folder_shortcuts != null) {
+        for (int i = 0; i < old_folder_shortcuts.length; i++) {
+        if (!doesArrayContain(folder_shortcuts, old_folder_shortcuts[i])) {
+            Gatherer.println("Deleted shortcut: " + old_folder_shortcuts[i]);
+            SynchronizedTreeModelTools.removeNodeFromParent(workspace_tree_model,
+                                    old_folder_shortcuts[i]);
+        }
         }
     }
 
-    loadCollectionSpecificMappings();
+    // Add any new shortcuts to the tree
+    if (folder_shortcuts != null) {
+        for (int i = 0; i < folder_shortcuts.length; i++) {
+        if (!doesArrayContain(old_folder_shortcuts, folder_shortcuts[i])) {
+            Gatherer.println("Added shortcut: " + folder_shortcuts[i]);
+            SynchronizedTreeModelTools.insertNodeInto(workspace_tree_model, workspace_tree_root, folder_shortcuts[i], false);
+        }
+        }
+    }
     }
 
@@ -132 +109 @@
     }
     }
+
+
+    static private boolean doesArrayContain(Object[] array, Object item)
+    {
+    if (array == null) {
+        return false;
+    }
+
+    for (int i = 0; i < array.length; i++) {
+        if (item.toString().equals(array[i].toString())) {
+        return true;
+        }
+    }
+
+    return false;
+    }
 }