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
Merge branch 'develop' into features/JAL-1793VCF; lambda Function for
[jalview.git]
/
src
/
jalview
/
ext
/
ensembl
/
EnsemblRestClient.java
diff --git
a/src/jalview/ext/ensembl/EnsemblRestClient.java
b/src/jalview/ext/ensembl/EnsemblRestClient.java
index
b1bc8e5
..
e3d1215
100644
(file)
--- a/
src/jalview/ext/ensembl/EnsemblRestClient.java
+++ b/
src/jalview/ext/ensembl/EnsemblRestClient.java
@@
-72,7
+72,7
@@
abstract class EnsemblRestClient extends EnsemblSequenceFetcher
private static final String REST_CHANGE_LOG = "https://github.com/Ensembl/ensembl-rest/wiki/Change-log";
private static final String REST_CHANGE_LOG = "https://github.com/Ensembl/ensembl-rest/wiki/Change-log";
- private static Map<String, EnsemblInfo> domainData;
+ private static Map<String, EnsemblData> domainData;
// @see https://github.com/Ensembl/ensembl-rest/wiki/Output-formats
private static final String PING_URL = "http://rest.ensembl.org/info/ping.json";
// @see https://github.com/Ensembl/ensembl-rest/wiki/Output-formats
private static final String PING_URL = "http://rest.ensembl.org/info/ping.json";
@@
-87,8
+87,8
@@
abstract class EnsemblRestClient extends EnsemblSequenceFetcher
{
domainData = new HashMap<>();
domainData.put(ENSEMBL_REST,
{
domainData = new HashMap<>();
domainData.put(ENSEMBL_REST,
- new EnsemblInfo(ENSEMBL_REST, LATEST_ENSEMBL_REST_VERSION));
- domainData.put(ENSEMBL_GENOMES_REST, new EnsemblInfo(
+ new EnsemblData(ENSEMBL_REST, LATEST_ENSEMBL_REST_VERSION));
+ domainData.put(ENSEMBL_GENOMES_REST, new EnsemblData(
ENSEMBL_GENOMES_REST, LATEST_ENSEMBLGENOMES_REST_VERSION));
}
ENSEMBL_GENOMES_REST, LATEST_ENSEMBLGENOMES_REST_VERSION));
}
@@
-381,7
+381,7
@@
abstract class EnsemblRestClient extends EnsemblSequenceFetcher
*/
protected boolean isEnsemblAvailable()
{
*/
protected boolean isEnsemblAvailable()
{
- EnsemblInfo info = domainData.get(getDomain());
+ EnsemblData info = domainData.get(getDomain());
long now = System.currentTimeMillis();
long now = System.currentTimeMillis();
@@
-455,7
+455,7
@@
abstract class EnsemblRestClient extends EnsemblSequenceFetcher
*/
private void checkEnsemblRestVersion()
{
*/
private void checkEnsemblRestVersion()
{
- EnsemblInfo info = domainData.get(getDomain());
+ EnsemblData info = domainData.get(getDomain());
JSONParser jp = new JSONParser();
URL url = null;
JSONParser jp = new JSONParser();
URL url = null;