Changeset 6168

Timestamp:

2003-12-08T17:02:31+13:00 (20 years ago)

Author:

jmt12

Message:

Had forgotten to exclude the current collection when searching for title clashes

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• cdm/GeneralManager.java (modified) (1 diff)
• gui/NewCollectionDetailsPrompt.java (modified) (2 diffs)

trunk/gli/src/org/greenstone/gatherer/cdm/GeneralManager.java

@@ -372 +372 @@
         String title = name_textfield.getText();
         // I just happen to have a handy method in the new details prompt to detect this very thing
-        if(NewCollectionDetailsPrompt.titleClashes(title)) {
+        if(NewCollectionDetailsPrompt.titleClashes(title, CollectionDesignManager.collect_config.getFile())) {
             // Determine if the user wants to be warned about this
             WarningDialog dialog = new WarningDialog("warning.TitleClashes", true);

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

@@ -45 +45 @@
     extends ModalDialog {
 
-    static public boolean titleClashes(String title) {
+    static public boolean titleClashes(String title, File current_config_file) {
     File collection_directory = new File(Utility.getCollectionDir(Gatherer.config.gsdl_path));
     File children[] = collection_directory.listFiles();
     for(int i = 0; children != null && i < children.length; i++) {
         if(children[i].isDirectory()) {
-        BasicCollectionConfiguration other_collection = new BasicCollectionConfiguration(new File(children[i], Utility.CONFIG_DIR));
-        if(other_collection.getName().equalsIgnoreCase(title)) {  
-            return true;
+        File config_file = new File(children[i], Utility.CONFIG_DIR);
+        if(current_config_file == null || !config_file.equals(current_config_file)) {
+            BasicCollectionConfiguration other_collection = new BasicCollectionConfiguration(config_file);
+            if(other_collection.getName().equalsIgnoreCase(title)) {  
+            return true;
+            }
+            other_collection = null;
         }
-        other_collection = null;
+        config_file = null;
         }
     }
@@ -407 +411 @@
         // We must ensure that the collection title is unique. This is a pain in the nether regions as we are forced to load the collect.cfg of each other collection in turn looking for a conflicting title
         else {
-        if(titleClashes(title_final)) {
+        if(titleClashes(title_final, null)) {
             if(JOptionPane.showConfirmDialog(Gatherer.g_man, Dictionary.get("NewCollectionPrompt.Title_Clash"), Dictionary.get("General.Warning"), JOptionPane.OK_CANCEL_OPTION) == JOptionPane.NO_OPTION) {
             title.setForeground(Gatherer.config.getColor("coloring.error_foreground", false));