JAL-3253-applet feature parameter processing fixed

[jalview.git] / src / jalview / schemes / ColourSchemes.java

diff --git a/src/jalview/schemes/ColourSchemes.java b/src/jalview/schemes/ColourSchemes.java
index b3f94b6..e11540c 100644 (file)
--- a/src/jalview/schemes/ColourSchemes.java
+++ b/src/jalview/schemes/ColourSchemes.java
@@ -21,7 +21,8 @@
 package jalview.schemes;
 
 import jalview.api.AlignViewportI;
-import jalview.bin.Instance;
+import jalview.bin.ApplicationSingletonProvider;
+import jalview.bin.ApplicationSingletonProvider.ApplicationSingletonI;
 import jalview.datamodel.AnnotatedCollectionI;
 import jalview.datamodel.SequenceCollectionI;
 import jalview.datamodel.SequenceI;
@@ -31,7 +32,7 @@ import java.awt.Color;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-public class ColourSchemes
+public class ColourSchemes implements ApplicationSingletonI
 {
 
   /**
@@ -41,9 +42,8 @@ public class ColourSchemes
    */
   public static ColourSchemes getInstance()
   {
-    Instance j = Instance.getInstance();
-    return (j.colourSchemes == null ? j.colourSchemes = new ColourSchemes()
-            : j.colourSchemes);
+    return (ColourSchemes) ApplicationSingletonProvider
+            .getInstance(ColourSchemes.class);
   }
 
   private ColourSchemes()