Merge branch 'release/5.28.0'

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / ui / section / supplemental / identifier / IdentifierElement.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/identifier/IdentifierElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/identifier/IdentifierElement.java
index 0291ea7f31f4522727bbfb8218b63d991c949b4b..05aa6ae361275e9f4f1208bd5f7091e899d19e5f 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/identifier/IdentifierElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/identifier/IdentifierElement.java
@@ -42,15 +42,21 @@ public class IdentifierElement extends AbstractEntityCollectionElement<Identifie
     @Override
     public void setEntity(Identifier entity) {
         this.entity = entity;
-        textIdentifier.setText(entity.getIdentifier());
-        comboIdentifierType.setSelection(entity.getType());
+        if (textIdentifier != null){
+               textIdentifier.setText(entity.getIdentifier());
+               comboIdentifierType.setSelection(entity.getType());
+        }
     }
+        
 
        /** {@inheritDoc} */
        @Override
     public void createControls(ICdmFormElement formElement, int style) {
            comboIdentifierType = formFactory.createDefinedTermComboElement(TermType.IdentifierType, formElement, "Type", null, style);
                textIdentifier = formFactory.createTextWithLabelElement(formElement, "Identifier", null, style);
+               if (entity != null){
+                       setEntity(entity);
+               }
        }
 
        @Override