From 970515ee49290a4b8fbb63b9f69e48ccba23a7b9 Mon Sep 17 00:00:00 2001 From: gmungoc Date: Mon, 11 May 2020 10:14:47 +0100 Subject: [PATCH] JAL-1333 additional Chimera versions for Windows installation paths --- src/ext/edu/ucsf/rbvi/strucviz2/StructureManager.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/ext/edu/ucsf/rbvi/strucviz2/StructureManager.java b/src/ext/edu/ucsf/rbvi/strucviz2/StructureManager.java index b7ea4ad..d1c820c 100644 --- a/src/ext/edu/ucsf/rbvi/strucviz2/StructureManager.java +++ b/src/ext/edu/ucsf/rbvi/strucviz2/StructureManager.java @@ -32,9 +32,6 @@ */ package ext.edu.ucsf.rbvi.strucviz2; -import jalview.bin.Cache; -import jalview.gui.Preferences; - import java.io.File; import java.io.IOException; import java.util.ArrayList; @@ -49,6 +46,9 @@ import java.util.Set; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import jalview.bin.Cache; +import jalview.gui.Preferences; + /** * This object maintains the relationship between Chimera objects and Cytoscape * objects. @@ -944,8 +944,14 @@ public class StructureManager "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" }) + /* + * May 2020: 1.14 is the latest, anticipating a few more... + * see https://www.cgl.ucsf.edu/chimera/download.html + */ + for (String version : new String[] { "1.16.2", "1.16.1", "1.16", + "1.15.2", "1.15.1", "1.15", "1.14.2", "1.14.1", "1.14", + "1.13.1", "1.13", "1.12.2", "1.12.1", "1.12", "1.11.2", + "1.11.2", "1.11.1", "1.11" }) { pathList.add(root + "\\Chimera " + version + "\\bin\\" + chimera); pathList.add( -- 1.7.10.2