Changeset 14045

Timestamp:

2007-05-03T09:22:22+12:00 (17 years ago)

Author:

xiao

Message:

Changes made to look for collectionConfig.xml in gs3 mode and collect.cfg in gs2 mode, rather than presumably only for the file collect.cfg.

Location:

trunk/gli/src/org/greenstone/gatherer/gui

Files:

• DeleteCollectionPrompt.java (modified) (3 diffs)
• ExportAsPrompt.java (modified) (2 diffs)
• NewCollectionDetailsPrompt.java (modified) (4 diffs)
• OpenCollectionDialog.java (modified) (1 diff)
• WriteCDImagePrompt.java (modified) (2 diffs)

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

@@ -212 +212 @@
         // if so try to load it..
         File collections[] = collect_directory.listFiles();
+        String file_name = (Gatherer.GS3)? Utility.CONFIG_GS3_FILE : Utility.CONFIG_FILE;
         ArrayTools.sort(collections);
         for(int i = 0; collections != null && i < collections.length; i++) {
         if(collections[i].isDirectory() && !collections[i].getName().equals(StaticStrings.MODEL_COLLECTION_NAME)) {
-            File config_file = new File(collections[i], Utility.CONFIG_FILE);
+            File config_file = new File(collections[i], file_name);
             if (config_file.exists()) {
             BasicCollectionConfiguration config = new BasicCollectionConfiguration(config_file);
@@ -289 +290 @@
     public void actionPerformed(ActionEvent event)
     {
-
-        if (collection.getShortName().equals(CollectionManager.getLoadedCollectionName())) {
-        Gatherer.g_man.closeCurrentCollection();
-        current_coll_deleted = true;
-        }
         // Delete the selected collection.
         if (Gatherer.c_man.deleteCollection(collection.getShortName())) {
@@ -299 +295 @@
         Gatherer.g_man.refreshWorkspaceTree(WorkspaceTree.LIBRARY_CONTENTS_CHANGED);
 
-        //if (collection.getShortName().equals(CollectionManager.getLoadedCollectionName())) {
-        //    current_coll_deleted = true;
-        //}
+        if (collection.getShortName().equals(CollectionManager.getLoadedCollectionName())) {
+            current_coll_deleted = true;
+        }
         list_model.removeElement(collection);
 

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

@@ -590 +590 @@
     // Start at the collect dir.
     File collect_directory = new File(Gatherer.getCollectDirectoryPath());
+    String file_name = (Gatherer.GS3)? Utility.CONFIG_GS3_FILE : Utility.CONFIG_FILE;
     if (collect_directory.exists()) {
         // Now for each child directory see if it contains a .col file and
@@ -597 +598 @@
         for(int i = 0; collections != null && i < collections.length; i++) {
         if(collections[i].isDirectory() && !collections[i].getName().equals(StaticStrings.MODEL_COLLECTION_NAME)) {
-            File config_file = new File(collections[i], Utility.CONFIG_FILE);
+            File config_file = new File(collections[i], file_name);
             if (config_file.exists()) {
             BasicCollectionConfiguration config = new BasicCollectionConfiguration(config_file);

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

@@ -45 +45 @@
     extends ModalDialog {
 
+     
+    
     static public boolean titleClashes(String title, File current_config_file) {
     // An empty collection title never clashes with anything. It may look ugly in the final collection but there is nothing wrong with having no title for a particular language.
@@ -51 +53 @@
     }
     File collect_directory = new File(Gatherer.getCollectDirectoryPath());
+    String file_name = (Gatherer.GS3)? Utility.CONFIG_GS3_FILE : Utility.CONFIG_FILE;
     File children[] = collect_directory.listFiles();
     for(int i = 0; children != null && i < children.length; i++) {
         if(children[i].isDirectory()) {
-        File config_file = new File(children[i], Utility.CONFIG_FILE);
+        File config_file = new File(children[i], file_name);
         if(current_config_file == null || !config_file.equals(current_config_file)) {
             BasicCollectionConfiguration other_collection = new BasicCollectionConfiguration(config_file);
@@ -102 +105 @@
         File [] sites = sites_dir.listFiles();
         for (int i=0; i<sites.length; i++) {
-        File collect_directory = new File(Gatherer.getSitesDirectoryPath() + sites[i].getName() + File.separator + "collect");
+        File collect_directory = new File(sites_dir + sites[i].getName() + File.separator + "collect");
         if (collect_directory.exists()) {
             addCollectionsToModel(base_collection_model, collect_directory, sites[i].getName());
@@ -296 +299 @@
     private void addCollectionsToModel(Vector base_collection_model, File collect_directory, String site) {
     File[] possible_collections = collect_directory.listFiles();
+    String file_name = (Gatherer.GS3)? Utility.CONFIG_GS3_FILE : Utility.CONFIG_FILE;
     for (int i = 0; possible_collections != null && i < possible_collections.length; i++) {
         // If the directory has a etc/collect.cfg file then it looks like a collection
-        File collect_cfg_file = new File(possible_collections[i], Utility.CONFIG_FILE);
+        File collect_cfg_file = new File(possible_collections[i], file_name);
         if (collect_cfg_file.exists()) {
         // If the directory has a metadata/ then the collection can be used as a base

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

@@ -252 +252 @@
         File collection_folder = collection_folders[i];
         String collection_foldername = collection_folder.getName();
+        String file_name = (Gatherer.GS3)? Utility.CONFIG_GS3_FILE : Utility.CONFIG_FILE;
         if(collection_folder.isDirectory() && !collection_foldername.equals(StaticStrings.MODEL_COLLECTION_NAME)) {
-            File config_file = new File(collection_folder, Utility.CONFIG_FILE);
+            File config_file = new File(collection_folder, file_name);
             if (config_file.exists()) {
             BasicCollectionConfiguration collection_configuration = new BasicCollectionConfiguration(config_file);

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

@@ -417 +417 @@
     // Start at the collect dir.
     File collect_directory = new File(Gatherer.getCollectDirectoryPath());
+    String file_name = (Gatherer.GS3)? Utility.CONFIG_GS3_FILE : Utility.CONFIG_FILE;
     if (collect_directory.exists()) {
         // Now for each child directory see if it contains a .col file and
@@ -424 +425 @@
         for(int i = 0; collections != null && i < collections.length; i++) {
         if(collections[i].isDirectory() && !collections[i].getName().equals(StaticStrings.MODEL_COLLECTION_NAME)) {
-            File config_file = new File(collections[i], Utility.CONFIG_FILE);
+            File config_file = new File(collections[i], file_name);
             if (config_file.exists()) {
             BasicCollectionConfiguration config = new BasicCollectionConfiguration(config_file);