From 5a62c9ec779e3273b53e276ca14a865a76961c48 Mon Sep 17 00:00:00 2001 From: Jim Procter Date: Fri, 15 Nov 2024 13:52:21 +0000 Subject: [PATCH] JAL-3914 fix population of PDBEntry metadata from 3d beacons --- .../gui/structurechooser/ThreeDBStructureChooserQuerySource.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/jalview/gui/structurechooser/ThreeDBStructureChooserQuerySource.java b/src/jalview/gui/structurechooser/ThreeDBStructureChooserQuerySource.java index 5c0d425..3e88831 100644 --- a/src/jalview/gui/structurechooser/ThreeDBStructureChooserQuerySource.java +++ b/src/jalview/gui/structurechooser/ThreeDBStructureChooserQuerySource.java @@ -444,12 +444,12 @@ public class ThreeDBStructureChooserQuerySource String modelConfVer = idx_mqualtypever < 1 ? null : (String) restable.getValueAt(row, idx_mqualtypever); - String tftype = modelConfType.toUpperCase(Locale.ROOT); + String tftype = (modelConfType==null) ? null: modelConfType.toUpperCase(Locale.ROOT); TFType tempfacType = (tftype==null) ? null : TFType.valueOf(tftype); if (tftype==null || "".equals(tftype) || TFType.valueOf(tftype) == null ) { // TODO maintain mappings between confidence types and tempfactypes - if (typeColumn.toLowerCase(Locale.ROOT).startsWith("alpha") || tftype.startsWith("ALPHAFOLD")) { + if (typeColumn.toLowerCase(Locale.ROOT).startsWith("alpha") || (tftype!=null && tftype.startsWith("ALPHAFOLD"))) { tftype = TFType.PLDDT.toString(); modelConfVer = null; } -- 1.7.10.2