import jalview.api.AlignmentViewPanel;
import jalview.api.analysis.ScoreModelI;
+import jalview.bin.Jalview;
import jalview.io.DataSourceType;
import jalview.io.FileParse;
import jalview.io.ScoreMatrixFile;
-import jalview.util.Platform;
import java.io.IOException;
import java.util.LinkedHashMap;
private final ScoreMatrix DNA;
- private static ScoreModels instance;
-
/**
* Answers the singleton instance of this class, with lazy initialisation
* (built-in score models are loaded on the first call to this method)
*/
public static ScoreModels getInstance()
{
- ScoreModels m = instance;
- @SuppressWarnings("unused")
- ThreadGroup g = null;
- if (Platform.isJS())
- {
- g = Thread.currentThread().getThreadGroup();
- /**
- * @j2sNative m = g._jalviewScoreModelsInstance;
- *
- */
- }
- if (m == null)
- {
- m = new ScoreModels();
- if (Platform.isJS())
- {
- /**
- * @j2sNative g._jalviewScoreModelsInstance = m;
- *
- */
- }
- else
- {
- instance = m;
- }
- }
- return m;
+ Jalview j = Jalview.getInstance();
+ return (j.scoreModels == null ? j.scoreModels = new ScoreModels()
+ : j.scoreModels);
}
private Map<String, ScoreModelI> models;
*/
public void reset()
{
- instance = new ScoreModels();
+ Jalview.getInstance().scoreModels = new ScoreModels();
}
/**