X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fsifts%2FSiftsSettings.java;h=88aaed43963203035c4968cb8984fdd26df1eeb0;hb=f6a84063f10ea1ae9898310c541961cd1d53dd8a;hp=31274d982d3a976fc1c8d746be633178590c2d7a;hpb=208f2c3de82e3327c4f930ab7d04f5b812ccd277;p=jalview.git diff --git a/src/jalview/ws/sifts/SiftsSettings.java b/src/jalview/ws/sifts/SiftsSettings.java index 31274d9..88aaed4 100644 --- a/src/jalview/ws/sifts/SiftsSettings.java +++ b/src/jalview/ws/sifts/SiftsSettings.java @@ -20,12 +20,30 @@ */ package jalview.ws.sifts; -import jalview.bin.Jalview; +import jalview.bin.ApplicationSingletonProvider; +import jalview.bin.ApplicationSingletonProvider.ApplicationSingletonI; import java.util.Objects; -public class SiftsSettings +public class SiftsSettings implements ApplicationSingletonI { + + /** + * public only for testng + * + * @return + */ + public static SiftsSettings getInstance() + { + return (SiftsSettings) ApplicationSingletonProvider + .getInstance(SiftsSettings.class); + } + + private SiftsSettings() + { + // singleton; use getInstance() + } + private boolean mapWithSifts = false; private String siftDownloadDirectory; @@ -34,16 +52,6 @@ public class SiftsSettings private int failSafePIDThreshold; - private static SiftsSettings getInstance() - { - { - Jalview j = Jalview.getInstance(); - return (j.siftsSettings == null - ? j.siftsSettings = new SiftsSettings() - : j.siftsSettings); - } - - } public static boolean isMapWithSifts() { return getInstance().mapWithSifts;