Fix potential NPE

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/CharacterDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/CharacterDetailElement.java
index 5df5bdaad9c8fe302c4923c288ef2b3e0fb79e7a..1c38d6be9751e45be859a4b0585229ea5172df2e 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/CharacterDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/CharacterDetailElement.java
@@ -70,13 +70,13 @@ public class CharacterDetailElement extends AbstractCdmDetailElement<Character>
            Label lblStructure = new Label(formElement.getLayoutComposite(), style);
            lblStructure.setText("Structure");
            Label lblStructureText = new Label(formElement.getLayoutComposite(), style);
-           lblStructureText.setText(StoreUtil.getPath(entity.getStructure()));
+           lblStructureText.setText(getStructureText(entity));
            lblStructureText.setForeground(ColorResources.getColor(Resources.BLACK));
            Label lblProperty = new Label(formElement.getLayoutComposite(), style);
            lblProperty.setText("Property");
            Label lblPropertyText = new Label(formElement.getLayoutComposite(), style);
            lblPropertyText.setForeground(ColorResources.getColor(Resources.BLACK));
-           lblPropertyText.setText(StoreUtil.getPath(entity.getProperty()));
+           lblPropertyText.setText(getPropertyText(entity));
 
         comboStructuralModifier = formFactory.createDefinedTermComboElement(TermType.StructureModifier, formElement, "Structural Modifier", entity.getStructureModifier(), style);
 
@@ -109,6 +109,14 @@ public class CharacterDetailElement extends AbstractCdmDetailElement<Character>
 
     }
 
+    private String getPropertyText(Character entity) {
+        return entity.getProperty()!=null?StoreUtil.getPath(entity.getProperty()):"[no property]";
+    }
+
+    private String getStructureText(Character entity) {
+        return entity.getStructure()!=null?StoreUtil.getPath(entity.getStructure()):"[no structure]";
+    }
+
     @Override
     public void setEntity(Character entity) {
         super.setEntity(entity);