merge-update from trunk

[taxeditor.git] / eu.etaxonomy.taxeditor.editor / src / main / java / eu / etaxonomy / taxeditor / editor / molecular / AlignmentEditor.java

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/molecular/AlignmentEditor.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/molecular/AlignmentEditor.java
index c17ffa41e1cba8f963969d032ce52e2cef0e51c1..2ea4df0dbc96f205ac772187fe7c79f6334c3582 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/molecular/AlignmentEditor.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/molecular/AlignmentEditor.java
@@ -274,9 +274,9 @@ public class AlignmentEditor extends EditorPart {
                                                MediaUtils.getFirstMediaRepresentationPart(pherogramInfo.getPherogram()).getUri(),
                                                singleReadAlignment.isReverseComplement(),
                                                singleReadAlignment.getEditedSequence(),
-                                               singleReadAlignment.getFirstSeqPosition(),
-                                               singleReadAlignment.getLeftCutPosition(),
-                                               singleReadAlignment.getRightCutPosition(),
+                                               singleReadAlignment.getFirstSeqPosition()!=null?singleReadAlignment.getFirstSeqPosition():0,
+                                               singleReadAlignment.getLeftCutPosition()!=null?singleReadAlignment.getLeftCutPosition():0,
+                                               singleReadAlignment.getRightCutPosition()!=null?singleReadAlignment.getRightCutPosition():0,
                                                singleReadAlignment.getShifts());
                                cdmMap.put(id, singleReadAlignment);
                        }