From: Ben Soares Date: Tue, 7 Jun 2022 13:14:53 +0000 (+0100) Subject: JAL-4020 class formatting X-Git-Tag: Release_2_11_2_6~52^2 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=dfc849311567b9764bf2984e22c683dc988ed5d7;p=jalview.git JAL-4020 class formatting --- diff --git a/src/jalview/ext/pymol/PymolManager.java b/src/jalview/ext/pymol/PymolManager.java index e10fc9d..7dfdb0c 100644 --- 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 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)); } @@ -271,15 +272,16 @@ public class PymolManager } List args = new ArrayList<>(); args.add(pymolPath); - + // 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); - Console.debug("Running PyMOL as "+String.join(" ", pb.command())); + Console.debug("Running PyMOL as " + String.join(" ", pb.command())); pymolProcess = pb.start(); error = ""; break;