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-3691 patch toUpper/toLower to use Locale.ROOT for 2.11.2 getdown - needs rebuild...
[jalview.git]
/
getdown
/
src
/
getdown
/
core
/
src
/
main
/
java
/
jalview
/
util
/
StringUtils.java
diff --git
a/getdown/src/getdown/core/src/main/java/jalview/util/StringUtils.java
b/getdown/src/getdown/core/src/main/java/jalview/util/StringUtils.java
index
d758395
..
afb9c89
100644
(file)
--- a/
getdown/src/getdown/core/src/main/java/jalview/util/StringUtils.java
+++ b/
getdown/src/getdown/core/src/main/java/jalview/util/StringUtils.java
@@
-24,6
+24,7
@@
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.List;
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.List;
+import java.util.Locale;
import java.util.regex.Pattern;
public class StringUtils
import java.util.regex.Pattern;
public class StringUtils
@@
-409,9
+410,9
@@
public class StringUtils
}
if (s.length() <= 1)
{
}
if (s.length() <= 1)
{
- return s.toUpperCase();
+ return s.toUpperCase(Locale.ROOT);
}
}
- return s.substring(0, 1).toUpperCase() + s.substring(1).toLowerCase();
+ return s.substring(0, 1).toUpperCase(Locale.ROOT) + s.substring(1).toLowerCase(Locale.ROOT);
}
/**
}
/**
@@
-427,7
+428,7
@@
public class StringUtils
{
return null;
}
{
return null;
}
- String tmp2up = text.toUpperCase();
+ String tmp2up = text.toUpperCase(Locale.ROOT);
int startTag = tmp2up.indexOf("<HTML>");
if (startTag > -1)
{
int startTag = tmp2up.indexOf("<HTML>");
if (startTag > -1)
{
@@
-572,9
+573,9
@@
public class StringUtils
public static int firstCharPosIgnoreCase(String text, String chars)
{
int min = text.length() + 1;
public static int firstCharPosIgnoreCase(String text, String chars)
{
int min = text.length() + 1;
- for (char c : chars.toLowerCase().toCharArray())
+ for (char c : chars.toLowerCase(Locale.ROOT).toCharArray())
{
{
- int i = text.toLowerCase().indexOf(c);
+ int i = text.toLowerCase(Locale.ROOT).indexOf(c);
if (0 <= i && i < min)
{
min = i;
if (0 <= i && i < min)
{
min = i;