ref #9838: change order of ui element creation and setting entity in collection elements

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / ui / section / taxon / TaxonDetailElement.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonDetailElement.java
index 3ff8f82b1179ca8a1aa31b50ee0d07cabf52a7fb..6c058286bbf9436e262d16c6c6b2a4349454c803 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonDetailElement.java
@@ -33,7 +33,10 @@ public class TaxonDetailElement extends AbstractEntityCollectionElement<Taxon> {
 
        @Override
        public void setEntity(Taxon entity) {
-               selection_taxon.setEntity(entity);
+               this.entity = entity;
+               if (selection_taxon != null){
+                       selection_taxon.setEntity(entity);
+               }
        }
 
        @Override
@@ -42,6 +45,9 @@ public class TaxonDetailElement extends AbstractEntityCollectionElement<Taxon> {
                                .createSelectionElement(Taxon.class,
                                        element, "Taxon", null,
                                                EntitySelectionElement.SELECTABLE, style);
+               if (entity != null){
+                       setEntity(entity);
+               }
        }
 
        @Override