JAL-3253 jalview.bin.Instance handles all singleton instances -

[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 3cbd5f1..8afc4fc 100644 (file)
--- a/src/jalview/analysis/scoremodels/ScoreModels.java
+++ b/src/jalview/analysis/scoremodels/ScoreModels.java
@@ -22,6 +22,7 @@ package jalview.analysis.scoremodels;
 
 import jalview.api.AlignmentViewPanel;
 import jalview.api.analysis.ScoreModelI;
+import jalview.bin.Instance;
 import jalview.io.DataSourceType;
 import jalview.io.FileParse;
 import jalview.io.ScoreMatrixFile;
@@ -41,15 +42,21 @@ public class ScoreModels
 
   private final ScoreMatrix DNA;
 
-  private static ScoreModels instance = new ScoreModels();
-
-  private Map<String, ScoreModelI> models;
-
+  /**
+   * Answers the singleton instance of this class, with lazy initialisation
+   * (built-in score models are loaded on the first call to this method)
+   * 
+   * @return
+   */
   public static ScoreModels getInstance()
   {
-    return instance;
+    Instance j = Instance.getInstance();
+    return (j.scoreModels == null ? j.scoreModels = new ScoreModels()
+            : j.scoreModels);
   }
 
+  private Map<String, ScoreModelI> models;
+
   /**
    * Private constructor to enforce use of singleton. Registers Jalview's
    * "built-in" score models:
@@ -139,6 +146,14 @@ public class ScoreModels
   }
 
   /**
+   * Resets to just the built-in score models
+   */
+  public void reset()
+  {
+    Instance.getInstance().scoreModels = new ScoreModels();
+  }
+
+  /**
    * Returns the default peptide or nucleotide score model, currently BLOSUM62
    * or DNA
    *