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
minimal fixes - probably not valid since forester jar out of sync
[jalview.git]
/
src
/
jalview
/
gui
/
TreePanel.java
diff --git
a/src/jalview/gui/TreePanel.java
b/src/jalview/gui/TreePanel.java
index
042147f
..
a163c15
100755
(executable)
--- a/
src/jalview/gui/TreePanel.java
+++ b/
src/jalview/gui/TreePanel.java
@@
-24,6
+24,7
@@
import java.util.Locale;
import jalview.analysis.AlignmentSorter;
import jalview.analysis.TreeModel;
import jalview.analysis.AlignmentSorter;
import jalview.analysis.TreeModel;
+import jalview.api.analysis.SimilarityParamsI;
import jalview.bin.Cache;
import jalview.bin.Console;
import jalview.commands.CommandI;
import jalview.bin.Cache;
import jalview.bin.Console;
import jalview.commands.CommandI;
@@
-776,12
+777,6
@@
public void buildTreeCanvas(AlignmentPanel ap) {
}
else
{
}
else
{
- /*
- * i18n description of Neighbour Joining or Average Distance method
- */
- String treecalcnm = MessageManager
- .getString("label.tree_calc_" + treeType.toLowerCase());
-
/*
* i18n description of Neighbour Joining or Average Distance method
*/
/*
* i18n description of Neighbour Joining or Average Distance method
*/
@@
-791,7
+786,7
@@
public void buildTreeCanvas(AlignmentPanel ap) {
/*
* short score model name (long description can be too long)
*/
/*
* short score model name (long description can be too long)
*/
- String smn = scoreModelName;
+ String smn = substitutionMatrix;
/*
* put them together as <method> Using <model>
/*
* put them together as <method> Using <model>