Merge branch 'Jalview-JS/develop' into merge_js_develop

[jalview.git] / src / jalview / datamodel / features / FeatureSources.java

diff --git a/src/jalview/datamodel/features/FeatureSources.java b/src/jalview/datamodel/features/FeatureSources.java
index b316821..4a87349 100644 (file)
--- a/src/jalview/datamodel/features/FeatureSources.java
+++ b/src/jalview/datamodel/features/FeatureSources.java
@@ -23,6 +23,9 @@ package jalview.datamodel.features;
 import java.util.HashMap;
 import java.util.Map;
 
+import jalview.bin.ApplicationSingletonProvider;
+import jalview.bin.ApplicationSingletonProvider.ApplicationSingletonI;
+
 /**
  * A singleton to hold metadata about feature attributes, keyed by a unique
  * feature source identifier
@@ -30,22 +33,17 @@ import java.util.Map;
  * @author gmcarstairs
  *
  */
-public class FeatureSources
+public class FeatureSources implements ApplicationSingletonI
 {
-  private static FeatureSources instance = new FeatureSources();
-
-  private Map<String, FeatureSourceI> sources;
 
-  /**
-   * Answers the singleton instance of this class
-   * 
-   * @return
-   */
   public static FeatureSources getInstance()
   {
-    return instance;
+    return (FeatureSources) ApplicationSingletonProvider
+            .getInstance(FeatureSources.class);
   }
 
+  private Map<String, FeatureSourceI> sources;
+
   private FeatureSources()
   {
     sources = new HashMap<>();