From e1d3e0e3ae13f29c0c027e94cd23d05dd9ed4360 Mon Sep 17 00:00:00 2001 From: James Procter Date: Fri, 20 Oct 2023 13:56:01 +0100 Subject: [PATCH] JAL-4307 some models return null for hetatm list --- src/jalview/ext/jmol/JalviewJmolBinding.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/jalview/ext/jmol/JalviewJmolBinding.java b/src/jalview/ext/jmol/JalviewJmolBinding.java index c8ce3cd..5b931e1 100644 --- a/src/jalview/ext/jmol/JalviewJmolBinding.java +++ b/src/jalview/ext/jmol/JalviewJmolBinding.java @@ -43,8 +43,6 @@ import org.jmol.api.JmolViewer; import org.jmol.c.CBK; import org.jmol.viewer.Viewer; -import com.google.common.collect.Lists; - import jalview.api.AlignmentViewPanel; import jalview.api.FeatureRenderer; import jalview.api.FeatureSettingsModelI; @@ -200,7 +198,10 @@ public abstract class JalviewJmolBinding extends AAStructureBindingModel for (int mc=0;mc hets = jmolViewer.ms.getHeteroList(mc); - hetlist.putAll(hets); + if (hets!=null) + { + hetlist.putAll(hets); + } } return Arrays.asList(hetlist.keySet().toArray(new String[0])); } -- 1.7.10.2