- Timestamp:
- 2007-05-03T09:22:22+12:00 (17 years ago)
- Location:
- trunk/gli/src/org/greenstone/gatherer/gui
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/gli/src/org/greenstone/gatherer/gui/DeleteCollectionPrompt.java
r13945 r14045 212 212 // if so try to load it.. 213 213 File collections[] = collect_directory.listFiles(); 214 String file_name = (Gatherer.GS3)? Utility.CONFIG_GS3_FILE : Utility.CONFIG_FILE; 214 215 ArrayTools.sort(collections); 215 216 for(int i = 0; collections != null && i < collections.length; i++) { 216 217 if(collections[i].isDirectory() && !collections[i].getName().equals(StaticStrings.MODEL_COLLECTION_NAME)) { 217 File config_file = new File(collections[i], Utility.CONFIG_FILE);218 File config_file = new File(collections[i], file_name); 218 219 if (config_file.exists()) { 219 220 BasicCollectionConfiguration config = new BasicCollectionConfiguration(config_file); … … 289 290 public void actionPerformed(ActionEvent event) 290 291 { 291 292 if (collection.getShortName().equals(CollectionManager.getLoadedCollectionName())) {293 Gatherer.g_man.closeCurrentCollection();294 current_coll_deleted = true;295 }296 292 // Delete the selected collection. 297 293 if (Gatherer.c_man.deleteCollection(collection.getShortName())) { … … 299 295 Gatherer.g_man.refreshWorkspaceTree(WorkspaceTree.LIBRARY_CONTENTS_CHANGED); 300 296 301 //if (collection.getShortName().equals(CollectionManager.getLoadedCollectionName())) {302 //current_coll_deleted = true;303 //}297 if (collection.getShortName().equals(CollectionManager.getLoadedCollectionName())) { 298 current_coll_deleted = true; 299 } 304 300 list_model.removeElement(collection); 305 301 -
trunk/gli/src/org/greenstone/gatherer/gui/ExportAsPrompt.java
r13594 r14045 590 590 // Start at the collect dir. 591 591 File collect_directory = new File(Gatherer.getCollectDirectoryPath()); 592 String file_name = (Gatherer.GS3)? Utility.CONFIG_GS3_FILE : Utility.CONFIG_FILE; 592 593 if (collect_directory.exists()) { 593 594 // 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++) { 598 599 if(collections[i].isDirectory() && !collections[i].getName().equals(StaticStrings.MODEL_COLLECTION_NAME)) { 599 File config_file = new File(collections[i], Utility.CONFIG_FILE);600 File config_file = new File(collections[i], file_name); 600 601 if (config_file.exists()) { 601 602 BasicCollectionConfiguration config = new BasicCollectionConfiguration(config_file); -
trunk/gli/src/org/greenstone/gatherer/gui/NewCollectionDetailsPrompt.java
r13919 r14045 45 45 extends ModalDialog { 46 46 47 48 47 49 static public boolean titleClashes(String title, File current_config_file) { 48 50 // 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 } 52 54 File collect_directory = new File(Gatherer.getCollectDirectoryPath()); 55 String file_name = (Gatherer.GS3)? Utility.CONFIG_GS3_FILE : Utility.CONFIG_FILE; 53 56 File children[] = collect_directory.listFiles(); 54 57 for(int i = 0; children != null && i < children.length; i++) { 55 58 if(children[i].isDirectory()) { 56 File config_file = new File(children[i], Utility.CONFIG_FILE);59 File config_file = new File(children[i], file_name); 57 60 if(current_config_file == null || !config_file.equals(current_config_file)) { 58 61 BasicCollectionConfiguration other_collection = new BasicCollectionConfiguration(config_file); … … 102 105 File [] sites = sites_dir.listFiles(); 103 106 for (int i=0; i<sites.length; i++) { 104 File collect_directory = new File( Gatherer.getSitesDirectoryPath()+ sites[i].getName() + File.separator + "collect");107 File collect_directory = new File(sites_dir + sites[i].getName() + File.separator + "collect"); 105 108 if (collect_directory.exists()) { 106 109 addCollectionsToModel(base_collection_model, collect_directory, sites[i].getName()); … … 296 299 private void addCollectionsToModel(Vector base_collection_model, File collect_directory, String site) { 297 300 File[] possible_collections = collect_directory.listFiles(); 301 String file_name = (Gatherer.GS3)? Utility.CONFIG_GS3_FILE : Utility.CONFIG_FILE; 298 302 for (int i = 0; possible_collections != null && i < possible_collections.length; i++) { 299 303 // If the directory has a etc/collect.cfg file then it looks like a collection 300 File collect_cfg_file = new File(possible_collections[i], Utility.CONFIG_FILE);304 File collect_cfg_file = new File(possible_collections[i], file_name); 301 305 if (collect_cfg_file.exists()) { 302 306 // If the directory has a metadata/ then the collection can be used as a base -
trunk/gli/src/org/greenstone/gatherer/gui/OpenCollectionDialog.java
r13393 r14045 252 252 File collection_folder = collection_folders[i]; 253 253 String collection_foldername = collection_folder.getName(); 254 String file_name = (Gatherer.GS3)? Utility.CONFIG_GS3_FILE : Utility.CONFIG_FILE; 254 255 if(collection_folder.isDirectory() && !collection_foldername.equals(StaticStrings.MODEL_COLLECTION_NAME)) { 255 File config_file = new File(collection_folder, Utility.CONFIG_FILE);256 File config_file = new File(collection_folder, file_name); 256 257 if (config_file.exists()) { 257 258 BasicCollectionConfiguration collection_configuration = new BasicCollectionConfiguration(config_file); -
trunk/gli/src/org/greenstone/gatherer/gui/WriteCDImagePrompt.java
r13594 r14045 417 417 // Start at the collect dir. 418 418 File collect_directory = new File(Gatherer.getCollectDirectoryPath()); 419 String file_name = (Gatherer.GS3)? Utility.CONFIG_GS3_FILE : Utility.CONFIG_FILE; 419 420 if (collect_directory.exists()) { 420 421 // 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++) { 425 426 if(collections[i].isDirectory() && !collections[i].getName().equals(StaticStrings.MODEL_COLLECTION_NAME)) { 426 File config_file = new File(collections[i], Utility.CONFIG_FILE);427 File config_file = new File(collections[i], file_name); 427 428 if (config_file.exists()) { 428 429 BasicCollectionConfiguration config = new BasicCollectionConfiguration(config_file);
Note:
See TracChangeset
for help on using the changeset viewer.