Changeset 5777

Timestamp:

2003-11-04T16:02:58+13:00 (20 years ago)

Author:

mdewsnip

Message:

Fixed bug 169: metadata element names and identifiers being confused when importing metadata (in collect view). Names and identifiers are still opposite to the way I would have them, but at least the bug is fixed.

Location:

trunk/gli/src/org/greenstone/gatherer/msm

Files:

• ElementWrapper.java (modified) (1 diff)
• MSMPrompt.java (modified) (1 diff)
• MetadataSet.java (modified) (2 diffs)

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

@@ -212 +212 @@
 
     public String toString() {
-    return MSMUtils.getFullIdentifier(element, namespace);
+    String element_name = getName();
+    String element_identifier = getIdentity();
+
+    // Generate the element name without the namespace
+    String element_name_no_namespace = element_name;
+    int namespace_end = element_name.indexOf(MSMUtils.NS_SEP);
+    if (namespace_end != -1) {
+        element_name_no_namespace = element_name.substring(namespace_end + 1);
+    }
+
+    // Return just the element name, unless the element identifier differs
+    if (element_name_no_namespace.equals(element_identifier)) {
+        return element_name;
+    }
+    else {
+        return element_name + " (" + element_identifier + ")";
+    }
     }
 }

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

@@ -1083 +1083 @@
     }
 
-    private class SetListener 
+    /** Listens to changes in the metadata set combobox */
+    private class SetListener
     implements ActionListener {
+
     private JButton add_button = null;
     private JButton merge_button = null;
-    private JComboBox element = null;
-    private JComboBox set = null;
-    private String name = null;
-    public SetListener(JComboBox set, JComboBox element, String name, JButton add_button, JButton merge_button) {
+    private JComboBox element_combobox = null;
+    private JComboBox set_combobox = null;
+    private String element_name = null;
+
+    public SetListener(JComboBox set_combobox, JComboBox element_combobox, String element_name, JButton add_button, JButton merge_button)
+    {
+        this.element_name = element_name;
+        this.element_combobox = element_combobox;
+        this.set_combobox = set_combobox;
         this.add_button = add_button;
-        this.element = element;
         this.merge_button = merge_button;
-        this.name = name.toLowerCase();
-        this.set = set;
-    }
+    }
+
     /** 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();
-        ///ystem.err.println("Set selected: " + mds);
-        if(mds != null) {
-           NodeList elements = mds.getElements();
-           
-           Vector temp = new Vector();
-           for(int i = elements.getLength() - 1; i >= 0; i--) {
-          temp.add(new ElementWrapper((Element)elements.item(i)));
-           }
-           Collections.sort(temp, MSMUtils.METADATA_COMPARATOR);
-        
-        // The add button is only enabled if an element with the same name doesn't already exist in the destination set.
-        boolean add_button_enabled = true;
-        ///ystem.err.println("Checking for " + name);
-        for(int j = 0; j < temp.size(); j++) {
-            ElementWrapper an_element = (ElementWrapper)temp.get(j);
-            // Can only add if no file with the same name exists.
-            String check = an_element.toString().toLowerCase();
-            int position = -1;
-            if((position = check.indexOf(".")) != -1) {
-            check = check.substring(position + 1);
-            }
-            ///ystem.err.println("does it match " + check + "? " + name.equals(check));
-            add_button_enabled = add_button_enabled && !name.equals(check);
-            check = null;
-            element.addItem(an_element);
-            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);
-
-        // The merge button is only enabled if there is more than one element in the destination set.
-        if(temp.size() > 0) {
-            merge_button.setEnabled(true);
-        }
-        else {
-            merge_button.setEnabled(false);
-        }
-        temp = null;
-        elements = null;
-        }
-        else {
+    public void actionPerformed(ElementWrapper selected_elem)
+    {
+        MetadataSet mds = (MetadataSet) set_combobox.getSelectedItem();
+        if (mds == null) {
+        // If there is no metadata set selected, there isn't much you can do
         add_button.setEnabled(false);
         merge_button.setEnabled(false);
-        }
-        mds = null;
-    }
-    public void actionPerformed(ActionEvent item) {
-        actionPerformed((ElementWrapper)null);
-    }  
+        return;
+        }
+
+        // Fill the element combobox with the elements of the selected metadata set
+        element_combobox.removeAllItems();
+        Vector elements_list = mds.getElementsSorted();
+        for (int i = 0; i < elements_list.size(); i++) {
+        element_combobox.addItem(elements_list.get(i));
+        }
+
+        // If there is a pre-selected element, select it in the combobox
+        if (selected_elem != null) {
+        // If the element is not in the set, the selection won't change
+        element_combobox.setSelectedItem(selected_elem);
+        }
+
+        // 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);
+    }
+
+    public void actionPerformed(ActionEvent item)
+    {
+        actionPerformed((ElementWrapper) null);
+    }
     }
 }

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

@@ -279 +279 @@
     }
 
-    /** A method to determine if this metadata set contains an element with a certain name.
+    /** A method to determine if this metadata set contains an element with a certain name (case sensitive).
      * @param name A <strong>String</strong> which is the name of the element whose presence we are checking.
      * @return A <i>boolean</i> which is <i>true</i> if the named element exists, <i>false</i> otherwise.
@@ -405 +405 @@
     return elements;
     }
+
+    /** Method to retrieve a list of all the elements in this metadata set, sorted.
+     * @return A <strong>Vector</strong> containing all of the elements of this sets, sorted.
+     */
+    public Vector getElementsSorted() {
+    Vector elements_list = new Vector();
+    for (int i = 0; i < elements.getLength(); i++) {
+        elements_list.add(new ElementWrapper((Element) elements.item(i)));
+    }
+    Collections.sort(elements_list, MSMUtils.METADATA_COMPARATOR);
+    return elements_list;
+    }
+
     /** Method to retrieve the original file this metadata set was created from.
      * @return A <strong>File</strong>.