X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fsdi%2FDistanceCalculator.java;h=eb592d837e78267c63a9282e897505685ae32043;hb=1e1670fd938a340afae93bdf8703c5f45f0dc404;hp=51b420182fad82947bcd7670c6a3a782252a2da7;hpb=48f7a89be9d34f1930a1f863e608235cc27184c5;p=jalview.git diff --git a/forester/java/src/org/forester/sdi/DistanceCalculator.java b/forester/java/src/org/forester/sdi/DistanceCalculator.java index 51b4201..eb592d8 100644 --- a/forester/java/src/org/forester/sdi/DistanceCalculator.java +++ b/forester/java/src/org/forester/sdi/DistanceCalculator.java @@ -7,7 +7,7 @@ // Copyright (C) 2000-2001 Washington University School of Medicine // and Howard Hughes Medical Institute // All rights reserved -// +// // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public // License as published by the Free Software Foundation; either @@ -17,7 +17,7 @@ // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // Lesser General Public License for more details. -// +// // You should have received a copy of the GNU Lesser General Public // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA @@ -33,11 +33,11 @@ import java.util.ListIterator; import java.util.Vector; import org.forester.io.parsers.PhylogenyParser; +import org.forester.io.parsers.util.ParserUtils; import org.forester.phylogeny.Phylogeny; import org.forester.phylogeny.PhylogenyNode; import org.forester.phylogeny.factories.ParserBasedPhylogenyFactory; import org.forester.phylogeny.factories.PhylogenyFactory; -import org.forester.util.ForesterUtil; /* * @author Christian M. Zmasek @@ -480,7 +480,7 @@ public class DistanceCalculator { tree_file = new File( args[ 0 ] ); try { final PhylogenyFactory factory = ParserBasedPhylogenyFactory.getInstance(); - final PhylogenyParser pp = ForesterUtil.createParserDependingOnFileType( tree_file, true ); + final PhylogenyParser pp = ParserUtils.createParserDependingOnFileType( tree_file, true ); tree = factory.create( tree_file, pp )[ 0 ]; } catch ( final Exception e ) {