X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbin%2FLauncher.java;h=a55146d869f0a02cb687fc9988a7ca375edc2430;hb=1128674a17df402a2219d278ab332c291cb93443;hp=744f4062258ad7c6645e06503f3cfc0f8d3f09f7;hpb=9b8e039f02800dba0f3a3de2bc57e7a8b4f95f1c;p=jalview.git diff --git a/src/jalview/bin/Launcher.java b/src/jalview/bin/Launcher.java index 744f406..a55146d 100644 --- a/src/jalview/bin/Launcher.java +++ b/src/jalview/bin/Launcher.java @@ -25,6 +25,7 @@ import java.io.IOException; import java.lang.management.ManagementFactory; import java.util.ArrayList; import java.util.List; +import java.util.Locale; import jalview.util.ChannelProperties; import jalview.util.LaunchUtils; @@ -61,6 +62,14 @@ public class Launcher */ public static void main(String[] args) { + if (!LaunchUtils.checkJavaVersion()) + { + System.err.println("WARNING - The Java version being used (Java " + + LaunchUtils.getJavaVersion() + + ") may lead to problems. This installation of Jalview should be used with Java " + + LaunchUtils.getJavaCompileVersion() + "."); + } + final String javaBin = System.getProperty("java.home") + File.separator + "bin" + File.separator + "java"; @@ -208,7 +217,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