git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cea2941
)
JAL-4020 class formatting
author
Ben Soares
<b.soares@dundee.ac.uk>
Tue, 7 Jun 2022 13:14:53 +0000
(14:14 +0100)
committer
Ben Soares
<b.soares@dundee.ac.uk>
Tue, 7 Jun 2022 13:14:53 +0000
(14:14 +0100)
src/jalview/ext/pymol/PymolManager.java
patch
|
blob
|
history
diff --git
a/src/jalview/ext/pymol/PymolManager.java
b/src/jalview/ext/pymol/PymolManager.java
index
e10fc9d
..
7dfdb0c
100644
(file)
--- a/
src/jalview/ext/pymol/PymolManager.java
+++ b/
src/jalview/ext/pymol/PymolManager.java
@@
-112,7
+112,8
@@
public class PymolManager
{
for (String path : new String[] { "Schrodinger\\PyMOL2", "PyMOL" })
{
{
for (String path : new String[] { "Schrodinger\\PyMOL2", "PyMOL" })
{
- for (String binary : new String [] {"PyMOLWinWithConsole.bat", "Scripts\\pymol.exe", "PyMOLWin.exe"})
+ for (String binary : new String[] { "PyMOLWinWithConsole.bat",
+ "Scripts\\pymol.exe", "PyMOLWin.exe" })
{
pathList.add(String.format("%s\\%s\\%s", root, path, binary));
}
{
pathList.add(String.format("%s\\%s\\%s", root, path, binary));
}
@@
-271,15
+272,16
@@
public class PymolManager
}
List<String> args = new ArrayList<>();
args.add(pymolPath);
}
List<String> args = new ArrayList<>();
args.add(pymolPath);
-
+
// Windows PyMOLWin.exe needs an extra argument
// Windows PyMOLWin.exe needs an extra argument
- if (Platform.isWin() && pymolPath.toLowerCase(Locale.ROOT).endsWith("\\pymolwin.exe"))
+ if (Platform.isWin() && pymolPath.toLowerCase(Locale.ROOT)
+ .endsWith("\\pymolwin.exe"))
{
args.add("+2");
}
args.add("-R"); // https://pymolwiki.org/index.php/RPC
ProcessBuilder pb = new ProcessBuilder(args);
{
args.add("+2");
}
args.add("-R"); // https://pymolwiki.org/index.php/RPC
ProcessBuilder pb = new ProcessBuilder(args);
- Console.debug("Running PyMOL as "+String.join(" ", pb.command()));
+ Console.debug("Running PyMOL as " + String.join(" ", pb.command()));
pymolProcess = pb.start();
error = "";
break;
pymolProcess = pb.start();
error = "";
break;