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
{
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
*/
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";
}
}
+ // 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 memory setting if not specified
boolean memSet = false;
boolean dockIcon = false;
{
// -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"));
}
}
String scalePropertyArg = HiDPISetting.getScalePropertyArg();
if (scalePropertyArg != null)
{
+ System.out.println("Running " + startClass + " with scale setting "
+ + scalePropertyArg);
command.add(scalePropertyArg);
}
final ProcessBuilder builder = new ProcessBuilder(command);
- // System.out.println("COMMAND: " + String.join(" ", builder.command()));
+ if (Boolean.parseBoolean(System.getProperty("launcherprint", "false")))
+ {
+ System.out.println(
+ "LAUNCHER COMMAND: " + String.join(" ", builder.command()));
+ }
System.out.println("Running " + startClass + " with "
- + (memSetting == null ? "no memory setting" : memSetting));
+ + (memSetting == null ? "no memory setting"
+ : ("memory setting " + memSetting)));
- if (Boolean.parseBoolean(System.getProperty("launcherstop")))
+ if (Boolean.parseBoolean(System.getProperty("launcherstop", "false")))
{
+ System.out.println(
+ "System property 'launcherstop' is set and not 'false'. Exiting.");
System.exit(0);
}
try
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
{
e.printStackTrace();
}
- // System.exit(0);
-
}
}