X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fapplication%2Fannotator.java;h=4374f5321cd1ef0c818e57bab86e34661440d1cd;hb=efaea5057ced91f5d162cebb6459d206da1d3c82;hp=bfd8f1550a41c642ebf151efe998ec40dd18a90e;hpb=4f189a0f62383ce77802a48b4135e2c485f864d7;p=jalview.git diff --git a/forester/java/src/org/forester/application/annotator.java b/forester/java/src/org/forester/application/annotator.java index bfd8f15..4374f53 100644 --- a/forester/java/src/org/forester/application/annotator.java +++ b/forester/java/src/org/forester/application/annotator.java @@ -94,8 +94,8 @@ public final class annotator { } catch ( final Exception e ) { ForesterUtil - .fatalError( PRG_NAME, "failed to read phylgenies from [" + infile + "] [" + e.getMessage() - + "]" ); + .fatalError( PRG_NAME, "failed to read phylgenies from [" + infile + "] [" + e.getMessage() + + "]" ); } try { obtainSeqInformation( phy ); @@ -103,15 +103,16 @@ public final class annotator { catch ( final IOException e ) { ForesterUtil.fatalError( PRG_NAME, e.getMessage() ); } - try { - inferTaxonomyFromDescendents( phy ); - } - catch ( final IOException e ) { - ForesterUtil.fatalError( PRG_NAME, e.getMessage() ); - } - catch ( final AncestralTaxonomyInferenceException e ) { - ForesterUtil.fatalError( PRG_NAME, e.getMessage() ); - } + // try { + // inferTaxonomyFromDescendents( phy ); + // } + // catch ( final IOException e ) { + // ForesterUtil.fatalError( PRG_NAME, e.getMessage() ); + // } + // catch ( final AncestralTaxonomyInferenceException e ) { + // ForesterUtil.fatalError( PRG_NAME, e.getMessage() ); + // } + //phy.setRerootable( false ); try { final PhylogenyWriter w = new PhylogenyWriter(); w.toPhyloXML( phy, 0, outfile ); @@ -128,7 +129,7 @@ public final class annotator { } private static void inferTaxonomyFromDescendents( final Phylogeny phy ) throws IOException, - AncestralTaxonomyInferenceException { + AncestralTaxonomyInferenceException { AncestralTaxonomyInference.inferTaxonomyFromDescendents( phy ); }