JAL-3210 Barebones gradle/buildship/eclipse. See README

[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 7431b86..ebc9a26 100644 (file)
--- a/src/jalview/analysis/scoremodels/ScoreModels.java
+++ b/src/jalview/analysis/scoremodels/ScoreModels.java
@@ -22,7 +22,6 @@ 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;
@@ -36,6 +35,16 @@ import java.util.Map;
  */
 public class ScoreModels
 {
+  private final ScoreMatrix BLOSUM62;
+
+  private final ScoreMatrix PAM250;
+
+  private final ScoreMatrix DNA;
+
+  private static ScoreModels instance;
+
+  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)
@@ -44,9 +53,11 @@ public class ScoreModels
    */
   public static ScoreModels getInstance()
   {
-    Instance j = Instance.getInstance();
-    return (j.scoreModels == null ? j.scoreModels = new ScoreModels()
-            : j.scoreModels);
+    if (instance == null)
+    {
+      instance = new ScoreModels();
+    }
+    return instance;
   }
 
   /**
@@ -73,14 +84,6 @@ public class ScoreModels
     registerScoreModel(new FeatureDistanceModel());
   }
 
-  private final ScoreMatrix BLOSUM62;
-
-  private final ScoreMatrix PAM250;
-
-  private final ScoreMatrix DNA;
-
-  private Map<String, ScoreModelI> models;
-
   /**
    * Tries to load a score matrix from the given resource file, and if
    * successful, registers it.
@@ -150,7 +153,7 @@ public class ScoreModels
    */
   public void reset()
   {
-    Instance.getInstance().scoreModels = new ScoreModels();
+    instance = new ScoreModels();
   }
 
   /**