update spikes/mungo from JAL-3076 patch branch

[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 b90a5a1..09a9713 100644 (file)
--- a/src/ext/edu/ucsf/rbvi/strucviz2/StructureManager.java
+++ b/src/ext/edu/ucsf/rbvi/strucviz2/StructureManager.java
@@ -34,7 +34,6 @@ package ext.edu.ucsf.rbvi.strucviz2;
 
 import jalview.bin.Cache;
 import jalview.gui.Preferences;
-import jalview.util.FileUtils;
 
 import java.io.File;
 import java.io.IOException;
@@ -935,16 +934,18 @@ public class StructureManager
     }
     else if (os.startsWith("Windows"))
     {
-      /*
-       * typical Windows installation path is
-       * C:\Program Files\Chimera 1.12\bin\chimera.exe
-       */
-      // current drive:
-      pathList.addAll(FileUtils.findMatches("\\",
-              "Program Files*/Chimera*/bin/{chimera,chimera.exe}"));
-      // C: drive (note may add as duplicates)
-      pathList.addAll(FileUtils.findMatches("C:\\",
-              "Program Files*/Chimera*/bin/{chimera,chimera.exe}"));
+      for (String root : new String[] { "\\Program Files",
+          "C:\\Program Files", "\\Program Files (x86)",
+          "C:\\Program Files (x86)" })
+      {
+        for (String version : new String[] { "1.11", "1.11.1", "1.11.2",
+            "1.12", "1.12.1", "1.12.2", "1.13" })
+        {
+          pathList.add(root + "\\Chimera " + version + "\\bin\\chimera");
+          pathList.add(
+                  root + "\\Chimera " + version + "\\bin\\chimera.exe");
+        }
+      }
     }
     else if (os.startsWith("Mac"))
     {