git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'Release_2_8_2_Branch' into
[jalview.git]
/
src
/
jalview
/
io
/
NewickFile.java
diff --git
a/src/jalview/io/NewickFile.java
b/src/jalview/io/NewickFile.java
index
9c91c13
..
f2a29ea
100755
(executable)
--- a/
src/jalview/io/NewickFile.java
+++ b/
src/jalview/io/NewickFile.java
@@
-30,6
+30,7
@@
import java.io.*;
import java.util.StringTokenizer;
import jalview.datamodel.*;
import java.util.StringTokenizer;
import jalview.datamodel.*;
+import jalview.util.MessageManager;
/**
* Parse a new hanpshire style tree Caveats: NHX files are NOT supported and the
/**
* Parse a new hanpshire style tree Caveats: NHX files are NOT supported and the
@@
-611,11
+612,11
@@
public class NewickFile extends FileParse
if (Error != null)
{
if (Error != null)
{
- throw (new IOException("NewickFile: " + Error + "\n"));
+ throw (new IOException(MessageManager.formatMessage("exception.newfile", new String[]{Error.toString()})));
}
if (root == null)
{
}
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())
}
// THe next line is failing for topali trees - not sure why yet. if
// (root.right()!=null && root.isDummy())