JAL-1832 improvement to enable result update only when displayed column configuration...

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

diff --git a/src/jalview/jbgui/GPDBSearchPanel.java b/src/jalview/jbgui/GPDBSearchPanel.java
index ee4757e..b0bb5bd 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;
@@ -34,6 +35,7 @@ import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.util.Arrays;
 
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
@@ -100,6 +102,8 @@ tbl_summary);
 
   private BorderLayout mainLayout = new BorderLayout();
 
+  protected PDBDocField[] previousWantedFields;
+
   public GPDBSearchPanel()
   {
     try
@@ -128,14 +132,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 +181,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();
       }
     });
@@ -241,6 +254,7 @@ tbl_summary);
 
     final String searchTabTitle = MessageManager
             .getString("label.search_result");
+    final String configureCols = MessageManager.getString("label.configure_displayed_columns");
     ChangeListener changeListener = new ChangeListener()
     {
       public void stateChanged(ChangeEvent changeEvent)
@@ -248,18 +262,29 @@ tbl_summary);
         JTabbedPane sourceTabbedPane = (JTabbedPane) changeEvent
                 .getSource();
         int index = sourceTabbedPane.getSelectedIndex();
+        btn_ok.setEnabled(false);
+        if (sourceTabbedPane.getTitleAt(index).equals(configureCols))
+        {
+          previousWantedFields = PDBDocFieldPreferences
+                  .getSearchSummaryFields().toArray(new PDBDocField[0]);
+        }
         if (sourceTabbedPane.getTitleAt(index).equals(searchTabTitle))
         {
-          txt_search_ActionPerformed();
+          if (wantedFieldsUpdated())
+          {
+            txt_search_ActionPerformed();
+          }
+          else
+          {
+            validateSelection();
+          }
         }
       }
     };
     tabbedPane.addChangeListener(changeListener);
     tabbedPane.setPreferredSize(new Dimension(500, 300));
     tabbedPane.add(searchTabTitle, scrl_searchResult);
-    tabbedPane.add(
-            MessageManager.getString("label.configure_displayed_columns"),
-            pdbDocFieldPrefs);
+    tabbedPane.add(configureCols, pdbDocFieldPrefs);
 
     pnl_actions.add(btn_back);
     pnl_actions.add(btn_ok);
@@ -280,6 +305,29 @@ tbl_summary);
     Desktop.addInternalFrame(mainFrame, frameTitle, 800, 400);
   }
 
+  public boolean wantedFieldsUpdated()
+  {
+    if (previousWantedFields == null)
+    {
+      return true;
+    }
+
+    return Arrays.equals(PDBDocFieldPreferences.getSearchSummaryFields()
+            .toArray(new PDBDocField[0]), previousWantedFields) ? false
+            : true;
+
+  }
+  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;