JAL-4020 Added path search for global installation path and older version installatio...

[jalview.git] / src / jalview / ext / pymol / PymolManager.java

diff --git a/src/jalview/ext/pymol/PymolManager.java b/src/jalview/ext/pymol/PymolManager.java
index 49ebe08..d3b8ece 100644 (file)
--- a/src/jalview/ext/pymol/PymolManager.java
+++ b/src/jalview/ext/pymol/PymolManager.java
@@ -1,3 +1,23 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 package jalview.ext.pymol;
 
 import java.io.BufferedReader;
@@ -60,14 +80,13 @@ public class PymolManager
   protected static List<String> getPymolPaths(String os)
   {
     List<String> pathList = new ArrayList<>();
-  
-    String userPath = Cache
-            .getDefault(Preferences.PYMOL_PATH, null);
+
+    String userPath = Cache.getDefault(Preferences.PYMOL_PATH, null);
     if (userPath != null)
     {
       pathList.add(userPath);
     }
-  
+
     /*
      * add default installation paths
      */
@@ -81,7 +100,22 @@ public class PymolManager
     }
     else if (os.startsWith("Windows"))
     {
-      // todo Windows installation path(s)
+       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"})
+          {
+            pathList.add(String.format("%s\\%s\\%s", root, path, binary));
+          }
+        }
+       }
     }
     else if (os.startsWith("Mac"))
     {