JAL-1270 more fix for failing Functional test

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

diff --git a/src/jalview/jbgui/GPDBSearchPanel.java b/src/jalview/jbgui/GPDBSearchPanel.java
index ec08102..d640df8 100644 (file)
--- a/src/jalview/jbgui/GPDBSearchPanel.java
+++ b/src/jalview/jbgui/GPDBSearchPanel.java
@@ -28,6 +28,7 @@ import jalview.util.MessageManager;
 import jalview.ws.dbsources.PDBRestClient.PDBDocField;
 
 import java.awt.BorderLayout;
+import java.awt.CardLayout;
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -89,7 +90,12 @@ public abstract class GPDBSearchPanel extends JPanel
 
       try
       {
+        if (getValueAt(rowIndex, colIndex) == null)
+        {
+          return null;
+        }
         toolTipText = getValueAt(rowIndex, colIndex).toString();
+
       } catch (Exception e)
       {
         e.printStackTrace();
@@ -124,7 +130,7 @@ public abstract class GPDBSearchPanel extends JPanel
 
   private JPanel pnl_actions = new JPanel();
 
-  private JPanel pnl_results = new JPanel();
+  private JPanel pnl_results = new JPanel(new CardLayout());
 
   private JPanel pnl_inputs = new JPanel();
 
@@ -157,6 +163,7 @@ public abstract class GPDBSearchPanel extends JPanel
     lbl_loading.setVisible(false);
     lbl_loading.setFont(new java.awt.Font("Verdana", 0, 12));
 
+    tbl_summary.setAutoResizeMode(JTable.AUTO_RESIZE_ALL_COLUMNS);
     tbl_summary.setAutoCreateRowSorter(true);
     tbl_summary.getTableHeader().setReorderingAllowed(false);
     tbl_summary.addMouseListener(new MouseAdapter()