Merge branch 'release/5.28.0'

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

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/MarkerElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/MarkerElement.java
index 5c0bb65cca9a1b4ab16f0f4be88c39299ec9b2c7..37a7bbd1e17866e4c58edb2edbf16859c12335e9 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/MarkerElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/MarkerElement.java
@@ -34,15 +34,20 @@ public class MarkerElement extends AbstractEntityCollectionElement<Marker>{
        public void createControls(ICdmFormElement element, int style) {
                checkbox_markerState = formFactory.createCheckbox(this, null, false, style);
                combo_markerType = formFactory.createDefinedTermComboElement(TermType.MarkerType, this, null, null, style);
+               if (entity != null){
+                       setEntity(entity);
+               }
        }
 
        /** {@inheritDoc} */
        @Override
        public void setEntity(Marker element) {
                this.entity = element;
-               checkbox_markerState.setSelection(element.getFlag());
-               combo_markerType.setSelection(element.getMarkerType());
-               combo_markerType.removeEmptyElement();
+               if (checkbox_markerState != null){
+                       checkbox_markerState.setSelection(element.getFlag());
+                       combo_markerType.setSelection(element.getMarkerType());
+                       combo_markerType.removeEmptyElement();
+               }
        }
 
        /** {@inheritDoc} */