From 8c1d1e78607436d66bb90bbf4299e97854967d9c Mon Sep 17 00:00:00 2001 From: amwaterhouse Date: Thu, 10 Aug 2006 14:57:40 +0000 Subject: [PATCH] Check selection size before making tree --- src/jalview/appletgui/AlignFrame.java | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/jalview/appletgui/AlignFrame.java b/src/jalview/appletgui/AlignFrame.java index 6592399..d72c665 100755 --- a/src/jalview/appletgui/AlignFrame.java +++ b/src/jalview/appletgui/AlignFrame.java @@ -1597,7 +1597,8 @@ public void itemStateChanged(ItemEvent evt) public void pairwiseAlignmentMenuItem_actionPerformed() { - if (viewport.getSelectionGroup().getSize(false) > 1) + if (viewport.getSelectionGroup()!=null + && viewport.getSelectionGroup().getSize(false) > 1) { Frame frame = new Frame(); frame.add(new PairwiseAlignPanel(alignPanel)); @@ -1686,13 +1687,19 @@ public void itemStateChanged(ItemEvent evt) } - final TreePanel tp = new TreePanel(viewport, - type, - pwType); + if ( (viewport.getSelectionGroup() != null && + viewport.getSelectionGroup().getSize(false) > 1) + || (viewport.getSelectionGroup() == null + && viewport.alignment.getHeight() > 1)) + { + final TreePanel tp = new TreePanel(viewport, + type, + pwType); - addTreeMenuItem(tp, title); + addTreeMenuItem(tp, title); - jalview.bin.JalviewLite.addFrame(tp, title, 600, 500); + jalview.bin.JalviewLite.addFrame(tp, title, 600, 500); + } } void loadTree_actionPerformed() -- 1.7.10.2