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 4d42e0b..cd7e98e 100644 (file)
--- a/src/jalview/urls/IdOrgSettings.java
+++ b/src/jalview/urls/IdOrgSettings.java
@@ -21,24 +21,22 @@
 
 package jalview.urls;
 
-import jalview.bin.Jalview;
+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 String location;
 
-  public static IdOrgSettings getInstance()
+  private static IdOrgSettings getInstance()
   {
-    Jalview j = Jalview.getInstance();
-    return (j.idOrgSettings == null ? j.idOrgSettings = new IdOrgSettings()
-            : j.idOrgSettings);
+    return (IdOrgSettings) ApplicationSingletonProvider
+            .getInstance(IdOrgSettings.class);
   }
 
   public static void setUrl(String seturl)
@@ -60,4 +58,9 @@ public class IdOrgSettings
   {
     return getInstance().location;
   }
+
+  private IdOrgSettings()
+  {
+    // private singleton
+  }
 }