import java.lang.management.ManagementFactory;
import java.util.ArrayList;
import java.util.List;
+import java.util.Locale;
+import java.util.concurrent.TimeUnit;
+
+import jalview.util.ChannelProperties;
+import jalview.util.LaunchUtils;
/**
* A Launcher class for Jalview. This class is used to launch Jalview from the
{
private final static String startClass = "jalview.bin.Jalview";
- private final static String dockIconPath = "JalviewLogo_Huge.png";
+ private final static String dockIconPath = ChannelProperties
+ .getProperty("logo.512");
/**
* main method for jalview.bin.Launcher. This restarts the same JRE's JVM with
- * the same arguments but with memory adjusted based on extracted -jvmmempc and
- * -jvmmemmax application arguments. If on a Mac then extra dock:icon and
+ * the same arguments but with memory adjusted based on extracted -jvmmempc
+ * and -jvmmemmax application arguments. If on a Mac then extra dock:icon and
* dock:name arguments are also set.
*
* @param args
*/
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";
String jvmmempc = null;
String jvmmemmax = null;
+ boolean debug = false;
+ boolean wait = true;
+ boolean quiet = false;
+ // must set --debug before --launcher...
+ boolean launcherstop = false;
+ boolean launcherprint = false;
+ boolean launcherwait = false;
ArrayList<String> arguments = new ArrayList<>();
for (String arg : args)
{
+ if (arg.equals("--debug"))
+ {
+ debug = true;
+ }
+ if (arg.equals("--quiet"))
+ {
+ quiet = true;
+ }
+ if (debug && arg.equals("--launcherprint"))
+ {
+ launcherprint = true;
+ }
+ if (debug && arg.equals("--launcherstop"))
+ {
+ launcherstop = true;
+ }
+ if (debug && arg.equals("--launcherwait"))
+ {
+ launcherwait = true;
+ }
+ // this ends the launcher immediately
+ if (debug && arg.equals("--launchernowait"))
+ {
+ wait = false;
+ }
+ // Don't add the --launcher... args to Jalview launch
+ if (arg.startsWith("--launcher"))
+ {
+ continue;
+ }
// jvmmempc and jvmmemmax args used to set memory and are not passed on to
// startClass
if (arg.startsWith(
jvmmemmax = arg.substring(
MemorySetting.MAX_HEAPSIZE_PROPERTY_NAME.length() + 2);
}
+ // --doubledash versions
+ else if (arg.startsWith("--"
+ + MemorySetting.MAX_HEAPSIZE_PERCENT_PROPERTY_NAME + "="))
+ {
+ jvmmempc = arg.substring(
+ MemorySetting.MAX_HEAPSIZE_PERCENT_PROPERTY_NAME.length()
+ + 3);
+ }
+ else if (arg.startsWith(
+ "--" + MemorySetting.MAX_HEAPSIZE_PROPERTY_NAME + "="))
+ {
+ jvmmemmax = arg.substring(
+ MemorySetting.MAX_HEAPSIZE_PROPERTY_NAME.length() + 3);
+ }
+ // retain arg
else
{
arguments.add(arg);
}
}
- // add memory setting if not specified
+ // use saved preferences if no cmdline args
+ boolean useCustomisedSettings = LaunchUtils
+ .getBooleanUserPreference(MemorySetting.CUSTOMISED_SETTINGS);
+ if (useCustomisedSettings)
+ {
+ if (jvmmempc == null)
+ {
+ jvmmempc = LaunchUtils
+ .getUserPreference(MemorySetting.MEMORY_JVMMEMPC);
+ }
+ if (jvmmemmax == null)
+ {
+ jvmmemmax = LaunchUtils
+ .getUserPreference(MemorySetting.MEMORY_JVMMEMMAX);
+ }
+ }
+
+ // add these settings if not already specified
boolean memSet = false;
boolean dockIcon = false;
boolean dockName = false;
if (!memSet)
{
long maxMemLong = MemorySetting.getMemorySetting(jvmmemmax, jvmmempc);
-
+
if (maxMemLong > 0)
{
memSetting = "-Xmx" + Long.toString(maxMemLong);
{
// -Xdock:name=... doesn't actually work :(
// Leaving it in in case it gets fixed
- command.add("-Xdock:name=" + "Jalview");
+ 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"));
}
}
+ String scalePropertyArg = HiDPISetting.getScalePropertyArg();
+ if (scalePropertyArg != null)
+ {
+ sysout(debug, quiet, "Running " + startClass + " with scale setting "
+ + scalePropertyArg);
+ command.add(scalePropertyArg);
+ }
+
command.add(startClass);
command.addAll(arguments);
final ProcessBuilder builder = new ProcessBuilder(command);
- // System.out.println("COMMAND: " + String.join(" ", builder.command()));
- System.out.println("Running " + startClass + " with "
- + (memSetting == null ? "no memory setting" : memSetting));
+ if ((Boolean.parseBoolean(System.getProperty("launcherprint", "false"))
+ || launcherprint))
+ {
+ sysout(debug, quiet,
+ "LAUNCHER COMMAND: " + String.join(" ", builder.command()));
+ }
+ sysout(debug, quiet,
+ "Running " + startClass + " with "
+ + (memSetting == null ? "no memory setting"
+ : ("memory setting " + memSetting)));
- if (Boolean.parseBoolean(System.getProperty("launcherstop")))
+ if (Boolean.parseBoolean(System.getProperty("launcherstop", "false"))
+ || (debug && launcherstop))
{
+ sysout(debug, quiet,
+ "System property 'launcherstop' is set and not 'false'. Exiting.");
System.exit(0);
}
try
{
builder.inheritIO();
Process process = builder.start();
- process.waitFor();
+ if (wait || launcherwait)
+ {
+ sysout(debug, quiet, "Launching application process");
+ process.waitFor();
+ }
+ else
+ {
+ int waitInt = 0;
+ sysout(debug, quiet,
+ "Wait time for application process is " + waitInt + "ms");
+ process.waitFor(waitInt, TimeUnit.MILLISECONDS);
+ }
+ sysout(debug, quiet, "Launcher process ending");
} 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 setting
+ System.err.println("Caught a memory exception: " + e.getMessage());
+ // Probably the "Cannot allocate memory" error, try without the memory
+ // setting
ArrayList<String> commandNoMem = new ArrayList<>();
for (int i = 0; i < command.size(); i++)
{
}
final ProcessBuilder builderNoMem = new ProcessBuilder(
commandNoMem);
- System.out.println("Command without memory setting: "
+ System.err.println("Command without memory setting: "
+ String.join(" ", builderNoMem.command()));
try
{
{
e.printStackTrace();
}
- // System.exit(0);
+ }
+ private static void sysout(boolean debug, boolean quiet, String message)
+ {
+ if (debug && !quiet)
+ {
+ System.out.println("LAUNCHERDEBUG - " + message);
+ }
}
}