From 9ca254303d9063b6dfe18e159b9c51861ff71483 Mon Sep 17 00:00:00 2001 From: "b.stoever" Date: Tue, 21 Jul 2015 10:25:51 +0000 Subject: [PATCH] Fixed NPE when saving an alignment with a read without attached pherogram. --- .../molecular/editor/AlignmentEditor.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/editor/AlignmentEditor.java b/eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/editor/AlignmentEditor.java index 3ec547504..315e92df1 100644 --- a/eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/editor/AlignmentEditor.java +++ b/eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/editor/AlignmentEditor.java @@ -398,12 +398,15 @@ public class AlignmentEditor extends EditorPart { singleRead.setEditedSequence(stringProvider.getSequence(id)); - PherogramAreaModel model = getPherogramArea(id).getModel(); - singleRead.setReverseComplement(model.getPherogramProvider() instanceof ReverseComplementPherogramProvider); // Works only if ReverseComplementPherogramProvider instances are not nested. - singleRead.setShifts(convertToCDMShifts(getPherogramArea(id).getModel())); - singleRead.setFirstSeqPosition(model.getFirstSeqPos()); - singleRead.setLeftCutPosition(model.getLeftCutPosition()); - singleRead.setRightCutPosition(model.getRightCutPosition()); + PherogramArea pherogramArea = getPherogramArea(id); + if (pherogramArea != null) { + PherogramAreaModel model = pherogramArea.getModel(); + singleRead.setReverseComplement(model.getPherogramProvider() instanceof ReverseComplementPherogramProvider); // Works only if ReverseComplementPherogramProvider instances are not nested. + singleRead.setShifts(convertToCDMShifts(getPherogramArea(id).getModel())); + singleRead.setFirstSeqPosition(model.getFirstSeqPos()); + singleRead.setLeftCutPosition(model.getLeftCutPosition()); + singleRead.setRightCutPosition(model.getRightCutPosition()); + } } if (!conversationHolder.isBound()) { -- 2.34.1