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-3931 remove % and - from ids so Pymol doesn’t strip them out and truncate the...
[jalview.git]
/
src
/
jalview
/
ext
/
ensembl
/
EnsemblSequenceFetcher.java
diff --git
a/src/jalview/ext/ensembl/EnsemblSequenceFetcher.java
b/src/jalview/ext/ensembl/EnsemblSequenceFetcher.java
index
8296985
..
7454eb6
100644
(file)
--- a/
src/jalview/ext/ensembl/EnsemblSequenceFetcher.java
+++ b/
src/jalview/ext/ensembl/EnsemblSequenceFetcher.java
@@
-42,7
+42,8
@@
abstract class EnsemblSequenceFetcher extends DbSourceProxyImpl
// domain properties default values:
protected static final String DEFAULT_ENSEMBL_BASEURL = "https://rest.ensembl.org";
// domain properties default values:
protected static final String DEFAULT_ENSEMBL_BASEURL = "https://rest.ensembl.org";
- protected static final String DEFAULT_ENSEMBL_GENOMES_BASEURL = "https://rest.ensemblgenomes.org";
+ // ensemblgenomes REST service merged to ensembl 9th April 2019
+ protected static final String DEFAULT_ENSEMBL_GENOMES_BASEURL = DEFAULT_ENSEMBL_BASEURL;
/*
* accepts ENSG/T/E/P with 11 digits
/*
* accepts ENSG/T/E/P with 11 digits
@@
-102,10
+103,6
@@
abstract class EnsemblSequenceFetcher extends DbSourceProxyImpl
public String getDbSource()
{
// NB ensure Uniprot xrefs are canonicalised from "Ensembl" to "ENSEMBL"
public String getDbSource()
{
// NB ensure Uniprot xrefs are canonicalised from "Ensembl" to "ENSEMBL"
- if (ensemblGenomesDomain.equals(getDomain()))
- {
- return DBRefSource.ENSEMBLGENOMES;
- }
return DBRefSource.ENSEMBL;
}
return DBRefSource.ENSEMBL;
}