X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FNewickFile.java;h=b3c0011b52ea2d1ad4284cb7faf4fbc1566d6189;hb=42e022a59de649375c8878c1d26361cb6bc89cb8;hp=67923db12ff9f7c6a789f60fbaa78cb1ca6fa9a3;hpb=80b889f0cca49103e1b20ed806755a0719789906;p=jalview.git diff --git a/src/jalview/io/NewickFile.java b/src/jalview/io/NewickFile.java index 67923db..b3c0011 100755 --- a/src/jalview/io/NewickFile.java +++ b/src/jalview/io/NewickFile.java @@ -26,20 +26,20 @@ // TODO: Extended SequenceNodeI to hold parsed NHX strings package jalview.io; -import java.util.Locale; - -import jalview.datamodel.BinaryNode; -import jalview.datamodel.SequenceNode; -import jalview.util.MessageManager; - import java.io.BufferedReader; import java.io.File; import java.io.FileReader; import java.io.IOException; +import java.util.Locale; import java.util.StringTokenizer; import com.stevesoft.pat.Regex; +import jalview.bin.Jalview; +import jalview.datamodel.BinaryNode; +import jalview.datamodel.SequenceNode; +import jalview.util.MessageManager; + /** * Parse a new hanpshire style tree Caveats: NHX files are NOT supported and the * tree distances and topology are unreliable when they are parsed. TODO: on @@ -946,9 +946,8 @@ public class NewickFile extends FileParse { if (args == null || args.length != 1) { - System.err.println( - "Takes one argument - file name of a newick tree file."); - System.exit(0); + Jalview.exit( + "Takes one argument - file name of a newick tree file.", 0); } File fn = new File(args[0]);