Merge branch 'Release_2_9_0b1_Branch'

[jalview.git] / src / jalview / jbgui / GStructureChooser.java

diff --git a/src/jalview/jbgui/GStructureChooser.java b/src/jalview/jbgui/GStructureChooser.java
index 802cc0d..67b3a20 100644 (file)
--- a/src/jalview/jbgui/GStructureChooser.java
+++ b/src/jalview/jbgui/GStructureChooser.java
@@ -164,7 +164,7 @@ public abstract class GStructureChooser extends JPanel implements
         toolTipText = getValueAt(rowIndex, colIndex).toString();
       } catch (Exception e)
       {
-        e.printStackTrace();
+        // e.printStackTrace();
       }
       toolTipText = (toolTipText == null ? null
               : (toolTipText.length() > 500 ? JvSwingUtils.wrapTooltip(
@@ -235,10 +235,22 @@ public abstract class GStructureChooser extends JPanel implements
           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();
+          if (evt.isShiftDown())
+          {
+            pnl_filter.requestFocus();
+          }
+          else
+          {
+            btn_view.requestFocus();
+          }
+          evt.consume();
+          break;
         default:
           return;
         }
@@ -270,10 +282,28 @@ public abstract class GStructureChooser extends JPanel implements
           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();
+          if (evt.isShiftDown())
+          {
+            cmb_filterOption.requestFocus();
+          }
+          else
+          {
+            if (btn_view.isEnabled())
+            {
+              btn_view.requestFocus();
+            }
+            else
+            {
+              btn_cancel.requestFocus();
+            }
+          }
+          evt.consume();
         default:
           return;
         }