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 / com / threerings / getdown / data / Application.java

diff --git a/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java b/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java
index 9deb5bc..8048728 100644 (file)
--- a/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java
+++ b/getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Application.java
@@ -1248,7 +1248,7 @@ public class Application
           if (j > -1) {
             ext = filename.substring(j+1);
           }
-          if (ext != null && LOCATOR_FILE_EXTENSION.equals(ext.toLowerCase())) {
+          if (ext != null && LOCATOR_FILE_EXTENSION.equals(ext.toLowerCase(Locale.ROOT))) {
             // this file extension should have been dealt with in Getdown class
           } else {
             _appargs.add(0, "-open");
@@ -1997,7 +1997,7 @@ public class Application
         String locatorFilename = filenames.length >= 1 ? filenames[0] : null;
         if (
                 !StringUtil.isBlank(locatorFilename)
-                && locatorFilename.toLowerCase().endsWith("."+Application.LOCATOR_FILE_EXTENSION)
+                && locatorFilename.toLowerCase(Locale.ROOT).endsWith("."+Application.LOCATOR_FILE_EXTENSION)
                 ) {
           setLocatorFile(locatorFilename);
           // remove the locator filename from the filenames array
@@ -2011,7 +2011,7 @@ public class Application
           // skip any other locator files in a multiple file list
           if (filename.startsWith("jalview://") || filename.startsWith("jalviews://")) {
             setJalviewUri(filename);
-          } else if (! filename.toLowerCase().endsWith("."+Application.LOCATOR_FILE_EXTENSION)) {
+          } else if (! filename.toLowerCase(Locale.ROOT).endsWith("."+Application.LOCATOR_FILE_EXTENSION)) {
             addStartupFile(filename);
           }
         }