Changeset 9552

Timestamp:

2005-04-05T11:41:13+12:00 (19 years ago)

Author:

mdewsnip

Message:

Fixed a bug where adding indexes on metadata elements whose name didn't match their display name would be screwed up. This was caused by the combobox being editable and converting the contents into strings rather than keeping them as objects. The combobox has been changed to be non-editable and some extra code has been added to check everything stays frosty.

File:

• trunk/gli/src/org/greenstone/gatherer/cdm/IndexManager.java (modified) (5 diffs)

trunk/gli/src/org/greenstone/gatherer/cdm/IndexManager.java

@@ -1056 +1056 @@
         move_index_up_button.setEnabled(false);
         move_index_up_button.setMnemonic(KeyEvent.VK_U);
-        //move_index_up_button.setPreferredSize(Utility.DOUBLE_IMAGE_BUTTON_SIZE);
         Dictionary.registerBoth(move_index_up_button, "CDM.Move.Move_Up", "CDM.Move.Move_Up_Tooltip");
 
@@ -1062 +1061 @@
         move_index_down_button.setEnabled(false);
         move_index_down_button.setMnemonic(KeyEvent.VK_D);
-        //move_index_down_button.setPreferredSize(Utility.DOUBLE_IMAGE_BUTTON_SIZE);
         Dictionary.registerBoth(move_index_down_button, "CDM.Move.Move_Down", "CDM.Move.Move_Down_Tooltip");
 
@@ -1086 +1084 @@
         index_combobox.setBackgroundNonSelectionColor(Configuration.getColor("coloring.editable_background", false));
         index_combobox.setBackgroundSelectionColor(Configuration.getColor("coloring.collection_selection_background", false));
-        index_combobox.setEditable(true);
+        index_combobox.setEditable(false);  // Warning: setting this to true opens a big can of worms
         index_combobox.setTextNonSelectionColor(Configuration.getColor("coloring.workspace_tree_foreground", false));
         index_combobox.setTextSelectionColor(Configuration.getColor("coloring.collection_selection_foreground", false));
@@ -1355 +1353 @@
         // Retrieve the source
         Object source = index_combobox.getSelectedItem();
+
         // If this object isn't yet in the combobox add it.
         if(index_combobox.getSelectedIndex() == -1) {
@@ -1513 +1512 @@
             // Unfortunately we have to generate a valid id
             String id = null;
-            if (selected_object instanceof MetadataElement) {
+            // Special cases
+            if (selected_object instanceof String && (selected_object.equals(CollectionConfiguration.ALLFIELDS_STR) || selected_object.equals(CollectionConfiguration.METADATA_STR) || selected_object.equals(CollectionConfiguration.TEXT_STR))) {
+            id = (String) selected_object;
+            }
+            else if (selected_object instanceof MetadataElement) {
             id = ((MetadataElement) selected_object).getFullName();
             }
             else {
-            id = selected_object.toString();
+            System.err.println("Internal Error: Unexpected selected_object in IndexManager.");
+            return;
             }
             if(id.startsWith(StaticStrings.EXTRACTED_NAMESPACE)) {