Changeset 6176

Timestamp:

2003-12-08T17:08:47+13:00 (20 years ago)

Author:

jmt12

Message:

When determining a node based on a file path, FileNode.size() and get() are used instead of getChildCount() and getChildAt(), which had previously lead to a problem with filtered children

File:

• trunk/gli/src/org/greenstone/gatherer/file/FileSystemModel.java (modified) (2 diffs)

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

@@ -49 +49 @@
     /** Retrieve the node denoted by the given tree path. Note that this isn't equivelent to saying path.lastPathComponent, as the references within the path may be stale. */
     public FileNode getNode(TreePath path) {
-    ///ystem.err.println("**** getNode(" + path + ") ****");
+    ///atherer.println("**** getNode(" + path + ") ****");
     FileNode current = (FileNode)root;
     // Special case for the root node. Check the first path component is the root node.
     FileNode first_node = (FileNode)path.getPathComponent(0);
     if(current.equals(first_node)) {
-                ///ystem.err.println("First path component matches root node.");
-                // For each path with this tree path
+        ///atherer.println("First path component matches root node.");
+        // For each path with this tree path
         for(int i = 1; current != null && i < path.getPathCount(); i++) {
         // Retrieve the stale path
         FileNode stale_node = (FileNode) path.getPathComponent(i);
-        ///ystem.err.print("Searching for '" + stale_node + "': ");
+        ///atherer.print("Searching for '" + stale_node + "': ");
         // Locate the fresh node by searching current's children. Remember to ensure that current is mapped.
         current.map();
         boolean found = false;
+
+        // First we search through the mapped children
         for(int j = 0; !found && j < current.getChildCount(); j++) {
             FileNode child_node = (FileNode) current.getChildAt(j);
-            ///ystem.err.print(child_node + " ");
+            ///atherer.print(child_node + " ");
             if(stale_node.equals(child_node)) {
             found = true;
             current = child_node;
-            ///ystem.err.println("Found!");
+            ///atherer.println("Found!");
+            }
+            child_node = null;
+        }
+        // Failing that we search through all the children, including filtered files
+        for(int j = 0; !found && j < current.size(); j++) {
+            FileNode child_node = (FileNode) current.get(j);
+            ///atherer.print(child_node + " ");
+            if(stale_node.equals(child_node)) {
+            found = true;
+            current = child_node;
+            ///atherer.println("Found!");
             }
             child_node = null;
@@ -76 +89 @@
         if(!found) {
             current = null;
-            ///ystem.err.println("Not Found!");
+            ///atherer.println("Not Found!");
         }
         // Repeat as necessary
         }
     }
-    ///ystem.err.println("Returning node: " + new TreePath(current.getPath()));
+    ///atherer.println("Returning node: " + new TreePath(current.getPath()));
     return current;
     }