Changeset 4536

Timestamp:

2003-06-10T13:59:09+12:00 (21 years ago)

Author:

mdewsnip

Message:

Three fixes to the metadata editor manager. 1) The identifier attribute automatically created for a new element now has a language attribute (the default language). 2) When editing an attribute, the "name" field can't be changed. 3) Editing an attribute always removes the attribute selected, even if a different language is selected.

File:

• trunk/gli/src/org/greenstone/gatherer/mem/MetadataEditorManager.java (modified) (4 diffs)

trunk/gli/src/org/greenstone/gatherer/mem/MetadataEditorManager.java

@@ -687 +687 @@
         }
         else {
+        // Name combo box is enabled except when attributes are edited
+        name.setEnabled((source != edit_attribute));
         name_to_values.clear();
         name.clear();
@@ -909 +911 @@
         // Remove the existing attribute if this is an edit
         if(!add_type && current_attribute != -1) {
-        String current_value_str = model.getAttribute(current_attribute).value;
-        current_element.removeAttribute(name_str, language_code, current_value_str);
+        Attribute old_attribute = model.getAttribute(current_attribute);
+        String old_value_str = old_attribute.value;
+        String old_lang_code = old_attribute.language;
+        current_element.removeAttribute(name_str, old_lang_code, old_value_str);
         // Update the attribute table
         model.removeRow(current_attribute);
@@ -918 +922 @@
         current_element.addAttribute(name_str, language_code, value_str);
         // Update the attribute table
-        model.add(new Attribute(name_str, language_code, value_str));
+        int row = model.add(new Attribute(name_str, language_code, value_str));
+        element_attributes.setRowSelectionInterval(row, row);
 
         value_str = null;
@@ -1018 +1023 @@
         if(!current_set.containsElement(name_str)) {
             // Add it,
-            ElementWrapper element = current_set.addElement(name_str);
+            Language default_language = Gatherer.c_man.getCollection().cdm.languages.getDefaultLanguage();
+            ElementWrapper element = current_set.addElement(name_str, default_language.getCode());
             // Then update the tree
             model.add(current_node, element, MEMNode.ELEMENT);