Changeset 12238

Timestamp:

2006-07-17T11:09:28+12:00 (18 years ago)

Author:

kjdon

Message:

need to remove the set from the model before removing it from the collection. also, now we give a warning if adding a set to a collection with the same namespace as an exisitng set

File:

• trunk/gli/src/org/greenstone/gatherer/gui/MetadataSetDialog.java (modified) (3 diffs)

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

@@ -132 +132 @@
     public void actionPerformed(ActionEvent event) {
         MetadataSet metadata_set = (MetadataSet) current_set_list.getSelectedValue();
+        current_metadata_model.removeElement(metadata_set);
         Gatherer.c_man.removeMetadataSet(metadata_set);
-        current_metadata_model.removeElement(metadata_set);
         sets_changed = true;
         
@@ -179 +179 @@
         super(Gatherer.g_man, true);
         add_set_dialog = this;
-
         setModal(true);
         setJMenuBar(new SimpleMenuBar("choosingmetadatasets"));
@@ -282 +281 @@
         }
         MetadataSet metadata_set = (MetadataSet) available_sets_list.getSelectedValue();
+        String namespace = metadata_set.getNamespace();
+        // have we got a variant already in the collection??
+        MetadataSet existing_set = null;
+        if ((existing_set = MetadataSetManager.getMetadataSet(namespace)) != null) {
+            // warn that we are replacing
+            String [] args = new String [] {metadata_set.toString(), existing_set.toString()};
+            WarningDialog namespace_clash_dialog = new WarningDialog("warning.MetadataSetNamespaceClash", Dictionary.get("MetadataSetNamespaceClash.Title"), Dictionary.get("MetadataSetNamespaceClash.Message", args), null, true);
+            if (namespace_clash_dialog.display()==JOptionPane.CANCEL_OPTION) {
+            namespace_clash_dialog.dispose();
+            return;
+            }
+            // if we have got here, then we remove the old set
+            current_metadata_model.removeElement(existing_set);
+            Gatherer.c_man.removeMetadataSet(existing_set);
+            sets_changed = true;
+            namespace_clash_dialog.dispose();
+        }
+        
+        
         Gatherer.c_man.importMetadataSet(metadata_set);
+        metadata_set = MetadataSetManager.getMetadataSet(namespace);
         current_metadata_model.addElement(metadata_set);
+        sets_changed = true;
         cancelled = false;
         add_set_dialog.dispose();