From: Jim Procter <jprocter@issues.jalview.org>
Date: Mon, 7 May 2018 16:38:29 +0000 (+0100)
Subject: JAL-2321 use StructureImportSettings singleton settings when JmolParser.parse() calle... 
X-Git-Tag: Release_2_10_4~7^2~4
X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=3858d4f26e39b36f8bf1d66b22c9d7030fbd6fc0

JAL-2321 use StructureImportSettings singleton settings when JmolParser.parse() called from constructor
---

diff --git a/src/jalview/ext/jmol/JmolParser.java b/src/jalview/ext/jmol/JmolParser.java
index 975846d..2a510a2 100644
--- a/src/jalview/ext/jmol/JmolParser.java
+++ b/src/jalview/ext/jmol/JmolParser.java
@@ -188,7 +188,11 @@ public class JmolParser extends StructureFile implements JmolStatusListener
         }
         lastID = tmpatom.resNumIns.trim();
       }
-      xferSettings();
+      if (isParseImmediately())
+      {
+        // configure parsing settings from the static singleton
+        xferSettings();
+      }
 
       makeResidueList();
       makeCaBondList();
@@ -205,7 +209,8 @@ public class JmolParser extends StructureFile implements JmolStatusListener
           prot.add(chainseq);
         }
 
-        if (StructureImportSettings.isProcessSecondaryStructure())
+        // look at local setting for adding secondary tructure
+        if (predictSecondaryStructure)
         {
           createAnnotation(chainseq, chain, ms.at);
         }