Changeset 7484

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

Files:

• collection/CollectionManager.java (modified) (5 diffs)
• collection/DeleteCollectionPrompt.java (modified) (2 diffs)
• file/FileManager.java (modified) (1 diff)
• file/WorkspaceTreeModel.java (modified) (6 diffs)
• gui/GUIManager.java (modified) (1 diff)
• gui/GatherPane.java (modified) (1 diff)
• gui/tree/DragTree.java (modified) (1 diff)
• gui/tree/WorkspaceTree.java (modified) (5 diffs)

trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java

@@ -138 +138 @@
     Gatherer.config.addDirectoryMapping(name, file);
     // Now update the tree
-    Gatherer.g_man.refreshWorkspaceTree(WorkspaceTree.MAPPED_DIRECTORIES_CHANGED);
+    Gatherer.g_man.refreshWorkspaceTree(WorkspaceTree.FOLDER_SHORTCUTS_CHANGED);
     }
     /** This method calls the builcol.pl scripts via a GShell so as to not lock up the processor.
@@ -411 +411 @@
         collection.cdm = new CollectionDesignManager(new File(getCollectionConfig()));
 
-        // Now that we have a CDM, update several settings, such as if we created this collection by basing it on another, set it as public automatically
+        // Now that we have a CDM, update several settings, such as if we created this collection by basing it on another, set it as public automatically
         if(base_collection_directory != null) {
             // Update the creator and maintainer
@@ -472 +472 @@
         Gatherer.printStackTrace(error);
     }
-    // Done.
-    if(Gatherer.g_man != null) {
-        // workspace_model = null;
-        // set the view to Gather pane
+
+    // Done, so refresh interface
+    if (Gatherer.g_man != null) {
+        // Return to some initial pane (Gather)
         Gatherer.g_man.returnToInitialPane();
+
+        // Refresh the workspace tree to allow for the new collection
+        Gatherer.g_man.refreshWorkspaceTree(WorkspaceTree.LIBRARY_CONTENTS_CHANGED);
+
         Gatherer.g_man.collectionChanged(ready());
     }
@@ -719 +723 @@
 
 
-    static public FileNode[] getCollectionSpecificMappings()
+    static public FileNode[] getFolderShortcuts()
     {
     // Return any predefined special directories
@@ -1198 +1202 @@
     File file = Gatherer.config.removeDirectoryMapping(target.toString());
     // Update tree.
-    Gatherer.g_man.refreshWorkspaceTree(WorkspaceTree.MAPPED_DIRECTORIES_CHANGED);
+    Gatherer.g_man.refreshWorkspaceTree(WorkspaceTree.FOLDER_SHORTCUTS_CHANGED);
     return file;
     }

trunk/gli/src/org/greenstone/gatherer/collection/DeleteCollectionPrompt.java

@@ -49 +49 @@
 import org.greenstone.gatherer.gui.ModalDialog;
 import org.greenstone.gatherer.gui.SimpleMenuBar;
-import org.greenstone.gatherer.gui.tree.DragTree;
+import org.greenstone.gatherer.gui.tree.WorkspaceTree;
 import org.greenstone.gatherer.util.ArrayTools;
 import org.greenstone.gatherer.util.GSDLSiteConfig;
@@ -327 +327 @@
 
         // Refresh the collections shown in the workspace tree
-        Gatherer.g_man.refreshWorkspaceTree(DragTree.LIBRARY_CONTENTS_CHANGED);
+        Gatherer.g_man.refreshWorkspaceTree(WorkspaceTree.LIBRARY_CONTENTS_CHANGED);
 
         resultPrompt(true);

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;
+    }
 }

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

@@ -681 +681 @@
     // If the rawname was mirror then rebuild workspace tree to remove caches.
     if (rawname.equals("Mirror")) {
-        gather_pane.refreshWorkspaceTree(WorkspaceTree.MAPPED_DIRECTORIES_CHANGED);
+        // gather_pane.refreshWorkspaceTree(WorkspaceTree.FOLDER_SHORTCUTS_CHANGED);
     }
     }

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

@@ -246 +246 @@
     collection_tree_sync.add(collection_tree);
 
-    refreshWorkspaceTree(DragTree.LOADED_COLLECTION_CHANGED);
+    // Refresh the collection tree (the workspace tree stays the same)
     refreshCollectionTree(DragTree.LOADED_COLLECTION_CHANGED);
 

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

@@ -58 +58 @@
     static private final int AUTOSCROLL_MARGIN = 12;
 
-    static public int LIBRARY_CONTENTS_CHANGED    = 0;
+    static public int TREE_DISPLAY_CHANGED        = 0;
     static public int LOADED_COLLECTION_CHANGED   = 1;
     static public int COLLECTION_CONTENTS_CHANGED = 2;
-    static public int TREE_DISPLAY_CHANGED        = 3;
 
 

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

@@ -6 +6 @@
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.file.FileNode;
-import org.greenstone.gatherer.file.FileSystemModel;
 import org.greenstone.gatherer.file.WorkspaceTreeModel;
 import org.greenstone.gatherer.util.Utility;
@@ -14 +13 @@
     extends DragTree {
 
-    static public int MAPPED_DIRECTORIES_CHANGED = 11;
+    static public int LIBRARY_CONTENTS_CHANGED = 10;
+    static public int FOLDER_SHORTCUTS_CHANGED = 11;
 
 
@@ -27 +27 @@
     Gatherer.println("WorkspaceTree::refresh()... ");
 
-    // The collections in the library have changed - refresh the collect directory
-    if (refresh_reason == DragTree.LIBRARY_CONTENTS_CHANGED) {
-        Gatherer.println("...Reason: library contents changed.");
-        String collect_directory_str = Gatherer.config.gsdl_path + Utility.COL_DIR;
-        refreshEveryNodeShowingFolder(collect_directory_str);
-        WorkspaceTreeModel.refreshGreenstoneCollectionsMapping();
-    }
+    // The method for displaying the tree has changed - redraw the tree
+    if (refresh_reason == DragTree.TREE_DISPLAY_CHANGED) {
+        Gatherer.println("...Reason: tree display changed.");
+        updateUI();
+    }
 
-    // A collection has been opened/closed - reload the whole shebang
+    // The loaded collection has changed - currently do nothing
     if (refresh_reason == DragTree.LOADED_COLLECTION_CHANGED) {
         Gatherer.println("...Reason: loaded collection changed.");
-        setModel(WorkspaceTreeModel.getWorkspaceTreeModel());
     }
 
@@ -48 +45 @@
     }
 
-    // The method for displaying the tree has changed - redraw the tree
-    if (refresh_reason == DragTree.TREE_DISPLAY_CHANGED) {
-        Gatherer.println("...Reason: tree display changed.");
-        updateUI();
-    }
+    // The collections in the library have changed - refresh the collect directory
+    if (refresh_reason == WorkspaceTree.LIBRARY_CONTENTS_CHANGED) {
+        Gatherer.println("...Reason: library contents changed.");
+        String collect_directory_str = Gatherer.config.gsdl_path + Utility.COL_DIR;
+        refreshEveryNodeShowingFolder(collect_directory_str);
+        WorkspaceTreeModel.refreshGreenstoneCollectionsMapping();
+    }
 
-    // The collection specific mapped directories have changed - refresh only them
-    if (refresh_reason == WorkspaceTree.MAPPED_DIRECTORIES_CHANGED) {
-        Gatherer.println("...Reason: mapped directories changed.");
-        WorkspaceTreeModel.refreshWebCacheMappings();
-        WorkspaceTreeModel.refreshCollectionSpecificMappings();
-        updateUI();
+    // The folder shortcuts have changed - refresh only them
+    if (refresh_reason == WorkspaceTree.FOLDER_SHORTCUTS_CHANGED) {
+        Gatherer.println("...Reason: folder shortcuts changed.");
+        WorkspaceTreeModel.refreshFolderShortcuts();
     }
     }
@@ -87 +84 @@
         if (tree_node_path_str.equals(folder_path_str)) {
         System.err.println("Must refresh node " + tree_node_path_str + "!");
-        ((FileSystemModel) getModel()).refresh(expanded_tree_path);
+        ((WorkspaceTreeModel) getModel()).refresh(expanded_tree_path);
         }
     }