X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbin%2FLauncher.java;h=1ea17d69d7e7ab29ba627492f13a18c54ff40be0;hb=e69f7ec847b9dbbf88350521ccd3fd773c6aeaa8;hp=fe4b7ef813465b74b7460ee73efd5bbb67869f17;hpb=726bda0e9aea2d68b90803e142346cc46c8d4772;p=jalview.git diff --git a/src/jalview/bin/Launcher.java b/src/jalview/bin/Launcher.java index fe4b7ef..1ea17d6 100644 --- a/src/jalview/bin/Launcher.java +++ b/src/jalview/bin/Launcher.java @@ -20,6 +20,8 @@ */ package jalview.bin; +import java.util.Locale; + import java.io.File; import java.io.IOException; import java.lang.management.ManagementFactory; @@ -27,6 +29,7 @@ import java.util.ArrayList; import java.util.List; import jalview.util.ChannelProperties; +import jalview.util.LaunchUtils; /** * A Launcher class for Jalview. This class is used to launch Jalview from the @@ -105,8 +108,8 @@ public class Launcher } // use saved preferences if no cmdline args - boolean useCustomisedSettings = Boolean.parseBoolean(LaunchUtils - .getUserPreference(MemorySetting.CUSTOMISED_SETTINGS)); + boolean useCustomisedSettings = LaunchUtils + .getBooleanUserPreference(MemorySetting.CUSTOMISED_SETTINGS); if (useCustomisedSettings) { if (jvmmempc == null) @@ -207,7 +210,7 @@ public class Launcher process.waitFor(); } catch (IOException e) { - if (e.getMessage().toLowerCase().contains("memory")) + if (e.getMessage().toLowerCase(Locale.ROOT).contains("memory")) { System.out.println("Caught a memory exception: " + e.getMessage()); // Probably the "Cannot allocate memory" error, try without the memory