Changeset 7491

Timestamp:

2004-05-28T16:47:01+12:00 (20 years ago)

Author:

mdewsnip

Message:

Even more improvements to the workspace and collection trees. These are now hugely improved -- with refreshing being much quicker and much more reliable.

Location:

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

Files:

• FileNode.java (modified) (1 diff)
• FileQueue.java (modified) (1 diff)
• FileSystemModel.java (modified) (1 diff)
• WorkspaceTreeModel.java (modified) (2 diffs)

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

@@ -476 +476 @@
     }
 
+
+    public void refresh()
+    {
+    unmap();
+    map();
+    }
+
+
     private class FileEnumeration
     implements Enumeration {

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

@@ -528 +528 @@
                 // Don't worry about all this for true file move actions.
                 if(job.type == FileJob.DELETE) {
-                   // queue all of its children, (both filtered and non-filtered), but for deleting only. Don't queue jobs for a current move event, as they would be queued as part of copying. I have no idea way, per sec, however the children within the origin node are always invalid during deletion (there are several copies of some nodes?!?). I'll check that each child is only added once.
-                   ///ystem.err.println("Directory has " + origin_node.getChildCount() + " children.");
+                // queue all of its children, (both filtered and non-filtered), but for deleting only. Don't queue jobs for a current move event, as they would be queued as part of copying. I have no idea way, per sec, however the children within the origin node are always invalid during deletion (there are several copies of some nodes?!?). I'll check that each child is only added once.
+                ///ystem.err.println("Directory has " + origin_node.getChildCount() + " children.");
                 ///ystem.err.println("Directory actually has " + child_list.length + " children.");
-                   origin_node.unmap();
-                   origin_node.map();
-                   ///atherer.println("Directory has " + origin_node.getChildCount() + " children.");
-                   ///atherer.println("Directory actually has " + child_list.length + " children.");
-                   for(int i = 0; i < origin_node.size(); i++) {
-                   FileNode child_record = (FileNode) origin_node.get(i);
-                   ///atherer.println("Queuing: " + child_record);
-                   addJob(job.ID(), job.source, child_record, job.target, destination_node, FileJob.DELETE, job.undo, false, false, position);
-                   //if(recycle_folder_record != null) {
-                   //   recycle_folder_mappings.put(child_record, recycle_folder_record);
-                   //}
-                   }  
+                origin_node.refresh();
+                ///atherer.println("Directory has " + origin_node.getChildCount() + " children.");
+                ///atherer.println("Directory actually has " + child_list.length + " children.");
+                for(int i = 0; i < origin_node.size(); i++) {
+                    FileNode child_record = (FileNode) origin_node.get(i);
+                    ///atherer.println("Queuing: " + child_record);
+                    addJob(job.ID(), job.source, child_record, job.target, destination_node, FileJob.DELETE, job.undo, false, false, position);
+                    //if(recycle_folder_record != null) {
+                    //  recycle_folder_mappings.put(child_record, recycle_folder_record);
+                    //}
+                }  
                 }
                 // Requeue a delete job -after- the children have been dealt with. Remember I've reversed the direction of the queue so sooner is later. Te-he. Also have to remember that we have have followed this path to get here for a move job: Copy Directory -> Queue Child Files -> Delete Directory (must occur after child files) -> Queue Directory.

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

@@ -147 +147 @@
     // Map and unmap the node to refresh its contents
     FileNode node = (FileNode) path.getLastPathComponent();
-    node.unmap();
-    node.map();
+    node.refresh();
 
     // Fire the appropriate event

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

@@ -56 +56 @@
     static public void refreshGreenstoneCollectionsMapping()
     {
-    greenstone_collections_mapping.unmap();
-    greenstone_collections_mapping.map();
+    greenstone_collections_mapping.refresh();
     }
 
@@ -90 +89 @@
 
 
-    public void refresh(TreePath path)
-    {
-    // If we're not refreshing the whole tree just refresh a certain path
-    if (path != null) {
-        super.refresh(path);
-    }
-
-    // Refresh each of the nodes in the workspace tree
-    for (int i = 0; i < workspace_tree_root.getChildCount(); i++) {
-        FileNode child_node = (FileNode) workspace_tree_root.getChildAt(i);
-        super.refresh(new TreePath(child_node.getPath()));
-    }
-
-    // Refresh the local filespace tree specially (it is not unmapped so not refreshed)
-    for (int i = 0; i < local_filespace_mapping.getChildCount(); i++) {
-        FileNode child_node = (FileNode) local_filespace_mapping.getChildAt(i);
-        super.refresh(new TreePath(child_node.getPath()));
-    }
-    }
-
-
     static private boolean doesArrayContain(Object[] array, Object item)
     {