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
JAL-1860 only allow enter key when valid selection are made and the veiew/ok button...
[jalview.git]
/
src
/
jalview
/
jbgui
/
GStructureChooser.java
diff --git
a/src/jalview/jbgui/GStructureChooser.java
b/src/jalview/jbgui/GStructureChooser.java
index
802cc0d
..
73a5615
100644
(file)
--- a/
src/jalview/jbgui/GStructureChooser.java
+++ b/
src/jalview/jbgui/GStructureChooser.java
@@
-235,10
+235,13
@@
public abstract class GStructureChooser extends JPanel implements
mainFrame.dispose();
break;
case KeyEvent.VK_ENTER: // enter key
mainFrame.dispose();
break;
case KeyEvent.VK_ENTER: // enter key
- ok_ActionPerformed();
+ if (btn_view.isEnabled())
+ {
+ ok_ActionPerformed();
+ }
break;
case KeyEvent.VK_TAB: // tab key
break;
case KeyEvent.VK_TAB: // tab key
- btn_cancel.requestFocus();
+ btn_view.requestFocus();
default:
return;
}
default:
return;
}
@@
-270,7
+273,10
@@
public abstract class GStructureChooser extends JPanel implements
mainFrame.dispose();
break;
case KeyEvent.VK_ENTER: // enter key
mainFrame.dispose();
break;
case KeyEvent.VK_ENTER: // enter key
- ok_ActionPerformed();
+ if (btn_view.isEnabled())
+ {
+ ok_ActionPerformed();
+ }
break;
case KeyEvent.VK_TAB: // tab key
btn_cancel.requestFocus();
break;
case KeyEvent.VK_TAB: // tab key
btn_cancel.requestFocus();