JAL-2499 inlined two 1-line methods

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

diff --git a/src/jalview/appletgui/TreePanel.java b/src/jalview/appletgui/TreePanel.java
index 70a3c04..8b1f79c 100644 (file)
--- a/src/jalview/appletgui/TreePanel.java
+++ b/src/jalview/appletgui/TreePanel.java
@@ -190,7 +190,9 @@ public class TreePanel extends EmbmenuFrame implements ActionListener,
       }
       else
       {
-        ScoreModelI sm = configureScoreModel(pwtype);
+        ScoreModelI sm1 = ScoreModels.getInstance().getScoreModel(pwtype,
+                treeCanvas.ap);
+        ScoreModelI sm = sm1;
         TreeBuilder njtree = type.equals(TreeBuilder.NEIGHBOUR_JOINING) ? new NJTree(
                 av, sm, SimilarityParams.Jalview)
                 : new AverageDistanceTree(av, sm, SimilarityParams.Jalview);
@@ -362,18 +364,4 @@ public class TreePanel extends EmbmenuFrame implements ActionListener,
     inputData.addActionListener(this);
   }
 
-  /**
-   * Gets an instantiated score model for the given name, configured for the
-   * current view if applicable
-   * 
-   * @param modelName
-   * @return
-   */
-  protected ScoreModelI configureScoreModel(String modelName)
-  {
-    ScoreModelI sm = ScoreModels.getInstance().getScoreModel(modelName,
-            treeCanvas.ap);
-    return sm;
-  }
-
 }