Changeset 5675

Timestamp:

2003-10-17T09:45:22+13:00 (21 years ago)

Author:

jmt12

Message:

Extended tests on what folders are included in the dialog (so that neither files, nor folders which have nothing to do with collections, will turn up with the name 'Error' and the description 'Error'

File:

• trunk/gli/src/org/greenstone/gatherer/gui/SimpleOpenCollectionDialog.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/gui/SimpleOpenCollectionDialog.java

@@ -198 +198 @@
         File collection_folder = collection_folders[i];
         String collection_foldername = collection_folder.getName();
-        if(!collection_foldername.equals(StaticStrings.MODEL_COLLECTION_NAME) && !collection_foldername.equals("CVS")) {
-            data.add(new CollectionConfiguration(new File(collection_folder, Utility.CONFIG_DIR)));
+        if(!collection_folder.isFile() && !collection_foldername.equals(StaticStrings.MODEL_COLLECTION_NAME)) {
+           CollectionConfiguration collection_configuration = new CollectionConfiguration(new File(collection_folder, Utility.CONFIG_DIR));
+           if(!collection_configuration.getName().equals(StaticStrings.ERROR_STR)) {
+              data.add(collection_configuration);
+           }
         }
         collection_foldername = null;