From a7e7d941b888253ab737c01cc5aa62639260f519 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Mon, 6 May 2013 17:47:42 +0000 Subject: [PATCH] handle NPE in Description Helper for Markers --- .../java/eu/etaxonomy/taxeditor/model/DescriptionHelper.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/DescriptionHelper.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/DescriptionHelper.java index bada11722..328f57a22 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/DescriptionHelper.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/DescriptionHelper.java @@ -27,6 +27,7 @@ import eu.etaxonomy.cdm.model.common.Language; import eu.etaxonomy.cdm.model.common.LanguageString; import eu.etaxonomy.cdm.model.common.LanguageStringBase; import eu.etaxonomy.cdm.model.common.Marker; +import eu.etaxonomy.cdm.model.common.MarkerType; import eu.etaxonomy.cdm.model.common.OriginalSourceBase; import eu.etaxonomy.cdm.model.description.CategoricalData; import eu.etaxonomy.cdm.model.description.CommonTaxonName; @@ -198,7 +199,8 @@ public class DescriptionHelper { } if (element instanceof Marker) { Marker marker = (Marker) element; - return marker.getMarkerType().getLabel() + " (" + marker.getFlag() + ")"; + MarkerType type = marker.getMarkerType(); + return (type == null ? "- no marker type -" : marker.getMarkerType().getLabel()) + " (" + marker.getFlag() + ")"; } // TODO write return texts for NameRelationship, HomotypicalGroup, SpecimenTypeDesignation, etc. return element.toString(); -- 2.34.1