JAL-1668 Tab for summary config, auto refresh after config and table column sorting

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

diff --git a/src/jalview/jbgui/GStructureChooser.java b/src/jalview/jbgui/GStructureChooser.java
index 080fce9..b79a7f7 100644 (file)
--- a/src/jalview/jbgui/GStructureChooser.java
+++ b/src/jalview/jbgui/GStructureChooser.java
@@ -24,6 +24,7 @@ package jalview.jbgui;
 import jalview.datamodel.SequenceI;
 import jalview.gui.AlignmentPanel;
 import jalview.gui.Desktop;
+import jalview.jbgui.PDBDocFieldPreferences.PreferenceSource;
 import jalview.util.MessageManager;
 
 import java.awt.BorderLayout;
@@ -43,8 +44,11 @@ import javax.swing.JInternalFrame;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
+import javax.swing.JTabbedPane;
 import javax.swing.JTable;
 import javax.swing.JTextField;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 
@@ -64,7 +68,6 @@ public abstract class GStructureChooser extends JPanel implements
 
   protected JComboBox<FilterOption> cmb_filterOption = new JComboBox<FilterOption>();
 
-
   protected AlignmentPanel ap;
 
   protected JLabel lbl_result = new JLabel(
@@ -118,6 +121,7 @@ public abstract class GStructureChooser extends JPanel implements
 
   protected JLabel lbl_fromFileStatus = new JLabel(errorImage);
 
+
   protected AssciateSeqPanel idInputAssSeqPanel = new AssciateSeqPanel();
 
   protected AssciateSeqPanel fileChooserAssSeqPanel = new AssciateSeqPanel();
@@ -128,14 +132,16 @@ public abstract class GStructureChooser extends JPanel implements
 
   protected static final String VIEWS_ENTER_ID = "VIEWS_ENTER_ID";
 
-  // protected JList<PDBResponseSummary> jList_FoundStructures = new
-  // JList<PDBResponseSummary>();
-
   protected JTable tbl_summary = new JTable();
 
   protected JScrollPane scrl_foundStructures = new JScrollPane(
           tbl_summary);
 
+  private JTabbedPane tabbedPane = new JTabbedPane();
+
+  private PDBDocFieldPreferences pdbDocFieldPrefs = new PDBDocFieldPreferences(
+          PreferenceSource.STRUCTURE_CHOOSER);
+
   public GStructureChooser()
   {
     try
@@ -157,6 +163,7 @@ public abstract class GStructureChooser extends JPanel implements
    */
   private void jbInit() throws Exception
   {
+    tbl_summary.setAutoCreateRowSorter(true);
     btn_view.setFont(new java.awt.Font("Verdana", 0, 12));
     btn_view.setText(MessageManager.getString("action.view"));
     btn_view.addActionListener(new java.awt.event.ActionListener()
@@ -195,18 +202,6 @@ public abstract class GStructureChooser extends JPanel implements
     chk_invertFilter.setFont(new java.awt.Font("Verdana", 0, 12));
     chk_rememberSettings.setFont(new java.awt.Font("Verdana", 0, 12));
 
-    cmb_filterOption.addItemListener(this);
-    chk_invertFilter.addItemListener(this);
-
-    pnl_actions.add(chk_rememberSettings);
-    pnl_actions.add(btn_view);
-    pnl_actions.add(btn_cancel);
-
-    // pnl_filter.add(lbl_result);
-    pnl_filter.add(cmb_filterOption);
-    pnl_filter.add(lbl_loading);
-    pnl_filter.add(chk_invertFilter);
-    lbl_loading.setVisible(false);
 
     txt_search.setToolTipText(MessageManager
             .getString("label.enter_pdb_id"));
@@ -232,6 +227,20 @@ public abstract class GStructureChooser extends JPanel implements
         txt_search_ActionPerformed();
       }
     });
+
+    cmb_filterOption.addItemListener(this);
+    chk_invertFilter.addItemListener(this);
+
+    pnl_actions.add(chk_rememberSettings);
+    pnl_actions.add(btn_view);
+    pnl_actions.add(btn_cancel);
+
+    // pnl_filter.add(lbl_result);
+    pnl_filter.add(cmb_filterOption);
+    pnl_filter.add(lbl_loading);
+    pnl_filter.add(chk_invertFilter);
+    lbl_loading.setVisible(false);
+
     pnl_idInput.add(txt_search);
     pnl_idInput.add(lbl_pdbManualFetchStatus);
 
@@ -243,10 +252,35 @@ public abstract class GStructureChooser extends JPanel implements
 
     pnl_idInputBL.add(idInputAssSeqPanel, BorderLayout.NORTH);
     pnl_idInputBL.add(pnl_idInput, BorderLayout.CENTER);
+    
+    final String foundStructureSummary = MessageManager
+            .getString("label.found_structures_summary");
+
+    ChangeListener changeListener = new ChangeListener()
+    {
+      public void stateChanged(ChangeEvent changeEvent)
+      {
+        JTabbedPane sourceTabbedPane = (JTabbedPane) changeEvent
+                .getSource();
+        int index = sourceTabbedPane.getSelectedIndex();
+        if (sourceTabbedPane.getTitleAt(index)
+                .equals(foundStructureSummary))
+        {
+          tabRefresh();
+        }
+      }
+    };
+    tabbedPane.addChangeListener(changeListener);
+    tabbedPane.setPreferredSize(new Dimension(500, 300));
+    tabbedPane.add(foundStructureSummary, scrl_foundStructures);
+    tabbedPane.add(
+            MessageManager.getString("label.configure_displayed_columns"),
+            pdbDocFieldPrefs);
+    
 
     pnl_switchableViews.add(pnl_fileChooserBL, VIEWS_FROM_FILE);
     pnl_switchableViews.add(pnl_idInputBL, VIEWS_ENTER_ID);
-    pnl_switchableViews.add(scrl_foundStructures, VIEWS_FILTER);
+    pnl_switchableViews.add(tabbedPane, VIEWS_FILTER);
     
     this.setLayout(mainLayout);
     this.add(pnl_filter, java.awt.BorderLayout.NORTH);
@@ -389,10 +423,14 @@ public abstract class GStructureChooser extends JPanel implements
   public class AssciateSeqPanel extends JPanel implements ItemListener
   {
     private JComboBox<AssociateSeqOptions> cmb_assSeq = new JComboBox<AssociateSeqOptions>();
+
+    private JLabel lbl_associateSeq = new JLabel();
+
     public AssciateSeqPanel()
     {
       this.setLayout(new FlowLayout());
       this.add(cmb_assSeq);
+      this.add(lbl_associateSeq);
       cmb_assSeq.setToolTipText(MessageManager
               .getString("info.associate_wit_sequence"));
       cmb_assSeq.addItemListener(this);
@@ -400,7 +438,7 @@ public abstract class GStructureChooser extends JPanel implements
 
     public void loadCmbAssSeq()
     {
-      populateCmbAssociateSeqOptions(cmb_assSeq);
+      populateCmbAssociateSeqOptions(cmb_assSeq, lbl_associateSeq);
     }
 
     public JComboBox<AssociateSeqOptions> getCmb_assSeq()
@@ -441,7 +479,9 @@ public abstract class GStructureChooser extends JPanel implements
   protected abstract void txt_search_ActionPerformed();
 
   public abstract void populateCmbAssociateSeqOptions(
-          JComboBox<AssociateSeqOptions> cmb_assSeq);
+          JComboBox<AssociateSeqOptions> cmb_assSeq, JLabel lbl_associateSeq);
 
   public abstract void cmbAssSeqStateChanged();
+
+  public abstract void tabRefresh();
 }