X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FNewickFile.java;h=f5e20a343cb150cb22a1d8655cb1487123e6bcea;hb=c19d2a91ca05e052e3408bf5852d88eb5d0608f1;hp=9c91c135c93ef931c669e72bfa2f195b04856db2;hpb=7ab5d6b0ba5fec1ea4a4239e79c476d841622485;p=jalview.git diff --git a/src/jalview/io/NewickFile.java b/src/jalview/io/NewickFile.java index 9c91c13..f5e20a3 100755 --- a/src/jalview/io/NewickFile.java +++ b/src/jalview/io/NewickFile.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) - * Copyright (C) 2014 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2) + * Copyright (C) 2015 The Jalview Authors * * This file is part of Jalview. * @@ -26,10 +26,14 @@ // TODO: Extended SequenceNodeI to hold parsed NHX strings package jalview.io; -import java.io.*; -import java.util.StringTokenizer; +import jalview.datamodel.SequenceNode; +import jalview.util.MessageManager; -import jalview.datamodel.*; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.io.IOException; +import java.util.StringTokenizer; /** * Parse a new hanpshire style tree Caveats: NHX files are NOT supported and the @@ -611,11 +615,14 @@ public class NewickFile extends FileParse if (Error != null) { - throw (new IOException("NewickFile: " + Error + "\n")); + throw (new IOException(MessageManager.formatMessage( + "exception.newfile", new String[] { Error.toString() }))); } if (root == null) { - throw (new IOException("NewickFile: No Tree read in\n")); + throw (new IOException(MessageManager.formatMessage( + "exception.newfile", new String[] { MessageManager + .getString("label.no_tree_read_in") }))); } // THe next line is failing for topali trees - not sure why yet. if // (root.right()!=null && root.isDummy())