git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'merge/develop_and_rebase_squashed_merge_JAL-3628+JAL-3608+JAL-3609...
[jalview.git]
/
src
/
jalview
/
bin
/
Launcher.java
diff --git
a/src/jalview/bin/Launcher.java
b/src/jalview/bin/Launcher.java
index
fecacbe
..
b8d31c2
100644
(file)
--- a/
src/jalview/bin/Launcher.java
+++ b/
src/jalview/bin/Launcher.java
@@
-26,6
+26,8
@@
import java.lang.management.ManagementFactory;
import java.util.ArrayList;
import java.util.List;
import java.util.ArrayList;
import java.util.List;
+import jalview.util.ChannelProperties;
+
/**
* A Launcher class for Jalview. This class is used to launch Jalview from the
* shadowJar when Getdown is not used or available. It attempts to take all the
/**
* A Launcher class for Jalview. This class is used to launch Jalview from the
* shadowJar when Getdown is not used or available. It attempts to take all the
@@
-45,7
+47,8
@@
public class Launcher
{
private final static String startClass = "jalview.bin.Jalview";
{
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
/**
* main method for jalview.bin.Launcher. This restarts the same JRE's JVM with
@@
-149,7
+152,8
@@
public class Launcher
{
// -Xdock:name=... doesn't actually work :(
// Leaving it in in case it gets fixed
{
// -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"));
}
}
}
}
@@
-166,12
+170,16
@@
public class Launcher
final ProcessBuilder builder = new ProcessBuilder(command);
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"
: ("memory setting " + memSetting)));
System.out.println("Running " + startClass + " with "
+ (memSetting == null ? "no memory setting"
: ("memory setting " + memSetting)));
- if (Boolean.parseBoolean(System.getProperty("launcherstop")))
+ if (Boolean.parseBoolean(System.getProperty("launcherstop", "false")))
{
System.exit(0);
}
{
System.exit(0);
}