JAL-2403 ScoreModelI now DistanceModelI, ScoreMatrix delegate of

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

diff --git a/src/jalview/gui/TreeChooser.java b/src/jalview/gui/TreeChooser.java
index 40c683d..55e6650 100644 (file)
--- a/src/jalview/gui/TreeChooser.java
+++ b/src/jalview/gui/TreeChooser.java
@@ -20,8 +20,9 @@
  */
 package jalview.gui;
 
+import jalview.analysis.NJTree;
 import jalview.analysis.scoremodels.ScoreModels;
-import jalview.api.analysis.ScoreModelI;
+import jalview.api.analysis.DistanceModelI;
 import jalview.util.MessageManager;
 
 import java.awt.Color;
@@ -85,7 +86,7 @@ public class TreeChooser extends JPanel
 
     matrixNames = new JComboBox<String>();
     ScoreModels scoreModels = ScoreModels.getInstance();
-    for (ScoreModelI sm : scoreModels.getModels())
+    for (DistanceModelI sm : scoreModels.getModels())
     {
       boolean nucleotide = af.getViewport().getAlignment().isNucleotide();
       if (sm.isDNA() && nucleotide || sm.isProtein() && !nucleotide)
@@ -148,8 +149,9 @@ public class TreeChooser extends JPanel
     try
     {
       frame.setClosed(true);
-      String treeType = neighbourJoining.isSelected() ? "NJ" : "AV";
-      ScoreModelI sm = ScoreModels.getInstance().forName(
+      String treeType = neighbourJoining.isSelected() ? NJTree.NEIGHBOUR_JOINING
+              : NJTree.AVERAGE_DISTANCE;
+      DistanceModelI sm = ScoreModels.getInstance().forName(
               matrixNames.getSelectedItem().toString());
       af.newTreePanel(treeType, sm);
     } catch (Exception ex)