git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-3253 jalview.bin.Instance handles all singleton instances -
[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
3f0b8a4
..
455ea98
100644
(file)
--- a/
src/jalview/fts/service/uniprot/UniProtFTSRestClient.java
+++ b/
src/jalview/fts/service/uniprot/UniProtFTSRestClient.java
@@
-22,6
+22,7
@@
package jalview.fts.service.uniprot;
import jalview.bin.Cache;
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;
import jalview.fts.api.FTSData;
import jalview.fts.api.FTSDataColumnI;
import jalview.fts.api.FTSRestClientI;
@@
-52,13
+53,17
@@
public class UniProtFTSRestClient extends FTSRestClient
Platform.addJ2SDirectDatabaseCall(DEFAULT_UNIPROT_DOMAIN);
}
Platform.addJ2SDirectDatabaseCall(DEFAULT_UNIPROT_DOMAIN);
}
- private static FTSRestClientI instance = null;
+ public static FTSRestClientI getInstance()
+ {
+ Instance j = Instance.getInstance();
+ return (j.uniprotFTSRestClient == null ? j.uniprotFTSRestClient = new UniProtFTSRestClient()
+ : j.uniprotFTSRestClient);
+ }
public final String uniprotSearchEndpoint;
public final String uniprotSearchEndpoint;
- public UniProtFTSRestClient()
+ private UniProtFTSRestClient()
{
{
- super();
uniprotSearchEndpoint = Cache.getDefault("UNIPROT_DOMAIN",
DEFAULT_UNIPROT_DOMAIN) + "/uniprot/";
}
uniprotSearchEndpoint = Cache.getDefault("UNIPROT_DOMAIN",
DEFAULT_UNIPROT_DOMAIN) + "/uniprot/";
}
@@
-347,15
+352,6
@@
public class UniProtFTSRestClient extends FTSRestClient
};
}
};
}
- public static FTSRestClientI getInstance()
- {
- if (instance == null)
- {
- instance = new UniProtFTSRestClient();
- }
- return instance;
- }
-
@Override
public String getColumnDataConfigFileName()
{
@Override
public String getColumnDataConfigFileName()
{