Changeset 4508

Timestamp:

2003-06-09T10:24:20+12:00 (21 years ago)

Author:

kjdon

Message:

fixed up the 'select element to merge with' dialog - used when adding stuff to teh collection which has metadata already associated.

File:

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

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

@@ -674 +674 @@
     // Init controls
     if(set.getItemCount() > 0) {
-                // We now try to determine the existing metadata element that is the closest match to the one we are trying to merge.
+        // We now try to determine if there is any existing metadata 
+        // element whose name is the same as the new one.  we ignore 
+        // any namespaces - if the name was a full match (namespace 
+        // and element name) then we wouldn't be in here
         MetadataSet closest_set = null;
         ElementWrapper closest_element = null;
-        int med = -1;
+        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);
         for(int j = 0; j < mds.size(); j++) {
-            ElementWrapper mde = new ElementWrapper(mds.getElement(j));
-            int new_med = MED.LD(name, mde.toString());
-            if(med == -1 || new_med < med) {
-            med = new_med;
-            closest_element = mde;
+            Element mde = mds.getElement(j);
+            String new_name = mde.getAttribute("name");
+            if (base_name.equals(new_name)) {
+            closest_element = new ElementWrapper(mde);
             closest_set = mds;
+            mde=null;
+            break;
             }
             mde = null;
+        } // for each element
+        if (closest_element != null) {
+            mds=null;
+            break;
         }
+        
         mds = null;
-        }
+        } // for each set
         if(closest_set != null && closest_element != null) {
         set.setSelectedItem(closest_set);
-        element.setSelectedItem(closest_element);
-        set_listener.actionPerformed();
+        set_listener.actionPerformed(closest_element);
         }
         else {
-        set_listener.actionPerformed();
+        set_listener.actionPerformed((ElementWrapper)null);
         }
         closest_set = null;
@@ -1016 +1028 @@
         this.set = set;
     }
-    public void actionPerformed() {
+    /** because the dialog constructor is selecting an element before calling actionPerformed, and actionPerformed is where the list of elements is built, we need to tell this what element should be selected */
+    public void actionPerformed(ElementWrapper selected_elem) {
         element.removeAllItems();
         MetadataSet mds = (MetadataSet) set.getSelectedItem();
@@ -1044 +1057 @@
             an_element = null;
         }
+        // if we have a pre selected element
+        if (selected_elem != null) {
+            // if this element is not in the set, the selection wont change
+            element.setSelectedItem(selected_elem);
+        }
         add_button.setEnabled(add_button_enabled);
 
@@ -1063 +1081 @@
     }
     public void actionPerformed(ActionEvent item) {
-        actionPerformed();
+        actionPerformed((ElementWrapper)null);
     }  
     }