JAL-3253 code tidies and tweaks to Desktop

[jalview.git] / src / jalview / urls / IdOrgSettings.java

diff --git a/src/jalview/urls/IdOrgSettings.java b/src/jalview/urls/IdOrgSettings.java
index d99d16d..cd7e98e 100644 (file)
--- a/src/jalview/urls/IdOrgSettings.java
+++ b/src/jalview/urls/IdOrgSettings.java
@@ -21,33 +21,24 @@
 
 package jalview.urls;
 
-import jalview.bin.Instance;
+import jalview.bin.ApplicationSingletonProvider;
+import jalview.bin.ApplicationSingletonProvider.ApplicationSingletonI;
 
 /**
  * Holds settings for identifiers.org e.g. url, download location
- * 
- * @author $author$
- * @version $Revision$
  */
-public class IdOrgSettings
+public class IdOrgSettings implements ApplicationSingletonI
 {
+  private String url;
 
-  private IdOrgSettings()
-  {
-    // private singleton
-  }
+  private String location;
 
   private static IdOrgSettings getInstance()
   {
-    Instance j = Instance.getInstance();
-    return (j.idOrgSettings == null ? j.idOrgSettings = new IdOrgSettings()
-            : j.idOrgSettings);
+    return (IdOrgSettings) ApplicationSingletonProvider
+            .getInstance(IdOrgSettings.class);
   }
 
-  private String url;
-
-  private String location;
-
   public static void setUrl(String seturl)
   {
     getInstance().url = seturl;
@@ -67,4 +58,9 @@ public class IdOrgSettings
   {
     return getInstance().location;
   }
+
+  private IdOrgSettings()
+  {
+    // private singleton
+  }
 }