JAL-2403 JAL-1483 changes to ScoreModelI hierarchy and signatures to

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

diff --git a/src/jalview/appletgui/TreePanel.java b/src/jalview/appletgui/TreePanel.java
index 9ac6773..5b12fa6 100644 (file)
--- a/src/jalview/appletgui/TreePanel.java
+++ b/src/jalview/appletgui/TreePanel.java
@@ -22,7 +22,7 @@ package jalview.appletgui;
 
 import jalview.analysis.NJTree;
 import jalview.analysis.scoremodels.ScoreModels;
-import jalview.api.analysis.DistanceModelI;
+import jalview.api.analysis.ScoreModelI;
 import jalview.api.analysis.ViewBasedAnalysisI;
 import jalview.datamodel.Alignment;
 import jalview.datamodel.AlignmentView;
@@ -237,7 +237,7 @@ public class TreePanel extends EmbmenuFrame implements ActionListener,
           seqs = av.getSelectionGroup().getSequencesInOrder(
                   av.getAlignment());
         }
-        DistanceModelI sm = ScoreModels.getInstance().forName(pwtype);
+        ScoreModelI sm = ScoreModels.getInstance().forName(pwtype);
         if (sm instanceof ViewBasedAnalysisI)
         {
           try
@@ -251,13 +251,8 @@ public class TreePanel extends EmbmenuFrame implements ActionListener,
                     + sm.getName());
             q.printStackTrace();
           }
-          tree = new NJTree(seqs, seqStrings, type, pwtype, sm, start, end);
-        }
-        else
-        {
-          tree = new NJTree(seqs, seqStrings, type, pwtype, null, start,
-                  end);
         }
+        tree = new NJTree(seqs, seqStrings, type, pwtype, sm, start, end);
       }
 
       tree.reCount(tree.getTopNode());