X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FTreePanel.java;h=905a54ad815c372e84c1847a37aaa207b2be79cb;hb=933794f42ed55d57850424e3459a54cd2d92c933;hp=a9e11a78303739c6a28f6783707e99f4cd2f8eb3;hpb=be27d7b3cadbfb5c488066034c48b1735799b429;p=jalview.git diff --git a/src/jalview/appletgui/TreePanel.java b/src/jalview/appletgui/TreePanel.java index a9e11a7..905a54a 100644 --- a/src/jalview/appletgui/TreePanel.java +++ b/src/jalview/appletgui/TreePanel.java @@ -164,7 +164,7 @@ public class TreePanel extends EmbmenuFrame implements ActionListener, // yields unaligned seqs) // or create a selection box around columns in alignment view // test Alignment(SeqCigar[]) - if (tree.seqData != null) + if (tree.getOriginalData() != null) { char gc = '-'; try @@ -175,8 +175,8 @@ public class TreePanel extends EmbmenuFrame implements ActionListener, } catch (Exception ex) { } - ; - Object[] alAndColsel = tree.seqData + + Object[] alAndColsel = tree.getOriginalData() .getAlignmentAndColumnSelection(gc); if (alAndColsel != null && alAndColsel[0] != null) @@ -210,17 +210,8 @@ public class TreePanel extends EmbmenuFrame implements ActionListener, { if (newtree != null) { - if (odata == null) - { - tree = new TreeModel(av.getAlignment().getSequencesArray(), - newtree); - } - else - { - tree = new TreeModel(av.getAlignment().getSequencesArray(), - odata, newtree); - } - + tree = new TreeModel(av.getAlignment().getSequencesArray(), odata, + newtree); } else {