import jalview.bin.HiDPISetting;
import jalview.bin.MemorySetting;
-//import com.install4j.api.launcher.Variables;
+import jalview.bin.LaunchUtils;
+import jalview.util.ChannelProperties;
import com.threerings.getdown.util.*;
// avoid ambiguity with java.util.Base64 which we can't use as it's 1.8+
continue;
}
}
+
+ // use saved preferences if no cmdline args
+ File channelProps = getLocalPath(ChannelProperties.CHANNEL_PROPERTIES_FILENAME);
+ if (channelProps.exists()) {
+ try {
+ InputStream is = new FileInputStream(channelProps);
+ ChannelProperties.loadProps(is);
+ } catch (IOException e) {
+ log.error(e.getMessage());
+ }
+ }
+ boolean useCustomisedSettings = Boolean.parseBoolean(LaunchUtils.getUserPreference(MemorySetting.CUSTOMISED_SETTINGS));
+ if (useCustomisedSettings) {
+ if (jvmmempc == null) {
+ jvmmempc = LaunchUtils.getUserPreference(MemorySetting.MEMORY_JVMMEMPC);
+ }
+ if (jvmmemmax == null) {
+ jvmmemmax = LaunchUtils.getUserPreference(MemorySetting.MEMORY_JVMMEMMAX);
+ }
+ }
// add the memory setting from jvmmempc and jvmmemmax
long maxMemLong = -1;