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

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

diff --git a/src/jalview/jbgui/GPDBSearchPanel.java b/src/jalview/jbgui/GPDBSearchPanel.java
index 5593d5c..29a0014 100644 (file)
--- a/src/jalview/jbgui/GPDBSearchPanel.java
+++ b/src/jalview/jbgui/GPDBSearchPanel.java
@@ -22,9 +22,9 @@
 package jalview.jbgui;
 
 import jalview.gui.Desktop;
+import jalview.jbgui.PDBDocFieldPreferences.PreferenceSource;
 import jalview.util.MessageManager;
 import jalview.ws.dbsources.PDBRestClient.PDBDocField;
-import jalview.ws.uimodel.PDBRestResponse.PDBResponseSummary;
 
 import java.awt.BorderLayout;
 import java.awt.Dimension;
@@ -35,11 +35,13 @@ import javax.swing.JButton;
 import javax.swing.JComboBox;
 import javax.swing.JFrame;
 import javax.swing.JInternalFrame;
-import javax.swing.JList;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
+import javax.swing.JTabbedPane;
+import javax.swing.JTable;
 import javax.swing.JTextField;
-import javax.swing.ListSelectionModel;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 
@@ -67,10 +69,15 @@ public abstract class GPDBSearchPanel extends JPanel
   
   protected JTextField txt_search = new JTextField(20);
   
-  protected JList<PDBResponseSummary> lst_searchResult = new JList<PDBResponseSummary>();
+  protected JTable tbl_summary = new JTable();
 
   protected JScrollPane scrl_searchResult = new JScrollPane(
-          lst_searchResult);
+tbl_summary);
+
+  private JTabbedPane tabbedPane = new JTabbedPane();
+
+  private PDBDocFieldPreferences pdbDocFieldPrefs = new PDBDocFieldPreferences(
+          PreferenceSource.SEARCH_SUMMARY);
 
   private JPanel pnl_actions = new JPanel();
 
@@ -100,6 +107,7 @@ public abstract class GPDBSearchPanel extends JPanel
    */
   private void jbInit() throws Exception
   {
+    tbl_summary.setAutoCreateRowSorter(true);
     btn_back.setFont(new java.awt.Font("Verdana", 0, 12));
     btn_back.setText(MessageManager.getString("action.back"));
     btn_back.addActionListener(new java.awt.event.ActionListener()
@@ -127,18 +135,10 @@ public abstract class GPDBSearchPanel extends JPanel
         btn_cancel_ActionPerformed();
       }
     });
-    pnl_actions.add(btn_back);
-    pnl_actions.add(btn_ok);
-    pnl_actions.add(btn_cancel);
 
-    lst_searchResult
-            .setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
-    lst_searchResult.setLayoutOrientation(JList.VERTICAL);
-    lst_searchResult.setVisibleRowCount(-1);
     scrl_searchResult.setPreferredSize(new Dimension(500, 300));
     scrl_searchResult
             .setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
-    pnl_results.add(scrl_searchResult);
 
     cmb_searchTarget.setFont(new java.awt.Font("Verdana", 0, 12));
     cmb_searchTarget.addActionListener(new ActionListener()
@@ -174,6 +174,33 @@ public abstract class GPDBSearchPanel extends JPanel
       }
     });
 
+    final String searchTabTitle = MessageManager
+            .getString("label.search_result");
+    ChangeListener changeListener = new ChangeListener()
+    {
+      public void stateChanged(ChangeEvent changeEvent)
+      {
+        JTabbedPane sourceTabbedPane = (JTabbedPane) changeEvent
+                .getSource();
+        int index = sourceTabbedPane.getSelectedIndex();
+        if (sourceTabbedPane.getTitleAt(index).equals(searchTabTitle))
+        {
+          txt_search_ActionPerformed();
+        }
+      }
+    };
+    tabbedPane.addChangeListener(changeListener);
+    tabbedPane.setPreferredSize(new Dimension(500, 300));
+    tabbedPane.add(searchTabTitle, scrl_searchResult);
+    tabbedPane.add(
+            MessageManager.getString("label.configure_displayed_columns"),
+            pdbDocFieldPrefs);
+
+    pnl_actions.add(btn_back);
+    pnl_actions.add(btn_ok);
+    pnl_actions.add(btn_cancel);
+
+    pnl_results.add(tabbedPane);
     pnl_inputs.add(cmb_searchTarget);
     pnl_inputs.add(txt_search);
 
@@ -187,6 +214,21 @@ public abstract class GPDBSearchPanel extends JPanel
     Desktop.addInternalFrame(mainFrame, frameTitle, 800, 400);
   }
 
+  public JComboBox<PDBDocField> getCmbSearchTarget()
+  {
+    return cmb_searchTarget;
+  }
+
+  public JTextField getTxtSearch()
+  {
+    return txt_search;
+  }
+
+  public JInternalFrame getMainFrame()
+  {
+    return mainFrame;
+  }
+
   public abstract void txt_search_ActionPerformed();
 
   public abstract void btn_ok_ActionPerformed();
@@ -195,6 +237,6 @@ public abstract class GPDBSearchPanel extends JPanel
 
   public abstract void btn_cancel_ActionPerformed();
 
-  protected abstract void populateCmbSearchTargetOptions();
+  public abstract void populateCmbSearchTargetOptions();
 
 }