merging in latest changes from trunk

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / ui / section / name / NameTypeDesignationElement.java

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..6d4c33854f93d5e7efa40c4ab40298dd14d2429b 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
@@ -10,18 +10,18 @@
 
 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.taxeditor.ui.forms.AbstractFormSection;
-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.SelectionType;
-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;
-import eu.etaxonomy.taxeditor.ui.forms.CheckboxElement;
-import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
-import eu.etaxonomy.taxeditor.ui.selection.NameSelectionElement;
-import eu.etaxonomy.taxeditor.ui.term.NameTypeDesignationStatusComboElement;
+import eu.etaxonomy.cdm.model.name.NameTypeDesignationStatus;
+import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
+import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection;
+import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.element.CheckboxElement;
+import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
 
 /**
  * <p>
@@ -35,12 +35,10 @@ import eu.etaxonomy.taxeditor.ui.term.NameTypeDesignationStatusComboElement;
 public class NameTypeDesignationElement extends
                AbstractTypeDesignationElement<NameTypeDesignation> {
 
-       private static final Logger logger = Logger
-                       .getLogger(NameTypeDesignationElement.class);
        private CheckboxElement checkbox_rejectedType;
        private CheckboxElement checkbox_conservedType;
-       private NameSelectionElement selection_typeName;
-       private NameTypeDesignationStatusComboElement combo_typeStatus;
+       private EntitySelectionElement<TaxonNameBase> selection_typeName;
+       private TermComboElement<NameTypeDesignationStatus> combo_typeStatus;
 
        /**
         * <p>
@@ -48,10 +46,10 @@ public class NameTypeDesignationElement extends
         * </p>
         * 
         * @param formFactory
-        *            a {@link eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory}
+        *            a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory}
         *            object.
         * @param section
-        *            a {@link eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection}
+        *            a {@link eu.etaxonomy.taxeditor.ui.element.AbstractFormSection}
         *            object.
         * @param entity
         *            a {@link eu.etaxonomy.cdm.model.name.NameTypeDesignation}
@@ -75,13 +73,12 @@ public class NameTypeDesignationElement extends
                                "Rejected Type", false, style);
                checkbox_conservedType = formFactory.createCheckbox(formElement,
                                "Conserved Type", false, style);
-               selection_typeName = (NameSelectionElement) formFactory
-                               .createSelectionElement(SelectionType.NAME,
+               selection_typeName = formFactory
+                               .createSelectionElement(TaxonNameBase.class,
                                                getConversationHolder(), formElement, "Name", null,
-                                               NameSelectionElement.DEFAULT, style);
-               combo_typeStatus = (NameTypeDesignationStatusComboElement) formFactory
-                               .createTermComboElement(
-                                               TermComboType.NAMETYPEDESIGNATIONSTATUS, formElement,
+                                               EntitySelectionElement.ALL, style);
+               combo_typeStatus = formFactory.createTermComboElement(
+                               NameTypeDesignationStatus.class, formElement,
                                                "Designation Status", null, style);
 
                super.createControls(formElement, style);
@@ -94,9 +91,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());
        }