JAL-2045 JAL-2047 improvement for sorting PDB quality measure numerically, and improv...

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

diff --git a/src/jalview/jbgui/GStructureChooser.java b/src/jalview/jbgui/GStructureChooser.java
index d8cff06..8430557 100644 (file)
--- a/src/jalview/jbgui/GStructureChooser.java
+++ b/src/jalview/jbgui/GStructureChooser.java
@@ -169,6 +169,10 @@ public abstract class GStructureChooser extends JPanel implements
 
       try
       {
+        if (getValueAt(rowIndex, colIndex) == null)
+        {
+          return null;
+        }
         toolTipText = getValueAt(rowIndex, colIndex).toString();
       } catch (Exception e)
       {
@@ -461,10 +465,14 @@ public abstract class GStructureChooser extends JPanel implements
         JTabbedPane sourceTabbedPane = (JTabbedPane) changeEvent
                 .getSource();
         int index = sourceTabbedPane.getSelectedIndex();
+        btn_view.setVisible(true);
+        btn_cancel.setVisible(true);
         if (sourceTabbedPane.getTitleAt(index).equals(configureCols))
         {
           btn_view.setEnabled(false);
           btn_cancel.setEnabled(false);
+          btn_view.setVisible(false);
+          btn_cancel.setVisible(false);
           previousWantedFields = PDBDocFieldPreferences
                   .getStructureSummaryFields().toArray(
                           new PDBRestClient.PDBDocField[0]);