Fixes bugs reported by Matthieu Casanova:

- Searchfield get VK_HOME & VK_END events
	- Fix for Searchfield that get undefined  char
    - Fix for NPE in TreeContactList
cusax-fix
Yana Stamcheva 16 years ago
parent 86cd061e08
commit f796ffe2e0

@ -1465,33 +1465,12 @@ public boolean dispatchKeyEvent(KeyEvent e)
TreePath selectionPath = contactList.getSelectionPath();
// No matter who is the focus owner.
if (e.getKeyCode() == KeyEvent.VK_ENTER
|| e.getKeyCode() == KeyEvent.VK_ESCAPE
|| e.getKeyCode() == KeyEvent.VK_LEFT
|| e.getKeyCode() == KeyEvent.VK_RIGHT
|| e.getKeyCode() == KeyEvent.VK_UP
|| e.getKeyCode() == KeyEvent.VK_DOWN
|| e.getKeyCode() == KeyEvent.VK_PAGE_UP
|| e.getKeyCode() == KeyEvent.VK_PAGE_DOWN
if (
e.getKeyChar() == KeyEvent.CHAR_UNDEFINED
|| e.getKeyCode() == KeyEvent.VK_ENTER
|| e.getKeyCode() == KeyEvent.VK_BACK_SPACE
|| e.getKeyCode() == KeyEvent.VK_CONTROL
|| e.getKeyCode() == KeyEvent.VK_ALT
|| e.getKeyCode() == KeyEvent.VK_SHIFT
|| e.getKeyCode() == KeyEvent.VK_META
|| e.getKeyCode() == KeyEvent.VK_TAB
|| e.getKeyCode() == KeyEvent.VK_SPACE
|| e.getKeyCode() == KeyEvent.VK_F1
|| e.getKeyCode() == KeyEvent.VK_F2
|| e.getKeyCode() == KeyEvent.VK_F3
|| e.getKeyCode() == KeyEvent.VK_F4
|| e.getKeyCode() == KeyEvent.VK_F5
|| e.getKeyCode() == KeyEvent.VK_F6
|| e.getKeyCode() == KeyEvent.VK_F7
|| e.getKeyCode() == KeyEvent.VK_F8
|| e.getKeyCode() == KeyEvent.VK_F9
|| e.getKeyCode() == KeyEvent.VK_F10
|| e.getKeyCode() == KeyEvent.VK_F11
|| e.getKeyCode() == KeyEvent.VK_F12
|| (selectionPath != null
&& selectionPath.getLastPathComponent() instanceof GroupNode
&& (e.getKeyChar() == '+'

@ -817,6 +817,11 @@ public void mousePressed(MouseEvent e)
TreePath path = this.getPathForLocation(e.getX(), e.getY());
// If we didn't find any path for the given mouse location, we have
// nothing to do here.
if (path == null)
return;
// Select the node under the right button click.
if (!path.equals(getSelectionPath())
&& (e.getModifiers() & InputEvent.BUTTON1_MASK) != 0

Loading…
Cancel
Save