X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fws%2FDBRefFetcher.java;h=942046596ce3bdbc8c9d8986910de170a035ab08;hb=9d2408483e451285fd555c3cd6e0273977acbaa7;hp=7daa7b4885420b7c86ccbf19ab32d6281e304a87;hpb=214ad7e089fdf9cde66ac5e5d56d498101bbe2c3;p=jalview.git diff --git a/src/jalview/ws/DBRefFetcher.java b/src/jalview/ws/DBRefFetcher.java index 7daa7b4..9420465 100644 --- a/src/jalview/ws/DBRefFetcher.java +++ b/src/jalview/ws/DBRefFetcher.java @@ -20,6 +20,8 @@ */ package jalview.ws; +import java.util.Locale; + import java.util.ArrayList; import java.util.Arrays; import java.util.Enumeration; @@ -243,7 +245,7 @@ public class DBRefFetcher implements Runnable */ void addSeqId(SequenceI seq, String key) { - key = key.toUpperCase(); + key = key.toUpperCase(Locale.ROOT); Vector seqs; if (seqRefs.containsKey(key)) @@ -397,7 +399,7 @@ public class DBRefFetcher implements Runnable DBRefEntry upref = uprefs.get(j); addSeqId(sequence, upref.getAccessionId()); queries.addElement( - upref.getAccessionId().toUpperCase()); + upref.getAccessionId().toUpperCase(Locale.ROOT)); } } else @@ -436,7 +438,7 @@ public class DBRefFetcher implements Runnable "Validated ID against PICR... (for what its worth):" + token); addSeqId(sequence, token); - queries.addElement(token.toUpperCase()); + queries.addElement(token.toUpperCase(Locale.ROOT)); } else { @@ -444,7 +446,7 @@ public class DBRefFetcher implements Runnable // System.out.println("Not querying source with // token="+token+"\n"); addSeqId(sequence, token); - queries.addElement(token.toUpperCase()); + queries.addElement(token.toUpperCase(Locale.ROOT)); } } } @@ -540,7 +542,7 @@ public class DBRefFetcher implements Runnable DBRefEntry ref = entryRefs.get(j); String accessionId = ref.getAccessionId(); // match up on accessionId - if (seqRefs.containsKey(accessionId.toUpperCase())) + if (seqRefs.containsKey(accessionId.toUpperCase(Locale.ROOT))) { Vector seqs = seqRefs.get(accessionId); for (int jj = 0; jj < seqs.size(); jj++) @@ -592,7 +594,7 @@ public class DBRefFetcher implements Runnable // sequenceMatches now contains the set of all sequences associated with // the returned db record final String retrievedSeqString = retrievedSeq.getSequenceAsString(); - String entrySeq = retrievedSeqString.toUpperCase(); + String entrySeq = retrievedSeqString.toUpperCase(Locale.ROOT); for (int m = 0; m < sequenceMatches.size(); m++) { sequence = sequenceMatches.elementAt(m); @@ -611,7 +613,7 @@ public class DBRefFetcher implements Runnable boolean remoteEnclosesLocal = false; String nonGapped = AlignSeq .extractGaps("-. ", sequence.getSequenceAsString()) - .toUpperCase(); + .toUpperCase(Locale.ROOT); int absStart = entrySeq.indexOf(nonGapped); if (absStart == -1) { @@ -731,10 +733,10 @@ public class DBRefFetcher implements Runnable String ngAlsq = AlignSeq .extractGaps("-. ", alseqs[alsq].getSequenceAsString()) - .toUpperCase(); + .toUpperCase(Locale.ROOT); int oldstrt = alseqs[alsq].getStart(); alseqs[alsq].setStart(sequence.getSequenceAsString() - .toUpperCase().indexOf(ngAlsq) + sequence.getStart()); + .toUpperCase(Locale.ROOT).indexOf(ngAlsq) + sequence.getStart()); if (oldstrt != alseqs[alsq].getStart()) { alseqs[alsq].setEnd(