JAL-2403 simplify instantiation / configuration of score model for view

[jalview.git] / src / jalview / analysis / scoremodels / ScoreModels.java

diff --git a/src/jalview/analysis/scoremodels/ScoreModels.java b/src/jalview/analysis/scoremodels/ScoreModels.java
index 7146383..654136a 100644 (file)
--- a/src/jalview/analysis/scoremodels/ScoreModels.java
+++ b/src/jalview/analysis/scoremodels/ScoreModels.java
@@ -2,7 +2,6 @@ package jalview.analysis.scoremodels;
 
 import jalview.api.AlignmentViewPanel;
 import jalview.api.analysis.ScoreModelI;
-import jalview.api.analysis.ViewBasedAnalysisI;
 import jalview.io.DataSourceType;
 import jalview.io.FileParse;
 import jalview.io.ScoreMatrixFile;
@@ -105,20 +104,7 @@ public class ScoreModels
   public ScoreModelI getScoreModel(String name, AlignmentViewPanel avp)
   {
     ScoreModelI model = models.get(name);
-    if (model instanceof ViewBasedAnalysisI)
-    {
-      try
-      {
-        model = model.getClass().newInstance();
-        ((ViewBasedAnalysisI) model).configureFromAlignmentView(avp);
-      } catch (IllegalAccessException | InstantiationException e)
-      {
-        System.err.println("Error creating score model " + name + ": "
-                + e.getMessage());
-        return null;
-      }
-    }
-    return model;
+    return model == null ? null : model.getInstance(avp);
   }
 
   public void registerScoreModel(ScoreModelI sm)