X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGStructureChooser.java;h=85960810a1d64efa35e2f9f4c87f567157e3817d;hb=5713273d984e4de3b840ae7295ca8b151d8743cc;hp=7daf09b22fee150eac5f977721c24af32030f655;hpb=8e2f91c6975f077f4313a516a46a5a42b6388b3a;p=jalview.git

diff --git a/src/jalview/jbgui/GStructureChooser.java b/src/jalview/jbgui/GStructureChooser.java
index 7daf09b..8596081 100644
--- a/src/jalview/jbgui/GStructureChooser.java
+++ b/src/jalview/jbgui/GStructureChooser.java
@@ -26,6 +26,8 @@ import jalview.gui.AlignmentPanel;
 import jalview.gui.Desktop;
 import jalview.jbgui.PDBDocFieldPreferences.PreferenceSource;
 import jalview.util.MessageManager;
+import jalview.ws.dbsources.PDBRestClient;
+import jalview.ws.dbsources.PDBRestClient.PDBDocField;
 
 import java.awt.BorderLayout;
 import java.awt.CardLayout;
@@ -36,6 +38,7 @@ import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.util.Arrays;
 
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
@@ -159,6 +162,7 @@ public abstract class GStructureChooser extends JPanel implements
   private PDBDocFieldPreferences pdbDocFieldPrefs = new PDBDocFieldPreferences(
           PreferenceSource.STRUCTURE_CHOOSER);
 
+  protected PDBDocField[] previousWantedFields;
   public GStructureChooser()
   {
     try
@@ -291,27 +295,41 @@ public abstract class GStructureChooser extends JPanel implements
     
     final String foundStructureSummary = MessageManager
             .getString("label.found_structures_summary");
-
+    final String configureCols = MessageManager
+            .getString("label.configure_displayed_columns");
     ChangeListener changeListener = new ChangeListener()
     {
       public void stateChanged(ChangeEvent changeEvent)
       {
         JTabbedPane sourceTabbedPane = (JTabbedPane) changeEvent
                 .getSource();
+        btn_view.setEnabled(false);
         int index = sourceTabbedPane.getSelectedIndex();
         if (sourceTabbedPane.getTitleAt(index)
+.equals(configureCols))
+        {
+          previousWantedFields = PDBDocFieldPreferences
+                  .getStructureSummaryFields().toArray(
+                          new PDBRestClient.PDBDocField[0]);
+        }
+        if (sourceTabbedPane.getTitleAt(index)
                 .equals(foundStructureSummary))
         {
-          tabRefresh();
+          if (wantedFieldsUpdated())
+          {
+            tabRefresh();
+          }
+          else
+          {
+            validateSelections();
+          }
         }
       }
     };
     pnl_filter.addChangeListener(changeListener);
     pnl_filter.setPreferredSize(new Dimension(500, 300));
     pnl_filter.add(foundStructureSummary, scrl_foundStructures);
-    pnl_filter.add(
-            MessageManager.getString("label.configure_displayed_columns"),
-            pdbDocFieldPrefs);
+    pnl_filter.add(configureCols, pdbDocFieldPrefs);
     
     pnl_locPDB.add(scrl_localPDB);
 
@@ -331,6 +349,18 @@ public abstract class GStructureChooser extends JPanel implements
     Desktop.addInternalFrame(mainFrame, frameTitle, 800, 400);
   }
 
+  public boolean wantedFieldsUpdated()
+  {
+    if (previousWantedFields == null)
+    {
+      return true;
+    }
+
+    return Arrays.equals(PDBDocFieldPreferences.getStructureSummaryFields()
+            .toArray(new PDBRestClient.PDBDocField[0]),
+            previousWantedFields) ? false : true;
+
+  }
   
   @Override
   /**
@@ -522,4 +552,6 @@ public abstract class GStructureChooser extends JPanel implements
   public abstract void cmbAssSeqStateChanged();
 
   public abstract void tabRefresh();
+
+  public abstract void validateSelections();
 }