Merge branch 'develop' into update_212_Dec_merge_with_21125_chamges

[jalview.git] / src / jalview / fts / service / uniprot / UniProtFTSRestClient.java

diff --git a/src/jalview/fts/service/uniprot/UniProtFTSRestClient.java b/src/jalview/fts/service/uniprot/UniProtFTSRestClient.java
index 1827293..f2a9265 100644 (file)
--- a/src/jalview/fts/service/uniprot/UniProtFTSRestClient.java
+++ b/src/jalview/fts/service/uniprot/UniProtFTSRestClient.java
@@ -21,9 +21,12 @@
 
 package jalview.fts.service.uniprot;
 
+import jalview.bin.ApplicationSingletonProvider;
+import jalview.bin.ApplicationSingletonProvider.ApplicationSingletonI;
 import java.lang.invoke.MethodHandles;
 import java.net.MalformedURLException;
 import java.net.URL;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -40,6 +43,7 @@ import jalview.bin.Cache;
 import jalview.bin.Console;
 import jalview.fts.api.FTSData;
 import jalview.fts.api.FTSDataColumnI;
+import jalview.fts.api.FTSRestClientI;
 import jalview.fts.core.FTSRestClient;
 import jalview.fts.core.FTSRestRequest;
 import jalview.fts.core.FTSRestResponse;
@@ -72,9 +76,14 @@ import jalview.util.Platform;
  * Where such a link is passed it is put into the cursors ArrayList.
  * There are @Overridden methods in UniprotFTSPanel.
  */
-
 public class UniProtFTSRestClient extends FTSRestClient
+    implements ApplicationSingletonI,FTSRestClientI
 {
+public static UniProtFTSRestClient getInstance()
+{
+return (UniProtFTSRestClient) ApplicationSingletonProvider
+    .getInstance(UniProtFTSRestClient.class);
+}
   private static final String DEFAULT_UNIPROT_DOMAIN = "https://rest.uniprot.org";
 
   private static final String USER_AGENT = ChannelProperties
@@ -87,11 +96,10 @@ public class UniProtFTSRestClient extends FTSRestClient
     Platform.addJ2SDirectDatabaseCall(DEFAULT_UNIPROT_DOMAIN);
   }
 
-  private static UniProtFTSRestClient instance = null;
 
   public final String uniprotSearchEndpoint;
 
-  public UniProtFTSRestClient()
+  private UniProtFTSRestClient()
   {
     super();
     this.clearCursors();
@@ -214,7 +222,6 @@ public class UniProtFTSRestClient extends FTSRestClient
           }
         }
       }
-
       String uniProtTabDelimittedResponseString = clientResponse
               .getEntity(String.class);
       // Make redundant objects eligible for garbage collection to conserve
@@ -448,14 +455,6 @@ public class UniProtFTSRestClient extends FTSRestClient
     };
   }
 
-  public static UniProtFTSRestClient getInstance()
-  {
-    if (instance == null)
-    {
-      instance = new UniProtFTSRestClient();
-    }
-    return instance;
-  }
 
   @Override
   public String getColumnDataConfigFileName()
@@ -550,4 +549,4 @@ public class UniProtFTSRestClient extends FTSRestClient
     }
     return null;
   }
-}
\ No newline at end of file
+}