From 1d9e1c80fb6c0e32313a976ae0065fd32639f2bc Mon Sep 17 00:00:00 2001 From: gmungoc Date: Tue, 11 Nov 2014 09:20:40 +0000 Subject: [PATCH] JAL-1527 opening a project saved with JMol should use JMol (disregard viewer preference). --- src/jalview/gui/StructureViewer.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/jalview/gui/StructureViewer.java b/src/jalview/gui/StructureViewer.java index ccb3c18..ddcb214 100644 --- a/src/jalview/gui/StructureViewer.java +++ b/src/jalview/gui/StructureViewer.java @@ -115,25 +115,24 @@ public class StructureViewer return viewStructures(getViewerType(), ap, pdb, sequenceIs); } - public JalviewStructureDisplayI createView(Viewer jmol, String[] pdbf, + public JalviewStructureDisplayI createView(Viewer viewer, String[] pdbf, String[] id, SequenceI[][] sq, AlignmentPanel alignPanel, boolean useinJmolsuperpos, boolean usetoColourbyseq, boolean jmolColouring, String fileloc, Rectangle rect, String vid) { JalviewStructureDisplayI sview = null; - switch (getViewerType()) + switch (viewer) { case JMOL: - sview = new AppJmol(pdbf, id, sq, alignPanel, useinJmolsuperpos, usetoColourbyseq, jmolColouring, fileloc, rect, vid); - break; case CHIMERA: + Cache.log.error("Unsupported structure viewer type " + + viewer.toString()); break; default: - Cache.log.error("Unknown structure viewer type " - + getViewerType().toString()); + Cache.log.error("Unknown structure viewer type " + viewer.toString()); } return sview; } -- 1.7.10.2