From db9d07a313118d821c2d1f2226d8a34c41e41947 Mon Sep 17 00:00:00 2001 From: Jim Procter Date: Wed, 9 Dec 2015 16:03:51 +0000 Subject: [PATCH 1/1] JAL-1982 hotfix to prevent NPE with applet launch on Jpred4 site --- src/jalview/appletgui/AlignFrame.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/jalview/appletgui/AlignFrame.java b/src/jalview/appletgui/AlignFrame.java index 50ec7e0..28442a9 100644 --- a/src/jalview/appletgui/AlignFrame.java +++ b/src/jalview/appletgui/AlignFrame.java @@ -930,12 +930,15 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener, { boolean showForAlignment = showAlignmentAnnotations.getState(); boolean showForSequences = showSequenceAnnotations.getState(); - for (AlignmentAnnotation aa : alignPanel.getAlignment() + if (alignPanel.getAlignment().getAlignmentAnnotation() != null) + { + for (AlignmentAnnotation aa : alignPanel.getAlignment() .getAlignmentAnnotation()) { boolean visible = (aa.sequenceRef == null ? showForAlignment : showForSequences); aa.visible = visible; + } } alignPanel.validateAnnotationDimensions(true); validate(); -- 1.7.10.2