Merge branch 'release/5.28.0'

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / ui / section / description / DescriptionSourceElement.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionSourceElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionSourceElement.java
index ad7ea3be05ce72fe96cd8c4969a77d1ef3ff6bfd..42dadf9f336219e345a3cbccc94e892ff4f5412a 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionSourceElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionSourceElement.java
@@ -64,12 +64,18 @@ public class DescriptionSourceElement extends
                                .createSelectionElement(Reference.class,
                                        element, "Source",
                                                null, EntitySelectionElement.ALL, style);
+               if (entity != null){
+                       setEntity(entity);
+               }
        }
 
        /** {@inheritDoc} */
        @Override
        public void setEntity(Reference element) {
-               selection_descriptionSource.setEntity(element);
+               this.entity = element;
+               if (selection_descriptionSource != null){
+                       selection_descriptionSource.setEntity(element);
+               }
        }
 
        /** {@inheritDoc} */