Changeset 5860

Timestamp:

2003-11-17T13:57:57+13:00 (20 years ago)

Author:

mdewsnip

Message:

Tidied up what should be shown/hidden in the workspace tree. Katherine and I decided that the modelcol directory should be hidden from the "Greenstone Collections" folder, since this is intended to show the "real" collections in the library.

We decided not to hide it in the "Local Filespace" tree, however, since this should be an accurate view of the file system and therefore not hide anything.

File:

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

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

@@ -244 +244 @@
         File cols[] = start.listFiles();
         ArrayTools.sort(cols);
-        // We add their import directories, but only if its not our current collection, nor the model collection.
+        // We add their import directories, except for the model collection
         for(int i = 0; cols != null && i < cols.length; i++) {
-            if(!cols[i].getName().equals(StaticStrings.MODEL_COLLECTION_NAME) && (!Gatherer.c_man.ready() || !Gatherer.c_man.getCollectionDirectory().equals(cols[i].getAbsolutePath()))) {
+            if (!cols[i].getName().equals(StaticStrings.MODEL_COLLECTION_NAME)) {
             File dirs[] = cols[i].listFiles();
             ArrayTools.sort(dirs);
@@ -276 +276 @@
             }
             //}
-//              // 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)))) {
-//              // Preclude the directory of any open collection
-//              String collection_name = Gatherer.c_man.getCollection().getName();
-//              for(int j = 0; j < files.length; j++) {
-//                  ///ystem.err.println("Does " + files[j].getName() + " equal " + collection_name + "?");
-//                  if(files[j].getName().equals(collection_name)) {
-//                  // Remove the offending directory
-//                  files = ArrayTools.remove(files, j);
-//                  }
-//              }
-//              }
+
             // Finally remove any files whose canonical path do not match their absolute one (ie symbolic links). We only do this test under linux, because under windows there is no such thing as a symbolic link, and instead we suffer difficulties with the 16bit truncated file paths not being the same as the canonical ones (i.e Program Files => Progra~1).
             /* This test to eliminate infinite recursions causes more problems than it solves