JAL-3253 ApplicationSingletonProvider replaces Instance

[jalview.git] / src / jalview / structure / StructureImportSettings.java

diff --git a/src/jalview/structure/StructureImportSettings.java b/src/jalview/structure/StructureImportSettings.java
index c439914..b5672ab 100644 (file)
--- a/src/jalview/structure/StructureImportSettings.java
+++ b/src/jalview/structure/StructureImportSettings.java
@@ -20,7 +20,8 @@
  */
 package jalview.structure;
 
-import jalview.bin.Instance;
+import jalview.bin.ApplicationSingletonProvider;
+import jalview.bin.ApplicationSingletonProvider.ApplicationSingletonI;
 import jalview.datamodel.PDBEntry;
 import jalview.datamodel.PDBEntry.Type;
 
@@ -31,20 +32,18 @@ import jalview.datamodel.PDBEntry.Type;
  * @author tcofoegbu
  *
  */
-public class StructureImportSettings
+public class StructureImportSettings implements ApplicationSingletonI
 {
 
   private StructureImportSettings()
   {
-    // singleton
+    // private singleton
   }
 
   private static StructureImportSettings getInstance()
   {
-    Instance j = Instance.getInstance();
-    return (j.structureImportSettings == null
-            ? j.structureImportSettings = new StructureImportSettings()
-            : j.structureImportSettings);
+    return (StructureImportSettings) ApplicationSingletonProvider
+            .getInstance(StructureImportSettings.class);
   }
 
   /**