Changeset 8364

Timestamp:

2004-10-18T15:44:09+13:00 (20 years ago)

Author:

mdewsnip

Message:

Much improved algorithm for selecting the best row in the table after adding/replacing/removing metadata, and improved entry speed: can now use up/down keys for controlling table selection when the value field is in focus.

File:

• trunk/gli/src/org/greenstone/gatherer/gui/EnrichPane.java (modified) (9 diffs)

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

@@ -500 +500 @@
 
     // Update the metadata value table (and consequently, the metadata value tree)
-    metadata_value_table.rebuild();
+    MetadataValue previously_selected_metadata_value = metadata_value_table.getSelectedMetadataValueTableEntry();
+    metadata_value_table.rebuildAndSelectRowWithValueClosestTo(previously_selected_metadata_value);
 
 //  // Update the meta-audit view to show the current selection, if any.
@@ -539 +540 @@
         // Update the metadata value table and tree
         metadata_edit_event = true;
-        metadata_value_table.rebuild();
+        metadata_value_table.rebuildAndSelectRowWithValueClosestTo(metadata_value);
         metadata_edit_event = false;
     }
@@ -568 +569 @@
         // Update the metadata value table and tree
         metadata_edit_event = true;
-        metadata_value_table.rebuild();
+        metadata_value_table.rebuildAndSelectRowWithValueClosestTo(metadata_value);
         metadata_edit_event = false;
     }
@@ -589 +590 @@
         // Update the metadata value table and tree
         metadata_edit_event = true;
-        metadata_value_table.rebuild();
+        metadata_value_table.rebuildAndSelectRowWithValueClosestTo(selected_metadata_value_table_entry);
         metadata_edit_event = false;
     }
@@ -673 +674 @@
 
 
-    public void rebuild()
-    {
-        // Remember the current metadata element selection so we can select it again later
-        MetadataValueTableEntry previously_selected_metadata_value_table_entry = selected_metadata_value_table_entry;
-
+    public void moveSelectionDown()
+    {
+        int new_row_to_select = getSelectedRow() + 1;
+        if (new_row_to_select < metadata_value_table_model.getRowCount()) {
+        changeSelection(new_row_to_select, 1, false, false);
+        }
+    }
+
+
+    public void moveSelectionUp()
+    {
+        int new_row_to_select = getSelectedRow() - 1;
+        if (new_row_to_select >= 0) {
+        changeSelection(new_row_to_select, 1, false, false);
+        }
+    }
+
+
+    public void rebuildAndSelectRowWithValueClosestTo(MetadataValue optimal_metadata_value_to_select_when_building_complete)
+    {
         // We don't want a lot of ListSelectionEvents while the table is rebuilding
         clearSelection();
@@ -696 +712 @@
         metadata_value_table_card_layout.show(table_card_pane, TABLE_CARD);
 
-        // If there was no previous selection then we're done
-        if (previously_selected_metadata_value_table_entry == null) {
+        // If we don't need to select a row in the table after rebuilding, we're done
+        if (optimal_metadata_value_to_select_when_building_complete == null) {
         return;
         }
 
-        // Look for an exact match
+        MetadataElement optimal_metadata_element = optimal_metadata_value_to_select_when_building_complete.getMetadataElement();
+        
+        // Find the row containing the closest value to the optimal value
+        int optimal_row_to_select = 0;
         for (int i = 0; i < metadata_value_table_model.getRowCount(); i++) {
         MetadataValueTableEntry metadata_value_table_entry = metadata_value_table_model.getMetadataValueTableEntry(i);
-        int c = metadata_value_table_entry.compareTo(previously_selected_metadata_value_table_entry);
-
-        if (c == 0) {
-            // Select this row and we're done
-            addRowSelectionInterval(i, i);
-            return;
-        }
-
-        if (c < 0) {
-            // Not in the list
-            break;
-        }
-        }
-
-        // Select the first entry with the same metadata element
-        MetadataElement previously_selected_metadata_element = previously_selected_metadata_value_table_entry.getMetadataElement();
-        for (int i = 0; i < metadata_value_table_model.getRowCount(); i++) {
-        MetadataElement metadata_element = metadata_value_table_model.getMetadataValueTableEntry(i).getMetadataElement();
-        if (metadata_element.equals(previously_selected_metadata_element)) {
-            // Select this row and we're done
-            addRowSelectionInterval(i, i);
-            return;
-        }
-        }
-
-        // All else has failed, so just select the first row in the table
-        addRowSelectionInterval(0, 0);
+        MetadataElement metadata_element = metadata_value_table_entry.getMetadataElement();
+        if (metadata_element.equals(optimal_metadata_element)) {
+            // This row will be the optimal row, unless the next row matches better
+            optimal_row_to_select = i;
+        }
+
+        int c = metadata_value_table_entry.compareTo(optimal_metadata_value_to_select_when_building_complete);
+        if (c >= 0) {
+            // We've either found an exact match, or there is no exact match, so stop here
+            break;
+        }
+        }
+
+        changeSelection(optimal_row_to_select, 1, false, false);
     }
 
@@ -1099 +1105 @@
         if (metadata_element == null) {
         if (metadata_edit_event == false) {
-            System.err.println("Clearing selection...");
+            // System.err.println("Clearing selection...");
             selected_metadata_element = null;
             validateDisplay();
@@ -1223 +1229 @@
 
         /** Gives notification of key events on the text field */
-        public void keyPressed(KeyEvent e) {
+        public void keyPressed(KeyEvent e)
+        {
+        // Tab: Auto-complete
         if (e.getKeyCode() == KeyEvent.VK_TAB) {
-            // Tab: Auto-complete
             if (tree.getSelectionCount() != 0 && !getSelectedValue().equals("")) {
             TreePath path = tree.getSelectionPath();
@@ -1232 +1239 @@
             }
         }
+
+        // Enter: Append the metadata value, if we're allowed to
         if (e.getKeyCode() == KeyEvent.VK_ENTER) {
-            // Enter: Append the metadata value, if we're allowed to
             if (add.isEnabled()) {
             add.doClick();
             }
+        }
+
+        // Down: Change the metadata value table selection
+        if (e.getKeyCode() == KeyEvent.VK_DOWN) {
+            metadata_value_table.moveSelectionDown();
+        }
+
+        // Up: Change the metadata value table selection
+        if (e.getKeyCode() == KeyEvent.VK_UP) {
+            metadata_value_table.moveSelectionUp();
         }
         }