JAL-1748 house keeping

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

diff --git a/src/jalview/jbgui/GPDBSearchPanel.java b/src/jalview/jbgui/GPDBSearchPanel.java
index ee4757e..c235560 100644 (file)
--- 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;
@@ -128,14 +129,11 @@ tbl_summary);
     {
       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();
       }
     });
 
@@ -180,14 +178,26 @@ tbl_summary);
       @Override
       public void actionPerformed(ActionEvent e)
       {
-        txt_search.setToolTipText(MessageManager
-                .getString("label.separate_multiple_query_values"));
-        if ("pdb id".equalsIgnoreCase(getCmbSearchTarget()
+        String tooltipText;
+        if ("all".equalsIgnoreCase(getCmbSearchTarget().getSelectedItem()
+                .toString()))
+        {
+          tooltipText = MessageManager.getString("label.search_all");
+        }
+        else if ("pdb id".equalsIgnoreCase(getCmbSearchTarget()
                 .getSelectedItem().toString()))
         {
-          txt_search.setToolTipText(MessageManager
-                  .getString("label.separate_multiple_accession_ids"));
+          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();
       }
     });
@@ -280,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;