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
JAL-4020 Added search for PyMOLWinWithConsole.bat (and PyMOLWin.exe) in likely places...
[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
ad2a61b
..
0444895
100644
(file)
--- a/
src/ext/edu/ucsf/rbvi/strucviz2/StructureManager.java
+++ b/
src/ext/edu/ucsf/rbvi/strucviz2/StructureManager.java
@@
-75,7
+75,7
@@
public class StructureManager
"1.11.2", "1.11.1", "1.11" };
// Missing 1.1 as this has known bug see JAL-2422
"1.11.2", "1.11.1", "1.11" };
// Missing 1.1 as this has known bug see JAL-2422
- private static String[] CHIMERAX_VERSIONS = new String[] { "1.2.5", "1.0",
+ private static String[] CHIMERAX_VERSIONS = new String[] { "1.3", "1.2.5", "1.0",
"0.93", "0.92", "0.91", "0.9" };
static final String[] defaultStructureKeys = { "Structure", "pdb",
"0.93", "0.92", "0.91", "0.9" };
static final String[] defaultStructureKeys = { "Structure", "pdb",
@@
-1017,7
+1017,7
@@
public class StructureManager
{
for (String root : new String[] { "\\Program Files",
"C:\\Program Files", "\\Program Files (x86)",
{
for (String root : new String[] { "\\Program Files",
"C:\\Program Files", "\\Program Files (x86)",
- "C:\\Program Files (x86)" })
+ "C:\\Program Files (x86)", String.format("%s\\AppData\\Local", System.getProperty("user.home"))})
{
String[] candidates = isChimeraX ? CHIMERAX_VERSIONS
: CHIMERA_VERSIONS;
{
String[] candidates = isChimeraX ? CHIMERAX_VERSIONS
: CHIMERA_VERSIONS;