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 / vocabulary / MeasurementUnitDtoCollectionElement.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/MeasurementUnitDtoCollectionElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/MeasurementUnitDtoCollectionElement.java
index a9a6a51c6f7f7c8ce5149212032c80fad80f05ea..1f597a493c63140b705f5290ae25b76e196c5a29 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/MeasurementUnitDtoCollectionElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/vocabulary/MeasurementUnitDtoCollectionElement.java
@@ -49,15 +49,18 @@ public class MeasurementUnitDtoCollectionElement extends AbstractEntityCollectio
     @Override
     public void createControls(ICdmFormElement element, int style) {
         comboMeasurementUnit = formFactory.createDefinedTermComboElementDto(TermType.MeasurementUnit, element, "Measurement unit", null, style);
+        if (entity != null){
+               setEntity(entity);
+        }
     }
 
     @Override
     public void setEntity(TermDto entity) {
         this.entity = entity;
-//        if(entity.getId()!=0){
+        if(comboMeasurementUnit != null){
             comboMeasurementUnit.setSelectionDto(entity);
             comboMeasurementUnit.removeEmptyElement();
-//        }
+        }
     }
 
     @Override