From: Andreas Müller Date: Wed, 3 Jun 2020 11:23:11 +0000 (+0200) Subject: fix #9052 fix NPE for name details view name relationships X-Git-Tag: 5.15.0^2~111 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/afbd7a15f92a835d0c5da1dc48f9fa20b3dd1235 fix #9052 fix NPE for name details view name relationships --- diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameRelationshipDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameRelationshipDetailElement.java index eb0329b8e..43cb447ea 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameRelationshipDetailElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameRelationshipDetailElement.java @@ -67,8 +67,9 @@ public class NameRelationshipDetailElement extends AbstractReferencedEntityEleme @Override public void setEntity(NameRelationship entity) { - String text = entity.getFromName().getTitleCache() + " is " + entity.getType().getLabel() + " " + entity.getToName().getTitleCache(); - + String text = (entity.getFromName() == null? "-":entity.getFromName().getTitleCache()) + + " is " + (entity.getType()==null?"(no type)":entity.getType().getLabel()) + + " " + (entity.getToName()==null?"-":entity.getToName().getTitleCache()); label.setText(text); if (ruleConsidered != null){ ruleConsidered.setElement(entity);