Changeset 4851

Timestamp:

2003-07-02T13:27:45+12:00 (21 years ago)

Author:

jmt12

Message:

Forgot to set model when adding children nodes during a collection root mapping.

File:

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

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

@@ -200 +200 @@
     /** Adds child to the receiver at index. */
     public void insert(MutableTreeNode child, int index) {
-    ///ystem.err.println("Insert " + child + " in " + this + " at index " + index);
+    ///ystem.err.println("Insert " + child + " in " + this + " at index " + index + " [Model: " + model + "]");
     //map();
     try {
         children.add(index, child);
-                // Set parent and model.
+        // Set parent and model.
         FileNode new_child = (FileNode) child;
         new_child.setModel(model);
@@ -254 +254 @@
                 FileNode collection_root = new FileNode(import_dir, cols[i].getName(), true);
                 collection_root.setParent(this);
+                collection_root.setModel(model);
                 children.add(collection_root);
                 collection_root = null;
@@ -270 +271 @@
             ArrayTools tools = new ArrayTools();
             // Apply the filters set in the model.
+            //if(model != null) {
             FileFilter[] filters = model.getFilters();
             for(int i = 0; filters != null && i < filters.length; i++) {
             files = tools.filter(files, filters[i].filter, filters[i].exclude);
             }
+            //}
             // If this node just happens to be the greenstone collection directory
             if(Gatherer.c_man != null && Gatherer.c_man.ready() && file.equals(new File(Utility.getCollectionDir(Gatherer.config.gsdl_path)))) {