Merge branch 'release/5.28.0'

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / ui / section / name / TextTypeDesignationElement.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/TextTypeDesignationElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/TextTypeDesignationElement.java
index 1a002afce890b1f3f0d7feaf1cc7bec1151326ad..fab27a1f8b4f3db7ba16043037964135c1aa0976 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/TextTypeDesignationElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/TextTypeDesignationElement.java
@@ -43,6 +43,9 @@ public class TextTypeDesignationElement extends
         multilanguageTextElement = formFactory.createMultiLanguageTextElement(this, null, entity.getText(), 100, SWT.WRAP);
         checkIsVerbatim = formFactory.createCheckbox(formElement, "Is Verbatim", getEntity().isVerbatim(), style);
         super.createControls(formElement, style);
+        if (entity != null){
+               setEntity(entity);
+        }
        }
 
     @Override
@@ -57,7 +60,9 @@ public class TextTypeDesignationElement extends
        @Override
        public void setEntity(TextualTypeDesignation entity) {
            super.setEntity(entity);
-           removeNotDesignatedControls();
+           if (checkbox_notDesignated != null){
+               removeNotDesignatedControls();
+           }
        }
 
        @Override