From 75abc899cb1026e534e4533a78044ad6f62f7af7 Mon Sep 17 00:00:00 2001 From: amwaterhouse Date: Thu, 10 Aug 2006 14:56:21 +0000 Subject: [PATCH] Check alAndColSel are not null --- src/jalview/appletgui/TreePanel.java | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/src/jalview/appletgui/TreePanel.java b/src/jalview/appletgui/TreePanel.java index b3fc3b3..6f57160 100755 --- a/src/jalview/appletgui/TreePanel.java +++ b/src/jalview/appletgui/TreePanel.java @@ -122,19 +122,24 @@ public class TreePanel extends Frame implements ActionListener, ItemListener // create new alignmnt window with hidden regions (unhiding hidden regions yields unaligned seqs) // or create a selection box around columns in alignment view // test Alignment(SeqCigar[]) - Object[] alAndColsel = tree.seqData.getAlignmentAndColumnSelection(av. - getGapCharacter()); - - if (alAndColsel != null && alAndColsel[0]!=null) - { - Alignment al = new Alignment( (SequenceI[]) alAndColsel[0]); - AlignFrame af = new AlignFrame(al, - av.applet, - "Original Data for Tree", - false); - - af.viewport.setHiddenColumns( (ColumnSelection) alAndColsel[1] ); - } + if(tree.seqData!=null) + { + Object[] alAndColsel = tree.seqData.getAlignmentAndColumnSelection(av. + getGapCharacter()); + + if (alAndColsel != null && alAndColsel[0] != null) + { + Alignment al = new Alignment( (SequenceI[]) alAndColsel[0]); + AlignFrame af = new AlignFrame(al, + av.applet, + "Original Data for Tree", + false); + + af.viewport.setHiddenColumns( (ColumnSelection) alAndColsel[1]); + } + } + else + System.out.println("Original Tree Data not available"); } class TreeLoader extends Thread -- 1.7.10.2