JAL-2403 constants for "NJ", "AV"

[jalview.git] / src / jalview / gui / TreePanel.java

diff --git a/src/jalview/gui/TreePanel.java b/src/jalview/gui/TreePanel.java
index 7a205b6..477c28d 100755 (executable)
--- a/src/jalview/gui/TreePanel.java
+++ b/src/jalview/gui/TreePanel.java
@@ -402,7 +402,7 @@ public class TreePanel extends GTreePanel
 
     StringBuffer buffer = new StringBuffer();
 
-    if (type.equals("AV"))
+    if (type.equals(NJTree.AVERAGE_DISTANCE))
     {
       buffer.append("Average distance tree using ");
     }
@@ -411,17 +411,10 @@ public class TreePanel extends GTreePanel
       buffer.append("Neighbour joining tree using ");
     }
 
-    if (pwtype.equals("BL"))
-    {
-      buffer.append("BLOSUM62");
-    }
-    else
-    {
-      buffer.append("PID");
-    }
+    ScoreModelI sm = ScoreModels.getInstance().forName(pwtype);
+    buffer.append(sm.getName());
 
-    jalview.io.NewickFile fout = new jalview.io.NewickFile(
-            tree.getTopNode());
+    NewickFile fout = new NewickFile(tree.getTopNode());
     try
     {
       cap.setText(fout.print(tree.isHasBootstrap(), tree.isHasDistances(),