Changeset 4391

Timestamp:

2003-05-28T13:45:50+12:00 (21 years ago)

Author:

jmt12

Message:

Prevent a user from browsing the current open collection from the file system workspace, thus preventing one possibility of an infinite copy loop.

File:

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

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

@@ -6 +6 @@
 import javax.swing.filechooser.*;
 import javax.swing.tree.*;
+import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.file.FileFilter;
 import org.greenstone.gatherer.file.FileSystemModel;
 import org.greenstone.gatherer.util.ArrayTools;
+import org.greenstone.gatherer.util.Utility;
 
 public class FileNode
@@ -233 +235 @@
     // Only map if there are no children.
     if(children == null && file != null && getAllowsChildren()) {
-                ///ystem.err.println("Map: " + this);
+        ///ystem.err.println("Map: " + this);
         children = new ArrayList();
         File[] files = file.listFiles();
@@ -243 +245 @@
             files = tools.filter(files, filters[i].filter, filters[i].exclude);
         }
+        // If this node just happens to be the greenstone collection
+        if(Gatherer.c_man != null && Gatherer.c_man.ready() && file.equals(new File(Utility.getCollectionDir(Gatherer.config.gsdl_path)))) {
+            // Preclude the directory of any open collection
+            String collection_name = Gatherer.c_man.getCollection().getName();
+            for(int j = 0; collection_name != null && files != null && j < files.length; j++) {
+            if(files[j].getName().equals(collection_name)) {
+                // Remove the offending directory
+                files = ArrayTools.remove(files, j);
+                collection_name = null; // Only have to do this once.
+            }
+            }
+        }
         // Sort the remaining files.
         tools.sort(files, true);