X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fext%2Fensembl%2FEnsemblInfo.java;h=a32edb35a19116d27047061034ed0b9a6268da76;hb=57738a1f3c19b1c3a00bd3ac5108f8cd0af32f99;hp=97ad242e0795ee66d0a5d65ae6f287d36d7817f8;hpb=65740880573a48adc758bec3939ece9d9ae104dd;p=jalview.git diff --git a/src/jalview/ext/ensembl/EnsemblInfo.java b/src/jalview/ext/ensembl/EnsemblInfo.java index 97ad242..a32edb3 100644 --- a/src/jalview/ext/ensembl/EnsemblInfo.java +++ b/src/jalview/ext/ensembl/EnsemblInfo.java @@ -20,6 +20,8 @@ */ package jalview.ext.ensembl; +import java.util.Locale; + import jalview.datamodel.AlignmentI; import jalview.datamodel.DBRefSource; import jalview.util.JSONUtils; @@ -94,7 +96,7 @@ public class EnsemblInfo extends EnsemblRestClient { fetchDivisions(); } - return divisions.get(division.toUpperCase()); + return divisions.get(division.toUpperCase(Locale.ROOT)); } /** @@ -108,17 +110,21 @@ public class EnsemblInfo extends EnsemblRestClient /* * for convenience, pre-fill ensembl.org as the domain for "ENSEMBL" */ - divisions.put(DBRefSource.ENSEMBL.toUpperCase(), ensemblDomain); + divisions.put(DBRefSource.ENSEMBL.toUpperCase(Locale.ROOT), + ensemblDomain); try { @SuppressWarnings("unchecked") - Iterator rvals = (Iterator) getJSON(getDivisionsUrl(ensemblGenomesDomain), null, -1, MODE_ITERATOR, null); + Iterator rvals = (Iterator) getJSON( + getDivisionsUrl(ensemblGenomesDomain), null, -1, + MODE_ITERATOR, null); if (rvals == null) - return; + return; while (rvals.hasNext()) { String division = rvals.next().toString(); - divisions.put(division.toUpperCase(), ensemblGenomesDomain); + divisions.put(division.toUpperCase(Locale.ROOT), + ensemblGenomesDomain); } } catch (IOException | ParseException | NumberFormatException e) { @@ -128,15 +134,17 @@ public class EnsemblInfo extends EnsemblRestClient /** * Constructs the URL for the EnsemblGenomes /info/divisions REST service - * @param domain TODO + * + * @param domain + * TODO * * @return * @throws MalformedURLException */ URL getDivisionsUrl(String domain) throws MalformedURLException { - return new URL(domain - + "/info/divisions?content-type=application/json"); + return new URL( + domain + "/info/divisions?content-type=application/json"); } /** @@ -144,7 +152,8 @@ public class EnsemblInfo extends EnsemblRestClient * * @return */ - public Set getDivisions() { + public Set getDivisions() + { if (divisions == null) { fetchDivisions();