X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGPDBSearchPanel.java;fp=src%2Fjalview%2Fjbgui%2FGPDBSearchPanel.java;h=6f6f1aac421d6686ead050616315942b069943f5;hb=f06554784411ddbf871d642e66c8dcb7f147d4a8;hp=c235560454d47ffbd5a8f13141d85862cd8684fa;hpb=cf06ee5d732af6cc874115aece1138adafca8ad7;p=jalview.git

diff --git a/src/jalview/jbgui/GPDBSearchPanel.java b/src/jalview/jbgui/GPDBSearchPanel.java
index c235560..6f6f1aa 100644
--- 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;
@@ -76,7 +77,32 @@ public abstract class GPDBSearchPanel extends JPanel
   
   protected JTextField txt_search = new JTextField(20);
   
-  protected JTable tbl_summary = new JTable();
+  protected JTable tbl_summary = new JTable()
+  {
+    public String getToolTipText(MouseEvent evt)
+    {
+      String toolTipText = null;
+      java.awt.Point pnt = evt.getPoint();
+      int rowIndex = rowAtPoint(pnt);
+      int colIndex = columnAtPoint(pnt);
+
+      try
+      {
+        toolTipText = getValueAt(rowIndex, colIndex).toString();
+      } catch (Exception e)
+      {
+        e.printStackTrace();
+      }
+      toolTipText = (toolTipText == null ? null
+              : (toolTipText.length() > 500 ? JvSwingUtils.wrapTooltip(
+                      true, toolTipText.subSequence(0, 500)
+ + "...")
+                      : JvSwingUtils.wrapTooltip(true,
+                      toolTipText)));
+
+      return toolTipText;
+    }
+  };
 
   protected StringBuilder errorWarning = new StringBuilder();
 
@@ -86,8 +112,12 @@ tbl_summary);
   protected ImageIcon warningImage = new ImageIcon(getClass().getResource(
           "/images/warning.gif"));
 
+  protected ImageIcon loadingImage = new ImageIcon(getClass().getResource(
+          "/images/loading.gif"));
   protected JLabel lbl_warning = new JLabel(warningImage);
 
+  protected JLabel lbl_loading = new JLabel(loadingImage);
+
   private JTabbedPane tabbedPane = new JTabbedPane();
 
   private PDBDocFieldPreferences pdbDocFieldPrefs = new PDBDocFieldPreferences(
@@ -101,6 +131,8 @@ tbl_summary);
 
   private BorderLayout mainLayout = new BorderLayout();
 
+  protected PDBDocField[] previousWantedFields;
+
   public GPDBSearchPanel()
   {
     try
@@ -123,8 +155,11 @@ tbl_summary);
   {
     lbl_warning.setVisible(false);
     lbl_warning.setFont(new java.awt.Font("Verdana", 0, 12));
+    lbl_loading.setVisible(false);
+    lbl_loading.setFont(new java.awt.Font("Verdana", 0, 12));
 
     tbl_summary.setAutoCreateRowSorter(true);
+    tbl_summary.getTableHeader().setReorderingAllowed(false);
     tbl_summary.addMouseListener(new MouseAdapter()
     {
       public void mouseClicked(MouseEvent e)
@@ -251,6 +286,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 +294,33 @@ tbl_summary);
         JTabbedPane sourceTabbedPane = (JTabbedPane) changeEvent
                 .getSource();
         int index = sourceTabbedPane.getSelectedIndex();
+        if (sourceTabbedPane.getTitleAt(index).equals(configureCols))
+        {
+          btn_back.setEnabled(false);
+          btn_cancel.setEnabled(false);
+          btn_ok.setEnabled(false);
+          previousWantedFields = PDBDocFieldPreferences
+                  .getSearchSummaryFields().toArray(new PDBDocField[0]);
+        }
         if (sourceTabbedPane.getTitleAt(index).equals(searchTabTitle))
         {
-          txt_search_ActionPerformed();
+          btn_back.setEnabled(true);
+          btn_cancel.setEnabled(true);
+          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);
@@ -278,6 +329,7 @@ tbl_summary);
     pnl_results.add(tabbedPane);
     pnl_inputs.add(cmb_searchTarget);
     pnl_inputs.add(txt_search);
+    pnl_inputs.add(lbl_loading);
     pnl_inputs.add(lbl_warning);
 
     this.setLayout(mainLayout);
@@ -290,6 +342,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)