Changeset 9871

Timestamp:

2005-05-13T16:31:35+12:00 (19 years ago)

Author:

mdewsnip

Message:

Fixed a small bug where switching from an inherited piece of metadata to a non-inherited piece of metadata (for the same metadata element) would not cause the metadata value tree to be displayed.

File:

• trunk/gli/src/org/greenstone/gatherer/gui/MetadataValueTreePane.java (modified) (1 diff)

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

@@ -243 +243 @@
     }
 
-    // Only update the tree model if the metadata element has changed
+    // If an extracted metadata element is selected, display "extracted metadata element selected" card
     MetadataElement new_metadata_element = new_metadata_value.getMetadataElement();
-    if (new_metadata_element != metadata_element) {
-        // If an extracted metadata element is selected, display "extracted metadata element selected" card
-        if (new_metadata_element.isExtractedMetadataElement()) {
-        String[] args = new String[1];
-        args[0] = new_metadata_element.getDisplayName();
-        Dictionary.registerText(extracted_metadata_element_selected_message, "EnrichPane.AutoMessage", args);
-        card_layout.show(this, EXTRACTED_METADATA_ELEMENT_SELECTED_CARD);
-        }
-
-        // Otherwise, display the value tree for the selected metadata element
-        else {
-        String[] args = new String[1];
-        args[0] = new_metadata_element.getDisplayName();
-        Dictionary.registerText(metadata_value_tree_label, "EnrichPane.ExistingValues", args);
-
-        metadata_value_tree.setModel(new_metadata_element.getMetadataValueTreeModel());
-        card_layout.show(this, METADATA_VALUE_TREE_CARD);
-        selectBestPathForMetadataValue(new_metadata_value.getFullValue());
-        }
-    }
+    if (new_metadata_element.isExtractedMetadataElement()) {
+        String[] args = new String[1];
+        args[0] = new_metadata_element.getDisplayName();
+        Dictionary.registerText(extracted_metadata_element_selected_message, "EnrichPane.AutoMessage", args);
+        card_layout.show(this, EXTRACTED_METADATA_ELEMENT_SELECTED_CARD);
+        return;
+    }
+
+    // Display the value tree for the selected metadata element
+    String[] args = new String[1];
+    args[0] = new_metadata_element.getDisplayName();
+    Dictionary.registerText(metadata_value_tree_label, "EnrichPane.ExistingValues", args);
+
+    metadata_value_tree.setModel(new_metadata_element.getMetadataValueTreeModel());
+    card_layout.show(this, METADATA_VALUE_TREE_CARD);
+    selectBestPathForMetadataValue(new_metadata_value.getFullValue());
     }