Changeset 8503

Timestamp:

2004-11-10T11:06:50+13:00 (19 years ago)

Author:

mdewsnip

Message:

Can now double-click on a leaf node in the value tree to assign it immediately.

File:

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

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

@@ -951 +951 @@
     private class MetadataValueTree
     extends JPanel
-    implements TreeSelectionListener
     {
     private boolean ignore_tree_selection_event = false;
@@ -984 +983 @@
         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.addKeyListener(new MetadataValueTextFieldKeyListener());
         metadata_value_text_field.setFocusTraversalKeysEnabled(false);
         Dictionary.setTooltip(metadata_value_text_field, "MetaEdit.Value_Field_Tooltip");
@@ -995 +994 @@
 
         tree = new JTree();
-        tree.addTreeSelectionListener(this);
+        tree.addMouseListener(new MetadataValueTreeMouseListener());
+        tree.addTreeSelectionListener(new MetadataValueTreeSelectionListener());
         tree.getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);
         tree.setRootVisible(false);
@@ -1217 +1217 @@
 
 
-    /** Handles TreeSelectionEvents. */
-    public void valueChanged(TreeSelectionEvent event)
-    {
-        if (tree.getSelectionCount() != 0 && !ignore_tree_selection_event) {
-        TreePath path = tree.getSelectionPath();
-        MetadataValueTreeNode node = (MetadataValueTreeNode) path.getLastPathComponent();
-        setSelectedValue(node.getFullValue());
-        }
-    }
-
-
-    private class MetadataFieldListener
-        implements KeyListener {
-
+    private class MetadataValueTextFieldKeyListener
+        extends KeyAdapter
+    {
         /** Gives notification of key events on the text field */
         public void keyPressed(KeyEvent e)
@@ -1260 +1249 @@
         }
         }
-
-        public void keyReleased(KeyEvent e) { }
-
-        public void keyTyped(KeyEvent e) { }
+    }
+
+
+    private class MetadataValueTreeMouseListener
+        extends MouseAdapter
+    {
+        public void mouseClicked(MouseEvent e)
+        {
+        // Double click: assign the selected value tree node immediately (if possible)
+        if (e.getClickCount() == 2 && tree.getSelectionCount() != 0) {
+            TreePath path = tree.getSelectionPath();
+            MetadataValueTreeNode node = (MetadataValueTreeNode) path.getLastPathComponent();
+
+            // Leaf nodes only (folder nodes will expand/contract)
+            if (node.getChildCount() == 0 && add.isEnabled()) {
+            add.doClick();
+            }
+        }
+        }
+    }
+
+
+    private class MetadataValueTreeSelectionListener
+        implements TreeSelectionListener
+    {
+        public void valueChanged(TreeSelectionEvent event)
+        {
+        // Select a node in the tree: fill the metadata value text field with the selected node's value
+        if (tree.getSelectionCount() != 0 && !ignore_tree_selection_event) {
+            TreePath path = tree.getSelectionPath();
+            MetadataValueTreeNode node = (MetadataValueTreeNode) path.getLastPathComponent();
+            setSelectedValue(node.getFullValue());
+        }
+        }
     }
 
@@ -1344 +1363 @@
         }
         tree.setImmediate(false);
-        } else if (event.getKeyCode() == KeyEvent.VK_LEFT) {
+        }
+        else if (event.getKeyCode() == KeyEvent.VK_LEFT) {
         // left key on a file shifts the selection to the parent folder
         DragTree tree = (DragTree)event.getSource();