X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=blobdiff_plain;f=src%2Fjalview%2Fext%2Fpymol%2FPymolManager.java;h=358e360c66d4e1e8f93e14166a77c9180c75dc67;hp=d3b8eceb1a1f3ca7c3e0e2462fb8931a58dfde35;hb=14e1f9dbb9c7a4535734fd3be7ddeee2a5ae72dc;hpb=2c1fabdc3d0b711ebcc844c846fefa61d4e58bd8 diff --git a/src/jalview/ext/pymol/PymolManager.java b/src/jalview/ext/pymol/PymolManager.java index d3b8ece..358e360 100644 --- a/src/jalview/ext/pymol/PymolManager.java +++ b/src/jalview/ext/pymol/PymolManager.java @@ -36,7 +36,6 @@ import java.util.List; import jalview.bin.Cache; import jalview.bin.Console; import jalview.gui.Preferences; -import jalview.structure.StructureCommand; import jalview.structure.StructureCommandI; public class PymolManager @@ -100,22 +99,23 @@ public class PymolManager } else if (os.startsWith("Windows")) { - for (String root : new String[] { - String.format("%s\\AppData\\Local", System.getProperty("user.home")), // default user path - "\\ProgramData", "C:\\ProgramData", // this is the default install path "for everyone" - System.getProperty("user.home"), - "\\Program Files", "C:\\Program Files", "\\Program Files (x86)", - "C:\\Program Files (x86)" }) - { - for (String path : new String [] { - "Schrodinger\\PyMOL2", "PyMOL" }) + for (String root : new String[] { + String.format("%s\\AppData\\Local", + System.getProperty("user.home")), // default user path + "\\ProgramData", "C:\\ProgramData", // this is the default install + // path "for everyone" + System.getProperty("user.home"), "\\Program Files", + "C:\\Program Files", "\\Program Files (x86)", + "C:\\Program Files (x86)" }) + { + for (String path : new String[] { "Schrodinger\\PyMOL2", "PyMOL" }) { - for (String binary : new String [] {"PyMOLWinWithConsole.bat"}) + for (String binary : new String[] { "PyMOLWinWithConsole.bat" }) { pathList.add(String.format("%s\\%s\\%s", root, path, binary)); } } - } + } } else if (os.startsWith("Mac")) {