From e68765941b3645a8d0f12aba81408dfe3f58d74f Mon Sep 17 00:00:00 2001 From: "j.procter@dundee.ac.uk" Date: Fri, 18 Jul 2014 13:35:32 +0100 Subject: [PATCH] JAL-1333 allow reuse of existing chimera for new or additional structures --- src/jalview/gui/ChimeraViewFrame.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/jalview/gui/ChimeraViewFrame.java b/src/jalview/gui/ChimeraViewFrame.java index a3ff00b..815957f 100644 --- a/src/jalview/gui/ChimeraViewFrame.java +++ b/src/jalview/gui/ChimeraViewFrame.java @@ -689,9 +689,8 @@ public class ChimeraViewFrame extends GStructureViewer implements Runnable, jalview.ws.dbsources.Pdb pdbclient = new jalview.ws.dbsources.Pdb(); for (int pi = 0; pi < jmb.pdbentry.length; pi++) { - String file = new File(jmb.pdbentry[pi].getFile()) - .getAbsoluteFile().getPath(); - if (file == null) + String file = null; + if (jmb.pdbentry[pi].getFile()==null) { // retrieve the pdb and store it locally AlignmentI pdbseq = null; @@ -734,6 +733,8 @@ public class ChimeraViewFrame extends GStructureViewer implements Runnable, } else { + file = new File(jmb.pdbentry[pi].getFile()) + .getAbsoluteFile().getPath(); if (curfiles != null && curfiles.length > 0) { addingStructures = true; // already files loaded. -- 1.7.10.2