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
Check colourScheme is not null - jalview prior 2.5 incompatibility
[jalview.git]
/
src
/
jalview
/
gui
/
TreePanel.java
diff --git
a/src/jalview/gui/TreePanel.java
b/src/jalview/gui/TreePanel.java
index
d306028
..
3fa7643
100755
(executable)
--- a/
src/jalview/gui/TreePanel.java
+++ b/
src/jalview/gui/TreePanel.java
@@
-153,8
+153,8
@@
public class TreePanel extends GTreePanel
public void run()
\r
{
\r
\r
public void run()
\r
{
\r
\r
- if(newtree!=null) {
\r
-
\r
+ if(newtree!=null)
\r
+ {
\r
if (odata==null) {
\r
tree = new NJTree(av.alignment.getSequencesArray(),
\r
newtree);
\r
if (odata==null) {
\r
tree = new NJTree(av.alignment.getSequencesArray(),
\r
newtree);
\r
@@
-213,6
+213,7
@@
public class TreePanel extends GTreePanel
placeholdersMenu.setState(b);
\r
treeCanvas.setMarkPlaceholders(b);
\r
}
\r
placeholdersMenu.setState(b);
\r
treeCanvas.setMarkPlaceholders(b);
\r
}
\r
+
\r
private void allowOriginalSeqData(boolean b) {
\r
originalSeqData.setVisible(b);
\r
}
\r
private void allowOriginalSeqData(boolean b) {
\r
originalSeqData.setVisible(b);
\r
}
\r
@@
-351,7
+352,7
@@
public class TreePanel extends GTreePanel
// af.addSortByOrderMenuItem(ServiceName + " Ordering",
\r
// msaorder);
\r
\r
// af.addSortByOrderMenuItem(ServiceName + " Ordering",
\r
// msaorder);
\r
\r
- Desktop.addInternalFrame(af, "original Data for " + this.title,
\r
+ Desktop.addInternalFrame(af, "Original Data for " + this.title,
\r
AlignFrame.NEW_WINDOW_WIDTH,
\r
AlignFrame.NEW_WINDOW_HEIGHT);
\r
}
\r
AlignFrame.NEW_WINDOW_WIDTH,
\r
AlignFrame.NEW_WINDOW_HEIGHT);
\r
}
\r