Changeset 5854

Timestamp:

2003-11-16T17:50:12+13:00 (20 years ago)

Author:

mdewsnip

Message:

More improvements to smart workspace tree refreshing. Library contents changes (eg. deleting collections) now refreshes the collect directory nicely.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• collection/CollectionManager.java (modified) (1 diff)
• collection/DeleteCollectionPrompt.java (modified) (3 diffs)
• file/FileNode.java (modified) (1 diff)
• file/WorkspaceTreeModel.java (modified) (3 diffs)
• gui/CollectionPane.java (modified) (2 diffs)
• gui/tree/DragTree.java (modified) (1 diff)
• gui/tree/WorkspaceTree.java (modified) (2 diffs)

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

@@ -1082 +1082 @@
         }
     }
-    }
-
-    /** Refresh the Greenstone Collections special mapping in the workspace tree to account for collections being added/removed
-     */
-    public void refreshGreenstoneCollections()
-    {
-    Gatherer.g_man.collection_pane.refreshWorkspaceTree(WorkspaceTree.COLLECTION_CHANGED);
-
-    /* FileNode root = (FileNode) workspace_model.getRoot();
-    FileNode greenstone_collections_node = null;
-    int root_child_count = root.getChildCount();
-    String greenstone_collections_str = Dictionary.get("Tree.World");
-    for(int i = 0; greenstone_collections_node == null && i < root_child_count; i++) {
-        TreeNode child = root.getChildAt(i);
-        if(child.toString().equals(greenstone_collections_str)) {
-        greenstone_collections_node = (FileNode) child;
-        }
-        child = null;
-    }
-    greenstone_collections_str = null;
-    root = null;
-    if(greenstone_collections_node != null) {
-        TreePath greenstone_collections_path = new TreePath(greenstone_collections_node.getPath());
-        workspace_model.refresh(greenstone_collections_path);
-        greenstone_collections_path = null;
-        greenstone_collections_node = null;
-        } */
     }
 

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

@@ -47 +47 @@
 import org.greenstone.gatherer.gui.ModalDialog;
 import org.greenstone.gatherer.gui.SimpleMenuBar;
+import org.greenstone.gatherer.gui.tree.DragTree;
 import org.greenstone.gatherer.util.ArrayTools;
 import org.greenstone.gatherer.util.GSDLSiteConfig;
