Changeset 5854 for trunk/gli/src/org/greenstone/gatherer/gui

Timestamp:

2003-11-16T17:50:12+13:00 (21 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/gui

Files:

• CollectionPane.java (modified) (2 diffs)
• tree/DragTree.java (modified) (1 diff)
• tree/WorkspaceTree.java (modified) (2 diffs)

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