X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fschemes%2FColourSchemes.java;fp=src%2Fjalview%2Fschemes%2FColourSchemes.java;h=e11540cea8ed7858e2c10344d341e4669cc7dca5;hb=f6a84063f10ea1ae9898310c541961cd1d53dd8a;hp=b3f94b6507ed3959b0218520b587a09c6e534451;hpb=e77f88b41189114f6828fe9390dfe6f6839555ae;p=jalview.git diff --git a/src/jalview/schemes/ColourSchemes.java b/src/jalview/schemes/ColourSchemes.java index b3f94b6..e11540c 100644 --- 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()