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-3959 add key retrieval urls that support CORS needed by JalviewJS
[jalview.git]
/
src
/
jalview
/
ws
/
ebi
/
EBIFetchClient.java
diff --git
a/src/jalview/ws/ebi/EBIFetchClient.java
b/src/jalview/ws/ebi/EBIFetchClient.java
index
b773d4e
..
1f833d0
100644
(file)
--- a/
src/jalview/ws/ebi/EBIFetchClient.java
+++ b/
src/jalview/ws/ebi/EBIFetchClient.java
@@
-20,6
+20,8
@@
*/
package jalview.ws.ebi;
*/
package jalview.ws.ebi;
+import java.util.Locale;
+
import jalview.datamodel.DBRefSource;
import jalview.util.MessageManager;
import jalview.util.Platform;
import jalview.datamodel.DBRefSource;
import jalview.util.MessageManager;
import jalview.util.Platform;
@@
-264,7
+266,9
@@
public class EBIFetchClient
}
return null;
}
}
return null;
}
-
+ static {
+ Platform.addJ2SDirectDatabaseCall("https://www.ebi.ac.uk/");
+ }
/**
* Constructs the URL to fetch from
*
/**
* Constructs the URL to fetch from
*
@@
-280,12
+284,12
@@
public class EBIFetchClient
|| database.equalsIgnoreCase(DBRefSource.EMBLCDS))
{
url = "https://www.ebi.ac.uk/ena/browser/api/embl/"
|| database.equalsIgnoreCase(DBRefSource.EMBLCDS))
{
url = "https://www.ebi.ac.uk/ena/browser/api/embl/"
- + ids.toLowerCase() + "?download=true&gzip=true";
+ + ids.toLowerCase(Locale.ROOT) + "?download=true&gzip=true";
}
else
{
url = "https://www.ebi.ac.uk/Tools/dbfetch/dbfetch/"
}
else
{
url = "https://www.ebi.ac.uk/Tools/dbfetch/dbfetch/"
- + database.toLowerCase() + "/" + ids.toLowerCase()
+ + database.toLowerCase(Locale.ROOT) + "/" + ids.toLowerCase(Locale.ROOT)
+ (format != null ? "/" + format : "");
}
return url;
+ (format != null ? "/" + format : "");
}
return url;