Changeset 8784

Timestamp:

2004-12-13T12:56:13+13:00 (19 years ago)

Author:

mdewsnip

Message:

A few more changes to the improved file tree code.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• file/FileNode.java (modified) (5 diffs)
• file/WorkspaceTreeNode.java (modified) (3 diffs)
• gui/tree/DragTree.java (modified) (1 diff)

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

@@ -21 +21 @@
     protected MutableTreeNode parent = null;
 
-    protected boolean current_collection = false;
-
 
     public FileNode(File file)
@@ -228 +226 @@
 
 
-    /** Is this file node within the currently open collection? */
-    public boolean isInCurrentCollection() {
-    if (current_collection) {
-        return true;
-    }
-    else {
-        FileNode parent = (FileNode) getParent();
-        if (parent != null) {
-        return parent.isInCurrentCollection();
-        }
-    }
+    /** Overridden if necessary by subclasses. */
+    public boolean isInLoadedCollection()
+    {
     return false;
     }
@@ -268 +258 @@
         child_nodes_unfiltered = new ArrayList();
         for (int i = 0; i < files.length; i++) {
-            child_nodes_unfiltered.add(this.addChildNode(files[i]));
+            FileNode child_node = this.addChildNode(files[i]);
+            child_nodes_unfiltered.add(child_node);
         }
 
@@ -280 +271 @@
         for (int i = 0; i < files.length; i++) {
             FileNode child_node = this.addChildNode(files[i]);
-            int index = -1;
-            if ((index = child_nodes_unfiltered.indexOf(child_node)) != -1) {
-            child_nodes.add(child_nodes_unfiltered.get(index));
-            }
-            else {
-            child_nodes.add(child_node);
+            for (int j = 0; j < child_nodes_unfiltered.size(); j++) {
+            if (((FileNode) child_nodes_unfiltered.get(j)).equals(child_node)) {
+                child_nodes.add(child_nodes_unfiltered.get(j));
+            }
             }
         }
@@ -301 +290 @@
     }
 
-
-    public void setCurrentCollection(boolean current_collection) {
-    this.current_collection = current_collection;
-    }
 
     public void setModel(FileSystemModel model) {

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

@@ -45 +45 @@
 {
     private boolean is_gs3_site_node = false;
+    private boolean is_in_loaded_collection = false;
     private String title = null;
 
@@ -67 +68 @@
     child_node.setParent(this);
     return child_node;
+    }
+
+
+    /** Is this file node within the currently loaded collection? */
+    public boolean isInLoadedCollection()
+    {
+    if (is_in_loaded_collection) {
+        return true;
+    }
+    else {
+        FileNode parent = (FileNode) getParent();
+        if (parent != null) {
+        return parent.isInLoadedCollection();
+        }
+    }
+    return false;
     }
 
@@ -138 +155 @@
             Collection collection = Gatherer.c_man.getCollection();
             if (collection != null) {
-                collection_root.setCurrentCollection(cols[i].getName().equals(collection.getName()));
+                collection_root.is_in_loaded_collection = cols[i].getName().equals(collection.getName());
             }
             child_nodes.add(collection_root);

trunk/gli/src/org/greenstone/gatherer/gui/tree/DragTree.java

@@ -631 +631 @@
     for(int i = 0; i < paths.length; i++) {
         FileNode child = (FileNode) paths[i].getLastPathComponent();
-        if(child.isInCurrentCollection()) {
+        if (child.isInLoadedCollection()) {
         return false;
         }