Changeset 7609

Timestamp:

2004-06-17T14:30:29+12:00 (20 years ago)

Author:

kjdon

Message:

fixed the bug where when you drag a document with existing namespaced metadata into a collection with a different metadata set, the add button would be enabled for metadata with the same name as an existing one. the problem was, the namespace wasn't being removed before testing to see if it existed.

File:

• trunk/gli/src/org/greenstone/gatherer/msm/MSMPrompt.java (modified) (9 diffs)

trunk/gli/src/org/greenstone/gatherer/msm/MSMPrompt.java

@@ -668 +668 @@
     args[0] = name;
 
+    // we ignore any namespaces - if the name was a full match (namespace 
+    // and element name) then we wouldn't be in here
+    String unqualified_name = name;
+    int ns_sep = unqualified_name.indexOf(MSMUtils.NS_SEP);
+    if (ns_sep != -1) {
+        unqualified_name = unqualified_name.substring(ns_sep+1);
+    }
+    
     // Create
     MSMDialog dialog = new MSMDialog();
@@ -728 +736 @@
 
     // Connect
-    AddListener add_listener = new AddListener(dialog, name, set);
+    AddListener add_listener = new AddListener(dialog, unqualified_name, set);
     CancelListener cancel_listener = new CancelListener(dialog);
     IgnoreListener ignore_listener = new IgnoreListener(dialog);
     MergeListener merge_listener = new MergeListener(dialog, element);
-    SetListener set_listener = new SetListener(set, element, name, add_button, merge_button);
-
+    SetListener set_listener = new SetListener(set, element, unqualified_name, add_button, merge_button);
+    
     add_button.addActionListener(add_listener);
     cancel_button.addActionListener(cancel_listener);
@@ -748 +756 @@
         MetadataSet closest_set = null;
         ElementWrapper closest_element = null;
-        String base_name = name;
-        int ns_sep = base_name.indexOf(MSMUtils.NS_SEP);
-        if (ns_sep != -1) {
-        base_name = base_name.substring(ns_sep+1);
-        }
         for(int i = 0; i < set.getItemCount(); i++) {
         MetadataSet mds = (MetadataSet) set.getItemAt(i);
@@ -758 +761 @@
             Element mde = mds.getElement(j);
             String new_name = mde.getAttribute("name");
-            if (base_name.equals(new_name)) {
+            if (unqualified_name.equals(new_name)) {
             closest_element = new ElementWrapper(mde);
             closest_set = mds;
@@ -845 +848 @@
     set_listener = null;
     set = null;
+    unqualified_name = null;
     button_pane = null;
     dialog.dispose();
@@ -862 +866 @@
     private JDialog dialog = null;
     private String name = null;
+    // the name should have no namespace
     public AddListener(JDialog dialog, String name, JComboBox set) {
         this.dialog = dialog;
@@ -870 +875 @@
         // Get the currently selected metadata set.
         MetadataSet mds = (MetadataSet) set.getSelectedItem();
-        String n = name;
-        // If we've been forced to go this far then any given namespace is complete bollocks.
-        while(n.indexOf(".") != -1 && !n.equals(".")) {
-        n = n.substring(n.indexOf(".") + 1);
-        }
         // However, before we attempt to add a new element to the set, we should check that none already exists.
         Element element = mds.getElement(name);
         if (element == null) {
-        result = mds.addElement(n, Gatherer.config.getLanguage());
+        result = mds.addElement(name, Gatherer.config.getLanguage());
         }
         else {
@@ -884 +884 @@
         }
         mds = null;
-        n = null;
         element = null;
         dialog.setVisible(false);
@@ -1042 +1041 @@
         // Can only add if the element doesn't already exist in the metadata set
         add_button.setEnabled(!mds.containsElement(element_name));
-
         // Can only merge if the metadata set is not empty
         merge_button.setEnabled(mds.size() > 0);