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
Jalview 2.6 source licence
[jalview.git]
/
src
/
jalview
/
gui
/
TreePanel.java
diff --git
a/src/jalview/gui/TreePanel.java
b/src/jalview/gui/TreePanel.java
index
45fc0df
..
e77134e
100755
(executable)
--- a/
src/jalview/gui/TreePanel.java
+++ b/
src/jalview/gui/TreePanel.java
@@
-1,5
+1,5
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
* Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
*
* This file is part of Jalview.
* Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
*
* This file is part of Jalview.
@@
-364,12
+364,19
@@
public class TreePanel extends GTreePanel
buffer.append("PID");
}
buffer.append("PID");
}
- Desktop.addInternalFrame(cap, buffer.toString(), 500, 100);
jalview.io.NewickFile fout = new jalview.io.NewickFile(tree
.getTopNode());
jalview.io.NewickFile fout = new jalview.io.NewickFile(tree
.getTopNode());
- cap.setText(fout.print(tree.isHasBootstrap(), tree.isHasDistances(),
+ try {
+ cap.setText(fout.print(tree.isHasBootstrap(), tree.isHasDistances(),
tree.isHasRootDistance()));
tree.isHasRootDistance()));
+ Desktop.addInternalFrame(cap, buffer.toString(), 500, 100);
+ } catch (OutOfMemoryError oom)
+ {
+ new OOMWarning("generating newick tree file",oom);
+ cap.dispose();
+ }
+
}
/**
}
/**