git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge from develop
[jalview.git]
/
src
/
jalview
/
gui
/
JDatabaseTree.java
diff --git
a/src/jalview/gui/JDatabaseTree.java
b/src/jalview/gui/JDatabaseTree.java
index
94ac141
..
207c600
100644
(file)
--- a/
src/jalview/gui/JDatabaseTree.java
+++ b/
src/jalview/gui/JDatabaseTree.java
@@
-60,6
+60,8
@@
public class JDatabaseTree extends JalviewDialog implements KeyListener
{
boolean allowMultiSelections = false;
{
boolean allowMultiSelections = false;
+ public int action;
+
JButton getDatabaseSelectorButton()
{
final JButton viewdbs = new JButton(
JButton getDatabaseSelectorButton()
{
final JButton viewdbs = new JButton(
@@
-544,10
+546,12
@@
public class JDatabaseTree extends JalviewDialog implements KeyListener
{
if (!arg0.isConsumed() && arg0.getKeyCode() == KeyEvent.VK_ENTER)
{
{
if (!arg0.isConsumed() && arg0.getKeyCode() == KeyEvent.VK_ENTER)
{
+ action = arg0.getKeyCode();
okPressed();
}
if (!arg0.isConsumed() && arg0.getKeyChar() == KeyEvent.VK_ESCAPE)
{
okPressed();
}
if (!arg0.isConsumed() && arg0.getKeyChar() == KeyEvent.VK_ESCAPE)
{
+ action = arg0.getKeyCode();
cancelPressed();
}
}
cancelPressed();
}
}