X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbin%2FLauncher.java;h=dc42f8cec387840749a55d12735d6381bd7e44cd;hb=0788111a588187a04dd0d254d70b055274cf2c9d;hp=fe4b7ef813465b74b7460ee73efd5bbb67869f17;hpb=726bda0e9aea2d68b90803e142346cc46c8d4772;p=jalview.git

diff --git a/src/jalview/bin/Launcher.java b/src/jalview/bin/Launcher.java
index fe4b7ef..dc42f8c 100644
--- a/src/jalview/bin/Launcher.java
+++ b/src/jalview/bin/Launcher.java
@@ -25,8 +25,10 @@ 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;
 
 /**
  * A Launcher class for Jalview. This class is used to launch Jalview from the
@@ -60,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";
 
@@ -105,8 +115,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)
@@ -171,6 +181,12 @@ public class Launcher
         // Leaving it in in case it gets fixed
         command.add(
                 "-Xdock:name=" + ChannelProperties.getProperty("app_name"));
+        // this launches WITHOUT an icon in the macOS dock. Could be useful for
+        // getdown?
+        // command.add("-Dapple.awt.UIElement=false");
+        // This also does not work for the dock
+        command.add("-Dcom.apple.mrj.application.apple.menu.about.name="
+                + ChannelProperties.getProperty("app_name"));
       }
     }
 
@@ -198,6 +214,8 @@ public class Launcher
 
     if (Boolean.parseBoolean(System.getProperty("launcherstop", "false")))
     {
+      System.out.println(
+              "System property 'launcherstop' is set and not 'false'. Exiting.");
       System.exit(0);
     }
     try
@@ -207,7 +225,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
@@ -242,7 +260,6 @@ public class Launcher
     {
       e.printStackTrace();
     }
-    // System.exit(0);
   }
 
 }