Merge branch 'develop' into features/JAL-1912_biojson-per-sequence-annotation

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

diff --git a/src/jalview/jbgui/GStructureChooser.java b/src/jalview/jbgui/GStructureChooser.java
index cf80613..25924f0 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(
@@ -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;
         }