Changeset 6174

Timestamp:

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

Author:

jmt12

Message:

Now all child nodes, not just the filtered ones, are available for size() and get() methods

File:

• trunk/gli/src/org/greenstone/gatherer/file/FileNode.java (modified) (7 diffs)

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

@@ -25 +25 @@
 
     private ArrayList children;
+    private ArrayList raw_children;
     private boolean children_readonly = true;
     private boolean current_collection = false;
@@ -35 +36 @@
 
     public FileNode(File file) {
-    ///ystem.err.println("New FileNode(" + file.getAbsolutePath() + ")");
+    ///atherer.println("New FileNode(" + file.getAbsolutePath() + ")");
     this.file = file;
     }
@@ -98 +99 @@
     }
     return result;
+    }
+
+    /** Retrieve the filenode at the given index, regardless of filters set.
+     * @param index int
+     */
+    public FileNode get(int index) {
+    if(0 <= index && index < size() && file != null) {
+        return (FileNode) raw_children.get(index);
+    }
+    return null;
     }
 
@@ -293 +304 @@
         if(files != null && files.length > 0) {
             ArrayTools tools = new ArrayTools();
+            // Sort the remaining files.
+            tools.sort(files, true);
+            // Now add them to children.
+            raw_children = new ArrayList();
+            for(int i = 0; i < files.length; i++) {
+            FileNode child = new FileNode(files[i], model, children_readonly);
+            child.setParent(this);
+            raw_children.add(child);
+            }
             // Apply the filters set in the model.
             //if(model != null) {
@@ -314 +334 @@
                 }
                 catch (IOException exception) {
-                Gatherer.printStackTrace(exception);
+                ///atherer.printStackTrace(exception);
                 }
             }
             }
             */
-            // Sort the remaining files.
-            tools.sort(files, true);
             // Now add them to children.
             for(int i = 0; i < files.length; i++) {
             FileNode child = new FileNode(files[i], model, children_readonly);
-            child.setParent(this);
-            children.add(child);
+            int index = -1;
+            if((index = raw_children.indexOf(child)) != -1) {
+                children.add(raw_children.get(index));
+            }
+            else {
+                child.setParent(this);
+                children.add(child);
+            }
             }
         }
@@ -387 +411 @@
         error.printStackTrace();
     }
+    }
+
+    /** Retrieve the total number of child files for the file this node represents, irrespective of filters set
+     * @return int
+     */
+    public int size() {
+    if(raw_children != null) {
+        return raw_children.size();
+    }
+    return 0;
     }
 
@@ -407 +441 @@
         ///atherer.println("Unmap: " + this);
         children = null;
+        raw_children = null;
     }
     else {