@@ -244 +245 @@
      */
     public void actionPerformed(ActionEvent event) {
-        // Ask the collection manager to refresh the 'Greenstone Collections' folder
-        Gatherer.c_man.refreshGreenstoneCollections();
         // Done
         prompt.dispose();
@@ -312 +311 @@
         File delete_me = new File(Utility.getCollectionDir(Gatherer.config.gsdl_path) + collection.getName() + File.separator);
         if(Utility.delete(delete_me)) {
-        if (Gatherer.c_man.getCollection()!=null && collection.getName().equals(Gatherer.c_man.getCollection().getName())) {
+        if (Gatherer.c_man.getCollection() != null && collection.getName().equals(Gatherer.c_man.getCollection().getName())) {
             current_coll_deleted = true;
         }
+        list_model.removeElement(collection);
+
+        // Refresh the collects shown in the workspace tree
+        Gatherer.g_man.collection_pane.refreshWorkspaceTree(DragTree.LIBRARY_CONTENTS_CHANGED);
 
         resultPrompt(true);
-        list_model.removeElement(collection);
         Dictionary.setText(details, "DeleteCollectionPrompt.No_Collection");
         confirmation.setEnabled(false);

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

@@ -275 +275 @@
             files = tools.filter(files, filters[i].filter, filters[i].exclude);
             }
-            //}
-            // If this node just happens to be the greenstone collection directory
-            if(Gatherer.c_man != null && Gatherer.c_man.ready() && file.equals(new File(Utility.getCollectionDir(Gatherer.config.gsdl_path)))) {
-            // Preclude the directory of any open collection
-            String collection_name = Gatherer.c_man.getCollection().getName();
-            for(int j = 0; j < files.length; j++) {
-                ///ystem.err.println("Does " + files[j].getName() + " equal " + collection_name + "?");
-                if(files[j].getName().equals(collection_name)) {
-                // Remove the offending directory
-                files = ArrayTools.remove(files, j);
-                }
-            }
-            }
+            //}
+//              // If this node just happens to be the greenstone collection directory
+//              if(Gatherer.c_man != null && Gatherer.c_man.ready() && file.equals(new File(Utility.getCollectionDir(Gatherer.config.gsdl_path)))) {
+//              // Preclude the directory of any open collection
+//              String collection_name = Gatherer.c_man.getCollection().getName();
+//              for(int j = 0; j < files.length; j++) {
+//                  ///ystem.err.println("Does " + files[j].getName() + " equal " + collection_name + "?");
+//                  if(files[j].getName().equals(collection_name)) {
+//                  // Remove the offending directory
+//                  files = ArrayTools.remove(files, j);
+//                  }
+//              }
+//              }
             // Finally remove any files whose canonical path do not match their absolute one (ie symbolic links). We only do this test under linux, because under windows there is no such thing as a symbolic link, and instead we suffer difficulties with the 16bit truncated file paths not being the same as the canonical ones (i.e Program Files => Progra~1).
             /* This test to eliminate infinite recursions causes more problems than it solves

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

@@ -11 +11 @@
     static private FileNode workspace_tree_root = null;
     static private WorkspaceTreeModel workspace_tree_model = null;
+    static private FileNode greenstone_collections_mapping = null;
     static private FileNode[] collection_specific_mappings = null;
 
@@ -27 +28 @@
 
     // Add the Greenstone Collections mapping
-    workspace_tree_root.insert(CollectionManager.getGreenstoneCollectionsMapping());
+    greenstone_collections_mapping = CollectionManager.getGreenstoneCollectionsMapping();
+    workspace_tree_root.insert(greenstone_collections_mapping);
 
     // Add the local filespace
@@ -61 +63 @@
 
 
+    static public void refreshGreenstoneCollectionsMapping()
+    {
+    greenstone_collections_mapping.unmap();
+    greenstone_collections_mapping.map();
+    }
+
+
     static public void refreshCollectionSpecificMappings()
     {

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

@@ -244 +244 @@
     collection_tree_sync.add(collection_tree);
 
-    refreshWorkspaceTree(DragTree.COLLECTION_CHANGED);
-    refreshCollectionTree(DragTree.COLLECTION_CHANGED);
+    refreshWorkspaceTree(DragTree.LOADED_COLLECTION_CHANGED);
+    refreshCollectionTree(DragTree.LOADED_COLLECTION_CHANGED);
 
     // Enable or disable the control buttons
@@ -504 +504 @@
     workspace_tree.refresh(refresh_reason);
     }
-
-
-    /* public void refreshWorkspace() {
-    System.err.println("CollectionPane::refreshWorkspace()... (ignored)");
-    // workspace = Gatherer.c_man.getWorkspace();
-    // workspace_tree.setModel(workspace);
-    // workspace_tree_sync.add(workspace_tree);
-    } */
 
 

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

@@ -54 +54 @@
     static private final int AUTOSCROLL_MARGIN = 12;
 
-    static public int COLLECTION_CHANGED          = 1;
+    static public int LIBRARY_CONTENTS_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

@@ -25 +25 @@
     System.err.print("WorkspaceTree::refresh()... ");
 
-    // A collection has been opened/closed - reload the workspace tree model
-    if (refresh_reason == DragTree.COLLECTION_CHANGED) {
-        System.err.println("Reason: collection changed.");
+    // The collections in the library have changed - refresh the collect directory
+    if (refresh_reason == DragTree.LIBRARY_CONTENTS_CHANGED) {
+        System.err.println("Reason: library contents changed.");
+        String collect_directory_str = Gatherer.config.gsdl_path + Utility.COL_DIR;
+        refreshEveryNodeShowingFolder(collect_directory_str);
+        WorkspaceTreeModel.refreshGreenstoneCollectionsMapping();
+    }
+
+    // A collection has been opened/closed - reload the whole shebang
+    if (refresh_reason == DragTree.LOADED_COLLECTION_CHANGED) {
+        System.err.println("Reason: loaded collection changed.");
         setModel(WorkspaceTreeModel.getWorkspaceTreeModel());
     }
 
-    // The collection's contents have changed - refresh expanded parts of the collection
+    // The collection's contents have changed - refresh collection's import folder
     if (refresh_reason == DragTree.COLLECTION_CONTENTS_CHANGED) {
         System.err.println("Reason: collection contents changed.");
-
         String import_directory_str = Gatherer.c_man.getCollectionImport();
-
-        TreePath tree_root_path = new TreePath(getModel().getRoot());
-        Enumeration expanded_tree_paths = getExpandedDescendants(tree_root_path);
-        while (expanded_tree_paths.hasMoreElements()) {
-        TreePath expanded_tree_path = (TreePath) expanded_tree_paths.nextElement();
-        FileNode tree_node = (FileNode) expanded_tree_path.getLastPathComponent();
-
-        File tree_node_file = tree_node.getFile();
-        if (tree_node_file == null) {
-            continue;
-        }
-
-        // Get the path of the open tree node
-        String tree_node_path_str = tree_node_file.toString();
-        if (!tree_node_path_str.endsWith(File.separator)) {
-            tree_node_path_str = tree_node_path_str + File.separator;
-        }
-
-        // If the collection import directory is open, it must be refreshed
-        if (tree_node_path_str.equals(import_directory_str)) {
-            System.err.println("Must refresh collection import directory!");
-            ((FileSystemModel) getModel()).refresh(expanded_tree_path);
-        }
-        }
+        refreshEveryNodeShowingFolder(import_directory_str);
     }
 
@@ -74 +58 @@
     }
     }
+
+
+    private void refreshEveryNodeShowingFolder(String folder_path_str)
+    {
+    // Search through the expanded tree paths, checking if any show the given folder
+    TreePath tree_root_path = new TreePath(getModel().getRoot());
+    Enumeration expanded_tree_paths = getExpandedDescendants(tree_root_path);
+    while (expanded_tree_paths.hasMoreElements()) {
+        TreePath expanded_tree_path = (TreePath) expanded_tree_paths.nextElement();
+        FileNode tree_node = (FileNode) expanded_tree_path.getLastPathComponent();
+
+        File tree_node_file = tree_node.getFile();
+        if (tree_node_file == null) {
+        continue;
+        }
+
+        // Get the path of the open tree node
+        String tree_node_path_str = tree_node_file.toString();
+        if (!tree_node_path_str.endsWith(File.separator)) {
+        tree_node_path_str = tree_node_path_str + File.separator;
+        }
+
+        // If the collection import directory is open, it must be refreshed
+        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);
+        }
+    }
+    }
 }