Changeset 6590 for trunk/gli/src/org/greenstone/gatherer/file

Timestamp:

2004-01-22T16:19:34+13:00 (20 years ago)

Author:

jmt12

Message:

Started effecting the changes requested by Ian and David. So far I've removed the complex arguments, and have ensured that the path is correct for downloads without page requisites. I've also tried to get the workspace tree to update properly, and it is much closer than before but it is now temporarily displaying the same node twice.

Location:

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

Files:

• FileSystemModel.java (modified) (4 diffs)
• WorkspaceTreeModel.java (modified) (1 diff)

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

@@ -58 +58 @@
     FileNode first_node = (FileNode)path.getPathComponent(0);
     if(current.equals(first_node)) {
-        ///atherer.println("First path component matches root node.");
+        Gatherer.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);
-        ///atherer.print("Searching for '" + stale_node + "': ");
+        Object stale_object = path.getPathComponent(i);
+        FileNode stale_node = null;
+        if(stale_object instanceof FileNode) {
+            stale_node = (FileNode) stale_object;
+        }
+        Gatherer.print("Searching for '" + stale_node + "': ");
         // Locate the fresh node by searching current's children. Remember to ensure that current is mapped.
         current.map();
@@ -71 +75 @@
         for(int j = 0; !found && j < current.getChildCount(); j++) {
             FileNode child_node = (FileNode) current.getChildAt(j);
-            ///atherer.print(child_node + " ");
-            if(stale_node.equals(child_node)) {
+            Gatherer.print(child_node + " ");
+            if((stale_node != null && stale_node.equals(child_node)) || stale_object.toString().equals(child_node.toString())) {
             found = true;
             current = child_node;
-            ///atherer.println("Found!");
+            Gatherer.println("Found!");
             }
             child_node = null;
@@ -82 +86 @@
         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)) {
+            Gatherer.print(child_node + " ");
+            if((stale_node != null && stale_node.equals(child_node)) || stale_object.toString().equals(child_node.toString())) {
             found = true;
             current = child_node;
-            ///atherer.println("Found!");
+            Gatherer.println("Found!");
             }
             child_node = null;
@@ -93 +97 @@
         if(!found) {
             current = null;
-            ///atherer.println("Not Found!");
+            Gatherer.println("Not Found!");
         }
         // Repeat as necessary
         }
     }
-    ///atherer.println("Returning node: " + new TreePath(current.getPath()));
+    Gatherer.println("Returning node: " + new TreePath(current.getPath()));
     return current;
     }

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

@@ -91 +91 @@
 
     loadWebCacheMappings();
+        
     }