From dd87fa6e6c935710314ccd705097dbcada97b87c Mon Sep 17 00:00:00 2001 From: tcofoegbu Date: Wed, 30 Sep 2015 16:07:47 +0100 Subject: [PATCH 1/1] JAL-1860 house keeping --- src/jalview/jbgui/GPDBSearchPanel.java | 3 ++- src/jalview/jbgui/GStructureChooser.java | 12 ++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/jalview/jbgui/GPDBSearchPanel.java b/src/jalview/jbgui/GPDBSearchPanel.java index ddb2f7a..a105999 100644 --- a/src/jalview/jbgui/GPDBSearchPanel.java +++ b/src/jalview/jbgui/GPDBSearchPanel.java @@ -191,12 +191,13 @@ public abstract class GPDBSearchPanel extends JPanel case KeyEvent.VK_TAB: // tab key if (evt.isShiftDown()) { - txt_search.requestFocus(); + tabbedPane.requestFocus(); } else { btn_back.requestFocus(); } + evt.consume(); break; default: return; diff --git a/src/jalview/jbgui/GStructureChooser.java b/src/jalview/jbgui/GStructureChooser.java index cf80613..1334021 100644 --- a/src/jalview/jbgui/GStructureChooser.java +++ b/src/jalview/jbgui/GStructureChooser.java @@ -243,12 +243,13 @@ public abstract class GStructureChooser extends JPanel implements case KeyEvent.VK_TAB: // tab key if (evt.isShiftDown()) { - chk_invertFilter.requestFocus(); + pnl_filter.requestFocus(); } else { btn_view.requestFocus(); } + evt.consume(); break; default: return; @@ -293,9 +294,16 @@ public abstract class GStructureChooser extends JPanel implements } else { + if (btn_view.isEnabled()) + { btn_view.requestFocus(); + } + else + { + btn_cancel.requestFocus(); + } } - + evt.consume(); default: return; } -- 1.7.10.2