X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fapplication%2Fstrip.java;h=f374154dc50915419db95e3b47a279c44abcecb2;hb=1542f37267c30e690b840d4552234f1f70598a46;hp=7af9ff8ef5e060638c538e333cdc0e7c7aab3d4a;hpb=eee996a6476a1e3d84c07f8f690dcde3ff4b2ef5;p=jalview.git diff --git a/forester/java/src/org/forester/application/strip.java b/forester/java/src/org/forester/application/strip.java index 7af9ff8..f374154 100644 --- a/forester/java/src/org/forester/application/strip.java +++ b/forester/java/src/org/forester/application/strip.java @@ -29,12 +29,12 @@ import java.io.File; import java.io.IOException; 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.ForesterUtil; public class strip { @@ -55,7 +55,7 @@ public class strip { Phylogeny p = null; try { final PhylogenyFactory factory = ParserBasedPhylogenyFactory.getInstance(); - final PhylogenyParser pp = ForesterUtil.createParserDependingOnFileType( infile, true ); + final PhylogenyParser pp = ParserUtils.createParserDependingOnFileType( infile, true ); p = factory.create( infile, pp )[ 0 ]; } catch ( final Exception e ) { @@ -84,7 +84,7 @@ public class strip { } else { names = new String[ args.length - 3 ]; - for( int i = 0; i < args.length - 3; ++i ) { + for( int i = 0; i < ( args.length - 3 ); ++i ) { names[ i ] = args[ i + 3 ]; } } @@ -109,7 +109,7 @@ public class strip { try { final PhylogenyFactory factory = ParserBasedPhylogenyFactory.getInstance(); final File f = new File( file ); - final PhylogenyParser pp = ForesterUtil.createParserDependingOnFileType( f, true ); + final PhylogenyParser pp = ParserUtils.createParserDependingOnFileType( f, true ); p0 = factory.create( f, pp )[ 0 ]; } catch ( final Exception e ) {