Fixed a hibernate proxy error for name types. Strangely this only occurred in special...

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameTypeDesignationElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameTypeDesignationElement.java
index 4c489d62d6a1fc5fd14d655345086e4e434ec783..6de937e7ee5109713a9f3a2e6363e305c3b7c6f6 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameTypeDesignationElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameTypeDesignationElement.java
@@ -13,7 +13,10 @@ package eu.etaxonomy.taxeditor.ui.section.name;
 import org.apache.log4j.Logger;
 import org.eclipse.swt.events.SelectionListener;
 
+import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.name.NameTypeDesignation;
+import eu.etaxonomy.cdm.model.name.NameTypeDesignationStatus;
+import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType;
@@ -94,9 +97,9 @@ public class NameTypeDesignationElement extends
                checkbox_conservedType.setSelection(entity.isConservedType());
                checkbox_rejectedType.setSelection(entity.isRejectedType());
 
-               selection_typeName.setEntity(entity.getTypeName());
+               selection_typeName.setEntity((TaxonNameBase) HibernateProxyHelper.deproxy(entity.getTypeName()));
 
-               combo_typeStatus.setSelection(entity.getTypeStatus());
+               combo_typeStatus.setSelection((NameTypeDesignationStatus) HibernateProxyHelper.deproxy(entity.getTypeStatus()));
 
                checkbox_notDesignated.setSelection(entity.isNotDesignated());
        }