From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Fri, 9 Jan 2015 08:31:08 +0000 (+0000)
Subject: JAL-1588 check Chimera session file still exists
X-Git-Tag: Jalview_2_9~106^2~2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=919d0621d92a3a8e8c0cae1077965b28c0ddf3e4;p=jalview.git

JAL-1588 check Chimera session file still exists
---

diff --git a/src/jalview/gui/Jalview2XML.java b/src/jalview/gui/Jalview2XML.java
index 9ba8fb7..563429f 100644
--- a/src/jalview/gui/Jalview2XML.java
+++ b/src/jalview/gui/Jalview2XML.java
@@ -3231,8 +3231,18 @@ public class Jalview2XML
   protected void createChimeraViewer(Entry<String, ViewerData> viewerData,
           AlignFrame af)
   {
-    final ViewerData svattrib = viewerData.getValue();
-    ChimeraViewFrame cvf = new ChimeraViewFrame(svattrib, af);
+    final ViewerData data = viewerData.getValue();
+    String chimeraSession = data.stateData;
+    if (new File(chimeraSession).exists())
+    {
+      // TODO can/should this be done via StructureViewer (like Jmol)?
+      ChimeraViewFrame cvf = new ChimeraViewFrame(data, af);
+    }
+    else
+    {
+      Cache.log.error("Chimera session file " + chimeraSession
+              + " not found");
+    }
   }
 
   /**