X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGStructureChooser.java;h=2c51b3d2b7651eb498015ee42ad349bf455c70e4;hb=73d2eb017ebcaff4453d676c0d728f61015d102c;hp=fc035b663aa44625e27cb6421f937817c761e60a;hpb=bca294a4376fbe2087f03ca2c44bd591edc61aed;p=jalview.git

diff --git a/src/jalview/jbgui/GStructureChooser.java b/src/jalview/jbgui/GStructureChooser.java
index fc035b6..2c51b3d 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,6 +75,8 @@ 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(
           MessageManager.getString("label.select"));
@@ -119,6 +125,11 @@ public abstract class GStructureChooser extends JPanel implements
   protected ImageIcon errorImage = new ImageIcon(getClass().getResource(
           "/images/error.png"));
 
+  protected ImageIcon warningImage = new ImageIcon(getClass().getResource(
+          "/images/warning.gif"));
+
+  protected JLabel lbl_warning = new JLabel(warningImage);
+
   protected JLabel lbl_loading = new JLabel(loadingImage);
 
   protected JLabel lbl_pdbManualFetchStatus = new JLabel(errorImage);
@@ -138,7 +149,30 @@ 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);
@@ -152,6 +186,7 @@ public abstract class GStructureChooser extends JPanel implements
   private PDBDocFieldPreferences pdbDocFieldPrefs = new PDBDocFieldPreferences(
           PreferenceSource.STRUCTURE_CHOOSER);
 
+  protected PDBDocField[] previousWantedFields;
   public GStructureChooser()
   {
     try
@@ -174,13 +209,20 @@ 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)
       {
         updateCurrentView();
       }
+
+      public void mouseReleased(MouseEvent e)
+      {
+        updateCurrentView();
+      }
     });
 
     btn_view.setFont(new java.awt.Font("Verdana", 0, 12));
@@ -224,7 +266,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"));
@@ -277,7 +319,8 @@ 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)
@@ -286,18 +329,33 @@ public abstract class GStructureChooser extends JPanel implements
                 .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);
 
@@ -317,6 +375,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
   /**
@@ -508,4 +578,6 @@ public abstract class GStructureChooser extends JPanel implements
   public abstract void cmbAssSeqStateChanged();
 
   public abstract void tabRefresh();
+
+  public abstract void validateSelections();
 }