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 / name / SpecimenTypeDesignationElement.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/SpecimenTypeDesignationElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/SpecimenTypeDesignationElement.java
index af48badddd652c271e45a921974f808ab7e7597a..dc0b93d52a5929713f57f6fad8955c62db4d7012 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/SpecimenTypeDesignationElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/SpecimenTypeDesignationElement.java
@@ -54,22 +54,25 @@ public class SpecimenTypeDesignationElement extends
                                                formElement, "Designation Status", null, style, new TypeDesignationStatusComparator<SpecimenTypeDesignationStatus>());
 
                super.createControls(formElement, style);
+               setEntity(entity);
        }
 
        @Override
        public void setEntity(SpecimenTypeDesignation entity) {
            super.setEntity(entity);
-        if (entity.getTypeSpecimen() != null){
-            selection_typeSpecimen.setEntity(entity.getTypeSpecimen());
-        }else{
-            selection_typeSpecimen.setEntity(entity.getTypeSpecimen());
-        }
-
-               SpecimenTypeDesignationStatus typeStatus = HibernateProxyHelper
-                               .deproxy(entity.getTypeStatus(), SpecimenTypeDesignationStatus.class);
-           combo_typeStatus.setSelection(typeStatus);
-
-               checkbox_notDesignated.setSelection(entity.isNotDesignated());
+           if (selection_typeSpecimen != null){
+               if (entity.getTypeSpecimen() != null){
+                   selection_typeSpecimen.setEntity(entity.getTypeSpecimen());
+               }else{
+                   selection_typeSpecimen.setEntity(entity.getTypeSpecimen());
+               }
+       
+                       SpecimenTypeDesignationStatus typeStatus = HibernateProxyHelper
+                                       .deproxy(entity.getTypeStatus(), SpecimenTypeDesignationStatus.class);
+                   combo_typeStatus.setSelection(typeStatus);
+       
+                       checkbox_notDesignated.setSelection(entity.isNotDesignated());
+           }
        }
 
        @Override