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 c235560..b0bb5bd 100644 (file)
--- a/src/jalview/jbgui/GPDBSearchPanel.java
+++ b/src/jalview/jbgui/GPDBSearchPanel.java
@@ -35,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;
@@ -101,6 +102,8 @@ tbl_summary);
 
   private BorderLayout mainLayout = new BorderLayout();
 
+  protected PDBDocField[] previousWantedFields;
+
   public GPDBSearchPanel()
   {
     try
@@ -251,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)
@@ -258,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);
@@ -290,6 +305,18 @@ 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)