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 'Jalview-JS/develop' into merge_js_develop
[jalview.git]
/
src
/
ext
/
edu
/
ucsf
/
rbvi
/
strucviz2
/
StructureManager.java
diff --git
a/src/ext/edu/ucsf/rbvi/strucviz2/StructureManager.java
b/src/ext/edu/ucsf/rbvi/strucviz2/StructureManager.java
index
53d767b
..
c1d04c4
100644
(file)
--- a/
src/ext/edu/ucsf/rbvi/strucviz2/StructureManager.java
+++ b/
src/ext/edu/ucsf/rbvi/strucviz2/StructureManager.java
@@
-35,6
+35,7
@@
package ext.edu.ucsf.rbvi.strucviz2;
import jalview.bin.Cache;
import jalview.gui.Preferences;
import jalview.util.FileUtils;
import jalview.bin.Cache;
import jalview.gui.Preferences;
import jalview.util.FileUtils;
+import jalview.util.Platform;
import java.io.File;
import java.io.IOException;
import java.io.File;
import java.io.IOException;
@@
-932,7
+933,7
@@
public class StructureManager
pathList.add("/usr/local/chimera/bin/chimera");
pathList.add("/usr/local/bin/chimera");
pathList.add("/usr/bin/chimera");
pathList.add("/usr/local/chimera/bin/chimera");
pathList.add("/usr/local/bin/chimera");
pathList.add("/usr/bin/chimera");
- pathList.add(System.getProperty("user.home") + "/opt/bin/chimera");
+ pathList.add(Platform.getUserPath("opt/bin/chimera"));
}
else if (os.startsWith("Windows"))
{
}
else if (os.startsWith("Windows"))
{