X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/blobdiff_plain/5a27a3ccb8b6f0399165d65f00bd0ce5ae10ee51..d7ad25d95035c1f963c1f66b8cd9b010702df7e3:/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/association/DerivedUnitTypeDesignationElement.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/association/DerivedUnitTypeDesignationElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/association/DerivedUnitTypeDesignationElement.java
index 33e6592e2..cd042e416 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/association/DerivedUnitTypeDesignationElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/association/DerivedUnitTypeDesignationElement.java
@@ -49,18 +49,20 @@ public class DerivedUnitTypeDesignationElement
     @Override
     public void setEntity(SpecimenTypeDesignation entity) {
         super.setEntity(entity);
-        Set<TaxonName> typifiedNames = entity.getTypifiedNames();
-        if(typifiedNames.size()==1){
-            selectionTaxonName.setEntity(typifiedNames.iterator().next());
+        if (combo_typeStatus != null){
+	        Set<TaxonName> typifiedNames = entity.getTypifiedNames();
+	        if(typifiedNames.size()==1){
+	            selectionTaxonName.setEntity(typifiedNames.iterator().next());
+	        }
+	        else if(typifiedNames.size()>1){
+	            formFactory.createLabel(getLayoutComposite(), "!!!!!!!!");
+	        }
+	
+	        SpecimenTypeDesignationStatus typeStatus = HibernateProxyHelper
+	        		.deproxy(entity.getTypeStatus());
+	        combo_typeStatus.setSelection(typeStatus);
+	        checkbox_notDesignated.setSelection(entity.isNotDesignated());
         }
-        else if(typifiedNames.size()>1){
-            formFactory.createLabel(getLayoutComposite(), "!!!!!!!!");
-        }
-
-        SpecimenTypeDesignationStatus typeStatus = HibernateProxyHelper
-        		.deproxy(entity.getTypeStatus());
-        combo_typeStatus.setSelection(typeStatus);
-        checkbox_notDesignated.setSelection(entity.isNotDesignated());
 
 //        for (TaxonNameBase taxonNameBase : typifiedNames) {
 //            EntitySelectionElement<TaxonNameBase> selectionElement = formFactory.createSelectionElement(
@@ -87,6 +89,9 @@ public class DerivedUnitTypeDesignationElement
                 parentFormElement, "Designation Status", null, style);
 
         super.createControls(element, style);
+        if (entity != null){
+        	setEntity(entity);
+        }
     }
 
     /** {@inheritDoc} */