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
Settooltips null
[jalview.git]
/
src
/
jalview
/
analysis
/
NJTree.java
diff --git
a/src/jalview/analysis/NJTree.java
b/src/jalview/analysis/NJTree.java
index
b1141c5
..
78c4e60
100755
(executable)
--- a/
src/jalview/analysis/NJTree.java
+++ b/
src/jalview/analysis/NJTree.java
@@
-284,12
+284,21
@@
public class NJTree
if (nam != null)
{
if (nam != null)
{
+ if (!leaf.isPlaceholder()) {
+ // remapping the node to a new sequenceI - should remove any refs to old one.
+ // TODO - make many sequenceI to one leaf mappings possible! (JBPNote)
+ }
leaf.setPlaceholder(false);
leaf.setElement(nam);
}
else
{
leaf.setPlaceholder(false);
leaf.setElement(nam);
}
else
{
+ if (!leaf.isPlaceholder()) {
+ // Construct a new placeholder sequence object for this leaf
+ leaf.setElement(new Sequence(leaf.getName(), "THISISAPLACEHLDER"));
+ }
leaf.setPlaceholder(true);
leaf.setPlaceholder(true);
+
}
}
}
}
}
}