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 'develop' into trialMerge
[jalview.git]
/
src
/
jalview
/
io
/
NewickFile.java
diff --git
a/src/jalview/io/NewickFile.java
b/src/jalview/io/NewickFile.java
index
1e9c5ed
..
f3eaa45
100755
(executable)
--- a/
src/jalview/io/NewickFile.java
+++ b/
src/jalview/io/NewickFile.java
@@
-475,7
+475,7
@@
public class NewickFile extends FileParse
{
try
{
{
try
{
- bootstrap = (new Integer(nbootstrap.stringMatched(1)))
+ bootstrap = (Integer.valueOf(nbootstrap.stringMatched(1)))
.intValue();
HasBootstrap = true;
} catch (Exception e)
.intValue();
HasBootstrap = true;
} catch (Exception e)
@@
-492,7
+492,7
@@
public class NewickFile extends FileParse
{
try
{
{
try
{
- distance = (new Float(ndist.stringMatched(1))).floatValue();
+ distance = (Float.valueOf(ndist.stringMatched(1))).floatValue();
HasDistances = true;
nodehasdistance = true;
} catch (Exception e)
HasDistances = true;
nodehasdistance = true;
} catch (Exception e)
@@
-659,7
+659,7
@@
public class NewickFile extends FileParse
if (code.toLowerCase().equals("b"))
{
int v = -1;
if (code.toLowerCase().equals("b"))
{
int v = -1;
- Float iv = new Float(value);
+ Float iv = Float.valueOf(value);
v = iv.intValue(); // jalview only does integer bootstraps
// currently
c.setBootstrap(v);
v = iv.intValue(); // jalview only does integer bootstraps
// currently
c.setBootstrap(v);