X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGPDBSearchPanel.java;h=c235560454d47ffbd5a8f13141d85862cd8684fa;hb=5247711ab4a6453614e2a9fb9307e6bae6a7b4a9;hp=e74f0efa5ac805ac83d5aabb5a2b1e5b70118fe8;hpb=2e9f37c7818e03fc46d626f288cb6b7d03e4c2f5;p=jalview.git

diff --git a/src/jalview/jbgui/GPDBSearchPanel.java b/src/jalview/jbgui/GPDBSearchPanel.java
index e74f0ef..c235560 100644
--- a/src/jalview/jbgui/GPDBSearchPanel.java
+++ b/src/jalview/jbgui/GPDBSearchPanel.java
@@ -22,6 +22,7 @@
 package jalview.jbgui;
 
 import jalview.gui.Desktop;
+import jalview.gui.JvSwingUtils;
 import jalview.jbgui.PDBDocFieldPreferences.PreferenceSource;
 import jalview.util.MessageManager;
 import jalview.ws.dbsources.PDBRestClient.PDBDocField;
@@ -30,13 +31,17 @@ import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 
+import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JComboBox;
 import javax.swing.JFrame;
 import javax.swing.JInternalFrame;
+import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTabbedPane;
@@ -73,9 +78,16 @@ public abstract class GPDBSearchPanel extends JPanel
   
   protected JTable tbl_summary = new JTable();
 
+  protected StringBuilder errorWarning = new StringBuilder();
+
   protected JScrollPane scrl_searchResult = new JScrollPane(
 tbl_summary);
 
+  protected ImageIcon warningImage = new ImageIcon(getClass().getResource(
+          "/images/warning.gif"));
+
+  protected JLabel lbl_warning = new JLabel(warningImage);
+
   private JTabbedPane tabbedPane = new JTabbedPane();
 
   private PDBDocFieldPreferences pdbDocFieldPrefs = new PDBDocFieldPreferences(
@@ -109,19 +121,19 @@ tbl_summary);
    */
   private void jbInit() throws Exception
   {
+    lbl_warning.setVisible(false);
+    lbl_warning.setFont(new java.awt.Font("Verdana", 0, 12));
+
     tbl_summary.setAutoCreateRowSorter(true);
     tbl_summary.addMouseListener(new MouseAdapter()
     {
       public void mouseClicked(MouseEvent e)
       {
-        if (tbl_summary.getSelectedRows().length > 0)
-        {
-          btn_ok.setEnabled(true);
-        }
-        else
-        {
-          btn_ok.setEnabled(false);
-        }
+        validateSelection();
+      }
+      public void mouseReleased(MouseEvent e)
+      {
+        validateSelection();
       }
     });
 
@@ -166,13 +178,56 @@ tbl_summary);
       @Override
       public void actionPerformed(ActionEvent e)
       {
+        String tooltipText;
+        if ("all".equalsIgnoreCase(getCmbSearchTarget().getSelectedItem()
+                .toString()))
+        {
+          tooltipText = MessageManager.getString("label.search_all");
+        }
+        else if ("pdb id".equalsIgnoreCase(getCmbSearchTarget()
+                .getSelectedItem().toString()))
+        {
+          tooltipText = MessageManager
+                  .getString("label.separate_multiple_accession_ids");
+        }
+        else
+        {
+          tooltipText = MessageManager.formatMessage(
+                  "label.separate_multiple_query_values", new Object[]
+                  { getCmbSearchTarget().getSelectedItem().toString() });
+        }
+        txt_search.setToolTipText(JvSwingUtils.wrapTooltip(true,
+                tooltipText));
         txt_search_ActionPerformed();
       }
     });
 
     populateCmbSearchTargetOptions();
 
+
     txt_search.setFont(new java.awt.Font("Verdana", 0, 12));
+
+    txt_search.addKeyListener(new KeyAdapter()
+    {
+      @Override
+      public void keyPressed(KeyEvent e)
+      {
+        if (e.getKeyCode() == KeyEvent.VK_ENTER)
+        {
+          if (txt_search.getText() == null
+                  || txt_search.getText().isEmpty())
+          {
+            return;
+          }
+          if ("pdb id".equalsIgnoreCase(getCmbSearchTarget()
+                  .getSelectedItem().toString()))
+          {
+            transferToSequenceFetcher(txt_search.getText());
+          }
+        }
+      }
+    });
+
     txt_search.getDocument().addDocumentListener(new DocumentListener()
     {
       @Override
@@ -223,6 +278,7 @@ tbl_summary);
     pnl_results.add(tabbedPane);
     pnl_inputs.add(cmb_searchTarget);
     pnl_inputs.add(txt_search);
+    pnl_inputs.add(lbl_warning);
 
     this.setLayout(mainLayout);
     this.add(pnl_inputs, java.awt.BorderLayout.NORTH);
@@ -234,6 +290,17 @@ tbl_summary);
     Desktop.addInternalFrame(mainFrame, frameTitle, 800, 400);
   }
 
+  public void validateSelection()
+  {
+    if (tbl_summary.getSelectedRows().length > 0)
+    {
+      btn_ok.setEnabled(true);
+    }
+    else
+    {
+      btn_ok.setEnabled(false);
+    }
+  }
   public JComboBox<PDBDocField> getCmbSearchTarget()
   {
     return cmb_searchTarget;
@@ -249,6 +316,8 @@ tbl_summary);
     return mainFrame;
   }
 
+  public abstract void transferToSequenceFetcher(String ids);
+
   public abstract void txt_search_ActionPerformed();
 
   public abstract void btn_ok_ActionPerformed();