X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fapplication%2Fnhx_too.java;h=1061c5c516a253b1b86b01e599a555fc9895aeca;hb=a0c90a7238972024f71d35e6042737c33abe8b5e;hp=32acbc8cabd711faba6ccba605c4f88cda565bad;hpb=eee996a6476a1e3d84c07f8f690dcde3ff4b2ef5;p=jalview.git diff --git a/forester/java/src/org/forester/application/nhx_too.java b/forester/java/src/org/forester/application/nhx_too.java index 32acbc8..1061c5c 100644 --- a/forester/java/src/org/forester/application/nhx_too.java +++ b/forester/java/src/org/forester/application/nhx_too.java @@ -21,7 +21,7 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA // // Contact: phylosoft @ gmail . com -// WWW: www.phylosoft.org/forester +// WWW: https://sites.google.com/site/cmzmasek/home/software/forester package org.forester.application; @@ -31,8 +31,10 @@ import java.util.ArrayList; import java.util.List; import org.forester.io.parsers.PhylogenyParser; +import org.forester.io.parsers.util.ParserUtils; import org.forester.io.writers.PhylogenyWriter; import org.forester.phylogeny.Phylogeny; +import org.forester.phylogeny.PhylogenyMethods; import org.forester.phylogeny.factories.ParserBasedPhylogenyFactory; import org.forester.phylogeny.factories.PhylogenyFactory; import org.forester.util.CommandLineArguments; @@ -79,7 +81,7 @@ public class nhx_too { Phylogeny p = null; try { final PhylogenyFactory factory = ParserBasedPhylogenyFactory.getInstance(); - final PhylogenyParser pp = ForesterUtil.createParserDependingOnFileType( phylogeny_infile, true ); + final PhylogenyParser pp = ParserUtils.createParserDependingOnFileType( phylogeny_infile, true ); p = factory.create( phylogeny_infile, pp )[ 0 ]; } catch ( final Exception e ) { @@ -88,7 +90,7 @@ public class nhx_too { } if ( int_node_name_is_support ) { try { - ForesterUtil.transferInternalNodeNamesToConfidence( p ); + PhylogenyMethods.transferInternalNodeNamesToConfidence( p ); } catch ( final Exception e ) { ForesterUtil.unexpectedFatalError( nhx_too.PRG_NAME,