package jalview.fts.service.uniprot;
import jalview.bin.Cache;
+import jalview.bin.Instance;
import jalview.fts.api.FTSData;
import jalview.fts.api.FTSDataColumnI;
import jalview.fts.api.FTSRestClientI;
Platform.addJ2SDirectDatabaseCall(DEFAULT_UNIPROT_DOMAIN);
}
- private static FTSRestClientI instance = null;
-
public static FTSRestClientI getInstance()
{
-
- // BH 2019.05.08 need to isolate static fields in JavaScript
-
- FTSRestClientI i = instance;
- @SuppressWarnings("unused")
- ThreadGroup g = null;
- if (Platform.isJS())
- {
- g = Thread.currentThread().getThreadGroup();
- /**
- * @j2sNative i = g._jalviewUniProtFTSRestClientInstance;
- *
- */
- }
- if (i == null)
- {
- i = new UniProtFTSRestClient();
-
- if (Platform.isJS())
- {
- /**
- * @j2sNative g._jalviewUniProtFTSRestClientInstance = i;
- *
- */
- }
- else
- {
- instance = i;
- }
- }
- return i;
+ Instance j = Instance.getInstance();
+ return (j.uniprotFTSRestClient == null ? j.uniprotFTSRestClient = new UniProtFTSRestClient()
+ : j.uniprotFTSRestClient);
}
public final String uniprotSearchEndpoint;
- public UniProtFTSRestClient()
+ private UniProtFTSRestClient()
{
- super();
uniprotSearchEndpoint = Cache.getDefault("UNIPROT_DOMAIN",
DEFAULT_UNIPROT_DOMAIN) + "/uniprot/";
}