Changeset 7484 for trunk/gli/src/org/greenstone/gatherer/gui/tree

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/gui/tree

Files:

• DragTree.java (modified) (1 diff)
• WorkspaceTree.java (modified) (5 diffs)

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