Merge branch 'Jalview-JS/develop' into merge_js_develop

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

diff --git a/src/jalview/urls/IdOrgSettings.java b/src/jalview/urls/IdOrgSettings.java
index 7dd1a19..7c38ab6 100644 (file)
--- a/src/jalview/urls/IdOrgSettings.java
+++ b/src/jalview/urls/IdOrgSettings.java
@@ -21,35 +21,46 @@
 
 package jalview.urls;
 
+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 static String url;
+  private String url;
+
+  private String location;
+
+  private static IdOrgSettings getInstance()
+  {
+    return (IdOrgSettings) ApplicationSingletonProvider
+            .getInstance(IdOrgSettings.class);
+  }
 
-  private static String location;
+  private IdOrgSettings()
+  {
+    // private singleton
+  }
 
   public static void setUrl(String seturl)
   {
-    url = seturl;
+    getInstance().url = seturl;
   }
 
   public static void setDownloadLocation(String setloc)
   {
-    location = setloc;
+    getInstance().location = setloc;
   }
 
   public static String getUrl()
   {
-    return url;
+    return getInstance().url;
   }
 
   public static String getDownloadLocation()
   {
-    return location;
+    return getInstance().location;
   }
 }