Merge pull request #128 from sdgx/locale-dependent-comparison
Use ROOT locale when lowercasing strings
This commit is contained in:
@@ -12,6 +12,7 @@ import java.util.Collections;
|
|||||||
import java.util.Comparator;
|
import java.util.Comparator;
|
||||||
import java.util.EnumSet;
|
import java.util.EnumSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Locale;
|
||||||
import java.util.jar.JarEntry;
|
import java.util.jar.JarEntry;
|
||||||
import java.util.jar.JarFile;
|
import java.util.jar.JarFile;
|
||||||
|
|
||||||
@@ -207,7 +208,7 @@ public class Resource implements Comparable<Resource>
|
|||||||
throws IOException
|
throws IOException
|
||||||
{
|
{
|
||||||
File file;
|
File file;
|
||||||
if (_local.toString().toLowerCase().endsWith(Application.CONFIG_FILE)) {
|
if (_local.toString().toLowerCase(Locale.ROOT).endsWith(Application.CONFIG_FILE)) {
|
||||||
file = _local;
|
file = _local;
|
||||||
} else {
|
} else {
|
||||||
file = _localNew.exists() ? _localNew : _local;
|
file = _localNew.exists() ? _localNew : _local;
|
||||||
|
|||||||
@@ -51,8 +51,8 @@ public class Config
|
|||||||
public static ParseOpts createOpts (boolean checkPlatform) {
|
public static ParseOpts createOpts (boolean checkPlatform) {
|
||||||
ParseOpts opts = new ParseOpts();
|
ParseOpts opts = new ParseOpts();
|
||||||
if (checkPlatform) {
|
if (checkPlatform) {
|
||||||
opts.osname = StringUtil.deNull(System.getProperty("os.name")).toLowerCase();
|
opts.osname = StringUtil.deNull(System.getProperty("os.name")).toLowerCase(Locale.ROOT);
|
||||||
opts.osarch = StringUtil.deNull(System.getProperty("os.arch")).toLowerCase();
|
opts.osarch = StringUtil.deNull(System.getProperty("os.arch")).toLowerCase(Locale.ROOT);
|
||||||
}
|
}
|
||||||
return opts;
|
return opts;
|
||||||
}
|
}
|
||||||
@@ -360,7 +360,7 @@ public class Config
|
|||||||
/** A helper function for {@link #checkQualifiers}. */
|
/** A helper function for {@link #checkQualifiers}. */
|
||||||
protected static boolean checkQualifier (String qual, String osname, String osarch)
|
protected static boolean checkQualifier (String qual, String osname, String osarch)
|
||||||
{
|
{
|
||||||
String[] bits = qual.trim().toLowerCase().split("-");
|
String[] bits = qual.trim().toLowerCase(Locale.ROOT).split("-");
|
||||||
String os = bits[0], arch = (bits.length > 1) ? bits[1] : "";
|
String os = bits[0], arch = (bits.length > 1) ? bits[1] : "";
|
||||||
return (osname.indexOf(os) != -1) && (osarch.indexOf(arch) != -1);
|
return (osname.indexOf(os) != -1) && (osarch.indexOf(arch) != -1);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,6 +9,8 @@ import java.io.File;
|
|||||||
import java.io.FileOutputStream;
|
import java.io.FileOutputStream;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.PrintStream;
|
import java.io.PrintStream;
|
||||||
|
import java.util.Locale;
|
||||||
|
|
||||||
import com.samskivert.util.RunAnywhere;
|
import com.samskivert.util.RunAnywhere;
|
||||||
import com.samskivert.util.StringUtil;
|
import com.samskivert.util.StringUtil;
|
||||||
|
|
||||||
@@ -182,7 +184,7 @@ public class LaunchUtil
|
|||||||
*/
|
*/
|
||||||
public static boolean mustMonitorChildren ()
|
public static boolean mustMonitorChildren ()
|
||||||
{
|
{
|
||||||
String osname = System.getProperty("os.name", "").toLowerCase();
|
String osname = System.getProperty("os.name", "").toLowerCase(Locale.ROOT);
|
||||||
return (osname.indexOf("windows 98") != -1 || osname.indexOf("windows me") != -1);
|
return (osname.indexOf("windows 98") != -1 || osname.indexOf("windows me") != -1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user