git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
8700ec0
..
ebc9a26
100644
(file)
--- a/
src/jalview/analysis/scoremodels/ScoreModels.java
+++ b/
src/jalview/analysis/scoremodels/ScoreModels.java
@@
-22,8
+22,6
@@
package jalview.analysis.scoremodels;
import jalview.api.AlignmentViewPanel;
import jalview.api.analysis.ScoreModelI;
import jalview.api.AlignmentViewPanel;
import jalview.api.analysis.ScoreModelI;
-import jalview.bin.ApplicationSingletonProvider;
-import jalview.bin.ApplicationSingletonProvider.ApplicationSingletonI;
import jalview.io.DataSourceType;
import jalview.io.FileParse;
import jalview.io.ScoreMatrixFile;
import jalview.io.DataSourceType;
import jalview.io.FileParse;
import jalview.io.ScoreMatrixFile;
@@
-35,8
+33,18
@@
import java.util.Map;
/**
* A class that can register and serve instances of ScoreModelI
*/
/**
* A class that can register and serve instances of ScoreModelI
*/
-public class ScoreModels implements ApplicationSingletonI
+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)
/**
* Answers the singleton instance of this class, with lazy initialisation
* (built-in score models are loaded on the first call to this method)
@@
-45,7
+53,11
@@
public class ScoreModels implements ApplicationSingletonI
*/
public static ScoreModels getInstance()
{
*/
public static ScoreModels getInstance()
{
- return (ScoreModels) ApplicationSingletonProvider.getInstance(ScoreModels.class);
+ if (instance == null)
+ {
+ instance = new ScoreModels();
+ }
+ return instance;
}
/**
}
/**
@@
-72,14
+84,6
@@
public class ScoreModels implements ApplicationSingletonI
registerScoreModel(new FeatureDistanceModel());
}
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.
/**
* Tries to load a score matrix from the given resource file, and if
* successful, registers it.
@@
-149,7
+153,7
@@
public class ScoreModels implements ApplicationSingletonI
*/
public void reset()
{
*/
public void reset()
{
- ApplicationSingletonProvider.removeInstance(this.getClass());
+ instance = new ScoreModels();
}
/**
}
/**