Changeset 8367

Timestamp:

2004-10-19T09:15:29+13:00 (20 years ago)

Author:

mdewsnip

Message:

More code for speeding up metadata editing: focus stays on metadata value text field.

File:

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

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

@@ -89 +89 @@
     static final private String TABLE_CARD_NO_METADATA_AVAILABLE = "No metadata available";
 
+    private JTextField metadata_value_text_field = null;
     /** The MetadataValueTree graphically shows the available metadata that has been previously assigned, and provides controls for adding, updating and removing metadata, depending on the user's selections in the other important components. */
     private MetadataValueTree metadata_value_tree = null;
@@ -170 +171 @@
     Dictionary.registerBoth(expand_for_extracted, "MetaEdit.Expand", "MetaEdit.Expand_Tooltip");
 
+    metadata_value_text_field = new JTextField();
     metadata_value_table = new MetadataValueTable();
     metadata_value_tree = new MetadataValueTree(CONTROL_SIZE.width, CONTROL_SIZE.height);
@@ -737 +739 @@
 
         changeSelection(optimal_row_to_select, 1, false, false);
+        metadata_value_text_field.requestFocus();
     }
 
@@ -839 +842 @@
             repostEvent(e);
         }
-        else if (isRequestFocusEnabled()) {
-            requestFocus();
-        }
+        // Commented this out and added the line below it to keep the value text field in focus
+        // else if (isRequestFocusEnabled()) {
+        // requestFocus();
+        // }
+        metadata_value_text_field.requestFocus();
 
         CellEditor editor = getCellEditor();
@@ -955 +960 @@
     private MetadataElement selected_metadata_element = null;
     private JTextArea extracted_message;
-    private JTextField value;
     private JTree tree;
 
@@ -976 +980 @@
 
         JPanel value_field_pane = new JPanel();
-        value = new JTextField();
-        value.setBackground(Configuration.getColor("coloring.editable_background", false));
-        value.setForeground(Configuration.getColor("coloring.editable_foreground", false));
-        value.setPreferredSize(new Dimension(413, 24));
-        value.getDocument().addDocumentListener(new DocumentListenerImpl());
-        value.addKeyListener(new MetadataFieldListener());
-        value.setFocusTraversalKeysEnabled(false);
-        Dictionary.setTooltip(value, "MetaEdit.Value_Field_Tooltip");
+        metadata_value_text_field.setBackground(Configuration.getColor("coloring.editable_background", false));
+        metadata_value_text_field.setForeground(Configuration.getColor("coloring.editable_foreground", false));
+        metadata_value_text_field.setPreferredSize(new Dimension(413, 24));
+        metadata_value_text_field.getDocument().addDocumentListener(new DocumentListenerImpl());
+        metadata_value_text_field.addKeyListener(new MetadataFieldListener());
+        metadata_value_text_field.setFocusTraversalKeysEnabled(false);
+        Dictionary.setTooltip(metadata_value_text_field, "MetaEdit.Value_Field_Tooltip");
 
         JPanel button_pane = new JPanel();
@@ -1010 +1013 @@
         value_field_pane.setBorder(BorderFactory.createEmptyBorder(0,5,0,5));
         value_field_pane.setLayout(new BorderLayout(0, 0));
-        value_field_pane.add(value, BorderLayout.CENTER);
+        value_field_pane.add(metadata_value_text_field, BorderLayout.CENTER);
 
         button_pane.setBorder(BorderFactory.createEmptyBorder(5,0,0,0));
@@ -1094 +1097 @@
     public String getSelectedValue()
     {
-        return value.getText().replaceAll("\\\\", MetadataValueTreeNode.METADATA_VALUE_TREE_NODE_HIERARCHY_TOKEN);
+        return metadata_value_text_field.getText().replaceAll("\\\\", MetadataValueTreeNode.METADATA_VALUE_TREE_NODE_HIERARCHY_TOKEN);
     }
 
@@ -1148 +1151 @@
         if (!card_showing.equals(NONE)) {
         manual_text_edit_event = metadata_value.equals("");  // Set to false unless val == ""
-        value.setText(metadata_value);
+        metadata_value_text_field.setText(metadata_value);
         manual_text_edit_event = true;
         }