import jalview.bin.HiDPISetting;
import jalview.bin.MemorySetting;
-import jalview.bin.LaunchUtils;
-import jalview.util.ChannelProperties;
+import jalview.util.LaunchUtils;
import com.threerings.getdown.util.*;
// avoid ambiguity with java.util.Base64 which we can't use as it's 1.8+
}
// 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) {
+ LaunchUtils.loadChannelProps(getAppDir());
+ if (LaunchUtils.getBooleanUserPreference(MemorySetting.CUSTOMISED_SETTINGS)) {
if (jvmmempc == null) {
jvmmempc = LaunchUtils.getUserPreference(MemorySetting.MEMORY_JVMMEMPC);
}
if (j > -1) {
ext = filename.substring(j+1);
}
- if (ext != null && LOCATOR_FILE_EXTENSION.equals(ext.toLowerCase())) {
+ if (ext != null && LOCATOR_FILE_EXTENSION.equals(ext.toLowerCase(Locale.ROOT))) {
// this file extension should have been dealt with in Getdown class
} else {
_appargs.add(0, "-open");
String[] sargs = args.toArray(new String[args.size()]);
log.info("Running " + StringUtil.join(sargs, "\n "));
- return Runtime.getRuntime().exec(sargs, envp, getAppDir());
+ // don't set the working dir, leave it the same as the working dir of the invocation
+ //return Runtime.getRuntime().exec(sargs, envp, getAppDir());
+ return Runtime.getRuntime().exec(sargs, envp);
}
/**
String locatorFilename = filenames.length >= 1 ? filenames[0] : null;
if (
!StringUtil.isBlank(locatorFilename)
- && locatorFilename.toLowerCase().endsWith("."+Application.LOCATOR_FILE_EXTENSION)
+ && locatorFilename.toLowerCase(Locale.ROOT).endsWith("."+Application.LOCATOR_FILE_EXTENSION)
) {
setLocatorFile(locatorFilename);
// remove the locator filename from the filenames array
// skip any other locator files in a multiple file list
if (filename.startsWith("jalview://") || filename.startsWith("jalviews://")) {
setJalviewUri(filename);
- } else if (! filename.toLowerCase().endsWith("."+Application.LOCATOR_FILE_EXTENSION)) {
+ } else if (! filename.toLowerCase(Locale.ROOT).endsWith("."+Application.LOCATOR_FILE_EXTENSION)) {
addStartupFile(filename);
}
}