X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGStructureChooser.java;h=c4043c49539d80c6d1b6dd5993b1d47ca759d07e;hb=4d7f98a6dd54d9863ba449ec79dcd95d25ed863d;hp=d0f2328dcac255baf5ce587abfb8b03d0dd61f0a;hpb=744872398c812f4db4ad5315f5c489f0e7c150f1;p=jalview.git

diff --git a/src/jalview/jbgui/GStructureChooser.java b/src/jalview/jbgui/GStructureChooser.java
index d0f2328..c4043c4 100644
--- a/src/jalview/jbgui/GStructureChooser.java
+++ b/src/jalview/jbgui/GStructureChooser.java
@@ -24,8 +24,11 @@ package jalview.jbgui;
 import jalview.datamodel.SequenceI;
 import jalview.gui.AlignmentPanel;
 import jalview.gui.Desktop;
+import jalview.gui.JvSwingUtils;
 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 +39,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;
@@ -71,7 +75,7 @@ public abstract class GStructureChooser extends JPanel implements
   protected JComboBox<FilterOption> cmb_filterOption = new JComboBox<FilterOption>();
 
   protected AlignmentPanel ap;
-  
+
   protected StringBuilder errorWarning = new StringBuilder();
 
   protected JLabel lbl_result = new JLabel(
@@ -132,7 +136,6 @@ public abstract class GStructureChooser extends JPanel implements
 
   protected JLabel lbl_fromFileStatus = new JLabel(errorImage);
 
-
   protected AssciateSeqPanel idInputAssSeqPanel = new AssciateSeqPanel();
 
   protected AssciateSeqPanel fileChooserAssSeqPanel = new AssciateSeqPanel();
@@ -145,10 +148,32 @@ public abstract class GStructureChooser extends JPanel implements
 
   protected static final String VIEWS_LOCAL_PDB = "VIEWS_LOCAL_PDB";
 
-  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 JScrollPane scrl_foundStructures = new JScrollPane(
-          tbl_summary);
+  protected JScrollPane scrl_foundStructures = new JScrollPane(tbl_summary);
 
   protected JTable tbl_local_pdb = new JTable();
 
@@ -159,6 +184,8 @@ public abstract class GStructureChooser extends JPanel implements
   private PDBDocFieldPreferences pdbDocFieldPrefs = new PDBDocFieldPreferences(
           PreferenceSource.STRUCTURE_CHOOSER);
 
+  protected PDBDocField[] previousWantedFields;
+
   public GStructureChooser()
   {
     try
@@ -181,7 +208,9 @@ public abstract class GStructureChooser extends JPanel implements
   private void jbInit() throws Exception
   {
     tbl_summary.setAutoCreateRowSorter(true);
+    tbl_summary.getTableHeader().setReorderingAllowed(false);
     tbl_local_pdb.setAutoCreateRowSorter(true);
+    tbl_local_pdb.getTableHeader().setReorderingAllowed(false);
     tbl_local_pdb.addMouseListener(new MouseAdapter()
     {
       public void mouseClicked(MouseEvent e)
@@ -236,7 +265,7 @@ public abstract class GStructureChooser extends JPanel implements
     cmb_filterOption.setFont(new java.awt.Font("Verdana", 0, 12));
     chk_invertFilter.setFont(new java.awt.Font("Verdana", 0, 12));
     chk_rememberSettings.setFont(new java.awt.Font("Verdana", 0, 12));
-
+    chk_rememberSettings.setVisible(false);
 
     txt_search.setToolTipText(MessageManager
             .getString("label.enter_pdb_id"));
@@ -276,7 +305,6 @@ public abstract class GStructureChooser extends JPanel implements
     pnl_main.add(chk_invertFilter);
     lbl_loading.setVisible(false);
 
-
     pnl_fileChooser.add(btn_pdbFromFile);
     pnl_fileChooser.add(lbl_fromFileStatus);
     pnl_fileChooserBL.add(fileChooserAssSeqPanel, BorderLayout.NORTH);
@@ -286,10 +314,11 @@ public abstract class GStructureChooser extends JPanel implements
     pnl_idInput.add(lbl_pdbManualFetchStatus);
     pnl_idInputBL.add(idInputAssSeqPanel, BorderLayout.NORTH);
     pnl_idInputBL.add(pnl_idInput, BorderLayout.CENTER);
-    
+
     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)
@@ -297,27 +326,41 @@ public abstract class GStructureChooser extends JPanel implements
         JTabbedPane sourceTabbedPane = (JTabbedPane) changeEvent
                 .getSource();
         int index = sourceTabbedPane.getSelectedIndex();
+        if (sourceTabbedPane.getTitleAt(index).equals(configureCols))
+        {
+          btn_view.setEnabled(false);
+          btn_cancel.setEnabled(false);
+          previousWantedFields = PDBDocFieldPreferences
+                  .getStructureSummaryFields().toArray(
+                          new PDBRestClient.PDBDocField[0]);
+        }
         if (sourceTabbedPane.getTitleAt(index)
                 .equals(foundStructureSummary))
         {
-          tabRefresh();
+          btn_cancel.setEnabled(true);
+          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);
 
     pnl_switchableViews.add(pnl_fileChooserBL, VIEWS_FROM_FILE);
     pnl_switchableViews.add(pnl_idInputBL, VIEWS_ENTER_ID);
     pnl_switchableViews.add(pnl_filter, VIEWS_FILTER);
     pnl_switchableViews.add(pnl_locPDB, VIEWS_LOCAL_PDB);
-    
+
     this.setLayout(mainLayout);
     this.add(pnl_main, java.awt.BorderLayout.NORTH);
     this.add(pnl_switchableViews, java.awt.BorderLayout.CENTER);
@@ -329,7 +372,19 @@ 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
   /**
    * Event listener for the 'filter' combo-box and 'invert' check-box
@@ -406,6 +461,7 @@ public abstract class GStructureChooser extends JPanel implements
   public class AssociateSeqOptions
   {
     private SequenceI sequence;
+
     private String name;
 
     public AssociateSeqOptions(SequenceI seq)
@@ -520,4 +576,6 @@ public abstract class GStructureChooser extends JPanel implements
   public abstract void cmbAssSeqStateChanged();
 
   public abstract void tabRefresh();
+
+  public abstract void validateSelections();
 }