From: cmzmasek@gmail.com Date: Mon, 14 May 2012 21:29:38 +0000 (+0000) Subject: in progress X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=fd4ebf6cb139b472664fee8cb9e74af3933a4ae5;p=jalview.git in progress --- diff --git a/forester/java/src/org/forester/archaeopteryx/AptxUtil.java b/forester/java/src/org/forester/archaeopteryx/AptxUtil.java index e71eeef..41b7ce4 100644 --- a/forester/java/src/org/forester/archaeopteryx/AptxUtil.java +++ b/forester/java/src/org/forester/archaeopteryx/AptxUtil.java @@ -537,7 +537,7 @@ public final class AptxUtil { } } - final static String crateBasicInformation( final Phylogeny phy ) { + final static String createBasicInformation( final Phylogeny phy ) { final StringBuilder desc = new StringBuilder(); if ( ( phy != null ) && !phy.isEmpty() ) { if ( !ForesterUtil.isEmpty( phy.getName() ) ) { @@ -617,8 +617,14 @@ public final class AptxUtil { desc.append( " Maximum: " + ForesterUtil.roundToInt( ds.getMax() ) ); desc.append( "\n" ); } - final List css = PhylogenyMethods.calculatConfidenceStatistics( phy ); - if ( css.size() > 0 ) { + List css = null; + try { + css = PhylogenyMethods.calculatConfidenceStatistics( phy ); + } + catch ( final IllegalArgumentException e ) { + ForesterUtil.printWarningMessage( Constants.PRG_NAME, e.getMessage() ); + } + if ( ( css != null ) && ( css.size() > 0 ) ) { desc.append( "\n" ); for( int i = 0; i < css.size(); ++i ) { final DescriptiveStatistics cs = css.get( i ); diff --git a/forester/java/src/org/forester/archaeopteryx/MainFrame.java b/forester/java/src/org/forester/archaeopteryx/MainFrame.java index 6b4c096..5af1879 100644 --- a/forester/java/src/org/forester/archaeopteryx/MainFrame.java +++ b/forester/java/src/org/forester/archaeopteryx/MainFrame.java @@ -1056,7 +1056,7 @@ public abstract class MainFrame extends JFrame implements ActionListener { if ( ( _mainpanel.getCurrentPhylogeny() == null ) || _mainpanel.getCurrentPhylogeny().isEmpty() ) { return; } - _textframe = TextFrame.instantiate( AptxUtil.crateBasicInformation( _mainpanel.getCurrentPhylogeny() ) ); + _textframe = TextFrame.instantiate( AptxUtil.createBasicInformation( _mainpanel.getCurrentPhylogeny() ) ); } void viewAsNexus() {