X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGPDBSearchPanel.java;h=7543b53290830dc96288618efc37baad556c2cc4;hb=abcfb92b105fb0bac6648c863c4141d691635e2a;hp=f133a6155bd9e1f376b399c3dc0afb8c499395f6;hpb=31a33833640b743a506f7801388b17f96e915ef3;p=jalview.git

diff --git a/src/jalview/jbgui/GPDBSearchPanel.java b/src/jalview/jbgui/GPDBSearchPanel.java
index f133a61..7543b53 100644
--- a/src/jalview/jbgui/GPDBSearchPanel.java
+++ b/src/jalview/jbgui/GPDBSearchPanel.java
@@ -72,11 +72,11 @@ public abstract class GPDBSearchPanel extends JPanel
   protected JButton btn_ok = new JButton();
 
   protected JButton btn_back = new JButton();
-  
+
   protected JButton btn_cancel = new JButton();
-  
+
   protected JTextField txt_search = new JTextField(20);
-  
+
   protected JTable tbl_summary = new JTable()
   {
     public String getToolTipText(MouseEvent evt)
@@ -95,10 +95,8 @@ public abstract class GPDBSearchPanel extends JPanel
       }
       toolTipText = (toolTipText == null ? null
               : (toolTipText.length() > 500 ? JvSwingUtils.wrapTooltip(
-                      true, toolTipText.subSequence(0, 500)
- + "...")
-                      : JvSwingUtils.wrapTooltip(true,
-                      toolTipText)));
+                      true, toolTipText.subSequence(0, 500) + "...")
+                      : JvSwingUtils.wrapTooltip(true, toolTipText)));
 
       return toolTipText;
     }
@@ -106,14 +104,18 @@ public abstract class GPDBSearchPanel extends JPanel
 
   protected StringBuilder errorWarning = new StringBuilder();
 
-  protected JScrollPane scrl_searchResult = new JScrollPane(
-tbl_summary);
+  protected JScrollPane scrl_searchResult = new JScrollPane(tbl_summary);
 
   protected ImageIcon warningImage = new ImageIcon(getClass().getResource(
           "/images/warning.gif"));
 
+  protected ImageIcon loadingImage = new ImageIcon(getClass().getResource(
+          "/images/loading.gif"));
+
   protected JLabel lbl_warning = new JLabel(warningImage);
 
+  protected JLabel lbl_loading = new JLabel(loadingImage);
+
   private JTabbedPane tabbedPane = new JTabbedPane();
 
   private PDBDocFieldPreferences pdbDocFieldPrefs = new PDBDocFieldPreferences(
@@ -151,6 +153,8 @@ tbl_summary);
   {
     lbl_warning.setVisible(false);
     lbl_warning.setFont(new java.awt.Font("Verdana", 0, 12));
+    lbl_loading.setVisible(false);
+    lbl_loading.setFont(new java.awt.Font("Verdana", 0, 12));
 
     tbl_summary.setAutoCreateRowSorter(true);
     tbl_summary.getTableHeader().setReorderingAllowed(false);
@@ -160,11 +164,33 @@ tbl_summary);
       {
         validateSelection();
       }
+
       public void mouseReleased(MouseEvent e)
       {
         validateSelection();
       }
     });
+    tbl_summary.addKeyListener(new KeyAdapter()
+    {
+      @Override
+      public void keyPressed(KeyEvent evt)
+      {
+        validateSelection();
+        switch (evt.getKeyCode())
+        {
+        case KeyEvent.VK_ESCAPE: // escape key
+          btn_back_ActionPerformed();
+          break;
+        case KeyEvent.VK_ENTER: // enter key
+          btn_ok_ActionPerformed();
+          break;
+        case KeyEvent.VK_TAB: // tab key
+          btn_back.requestFocus();
+        default:
+          return;
+        }
+      }
+    });
 
     btn_back.setFont(new java.awt.Font("Verdana", 0, 12));
     btn_back.setText(MessageManager.getString("action.back"));
@@ -175,6 +201,17 @@ tbl_summary);
         btn_back_ActionPerformed();
       }
     });
+    btn_back.addKeyListener(new KeyAdapter()
+    {
+      @Override
+      public void keyPressed(KeyEvent evt)
+      {
+        if (evt.getKeyCode() == KeyEvent.VK_ENTER)
+        {
+          btn_back_ActionPerformed();
+        }
+      }
+    });
 
     btn_ok.setEnabled(false);
     btn_ok.setFont(new java.awt.Font("Verdana", 0, 12));
@@ -186,6 +223,18 @@ tbl_summary);
         btn_ok_ActionPerformed();
       }
     });
+    btn_ok.addKeyListener(new KeyAdapter()
+    {
+      @Override
+      public void keyPressed(KeyEvent evt)
+      {
+        if (evt.getKeyCode() == KeyEvent.VK_ENTER)
+        {
+          btn_ok_ActionPerformed();
+        }
+      }
+    });
+
     btn_cancel.setFont(new java.awt.Font("Verdana", 0, 12));
     btn_cancel.setText(MessageManager.getString("action.cancel"));
     btn_cancel.addActionListener(new java.awt.event.ActionListener()
@@ -195,7 +244,17 @@ tbl_summary);
         btn_cancel_ActionPerformed();
       }
     });
-
+    btn_cancel.addKeyListener(new KeyAdapter()
+    {
+      @Override
+      public void keyPressed(KeyEvent evt)
+      {
+        if (evt.getKeyCode() == KeyEvent.VK_ENTER)
+        {
+          btn_cancel_ActionPerformed();
+        }
+      }
+    });
 
     scrl_searchResult.setPreferredSize(new Dimension(500, 300));
     scrl_searchResult
@@ -222,8 +281,9 @@ tbl_summary);
         else
         {
           tooltipText = MessageManager.formatMessage(
-                  "label.separate_multiple_query_values", new Object[]
-                  { getCmbSearchTarget().getSelectedItem().toString() });
+                  "label.separate_multiple_query_values",
+                  new Object[] { getCmbSearchTarget().getSelectedItem()
+                          .toString() });
         }
         txt_search.setToolTipText(JvSwingUtils.wrapTooltip(true,
                 tooltipText));
@@ -233,7 +293,6 @@ tbl_summary);
 
     populateCmbSearchTargetOptions();
 
-
     txt_search.setFont(new java.awt.Font("Verdana", 0, 12));
 
     txt_search.addKeyListener(new KeyAdapter()
@@ -280,7 +339,8 @@ tbl_summary);
 
     final String searchTabTitle = MessageManager
             .getString("label.search_result");
-    final String configureCols = MessageManager.getString("label.configure_displayed_columns");
+    final String configureCols = MessageManager
+            .getString("label.configure_displayed_columns");
     ChangeListener changeListener = new ChangeListener()
     {
       public void stateChanged(ChangeEvent changeEvent)
@@ -323,6 +383,7 @@ tbl_summary);
     pnl_results.add(tabbedPane);
     pnl_inputs.add(cmb_searchTarget);
     pnl_inputs.add(txt_search);
+    pnl_inputs.add(lbl_loading);
     pnl_inputs.add(lbl_warning);
 
     this.setLayout(mainLayout);
@@ -347,6 +408,7 @@ tbl_summary);
             : true;
 
   }
+
   public void validateSelection()
   {
     if (tbl_summary.getSelectedRows().length > 0)
@@ -358,6 +420,7 @@ tbl_summary);
       btn_ok.setEnabled(false);
     }
   }
+
   public JComboBox<PDBDocField> getCmbSearchTarget()
   {
     return cmb_searchTarget;