Fixes a problem with TimePeriodElement

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / ui / section / occurrence / DeterminationEventDetailElement.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DeterminationEventDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DeterminationEventDetailElement.java
index 4324ca89176e84e1e3d232b3f36e4785d4b0de36..d879b874b0d2579bfcccbb708781bb589abf87c9 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DeterminationEventDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DeterminationEventDetailElement.java
@@ -19,6 +19,7 @@ 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.TaxonBaseSelectionElement;
 import eu.etaxonomy.taxeditor.ui.selection.TaxonSelectionElement;
 import eu.etaxonomy.taxeditor.ui.term.DeterminationModifierComboElement;
 
@@ -36,7 +37,7 @@ public class DeterminationEventDetailElement extends
 
        private DeterminationModifierComboElement combo_determinationModifier;
        private CheckboxElement checkbox_preferredFlag;
-       private TaxonSelectionElement selection_taxon;
+       private TaxonBaseSelectionElement selection_taxonBase;
 
        // private TODO a set of references
 
@@ -76,6 +77,8 @@ public class DeterminationEventDetailElement extends
        @Override
        public void setEntity(DeterminationEvent entity) {
                this.entity = entity;
+               combo_determinationModifier.setSelection(entity.getModifier());
+               selection_taxonBase.setEntity(entity.getTaxon());
                super.setEntity(entity);
        }
 
@@ -93,10 +96,11 @@ public class DeterminationEventDetailElement extends
                combo_determinationModifier = (DeterminationModifierComboElement) formFactory
                                .createTermComboElement(TermComboType.DETERMINATION_MODIFIER,
                                                element, "Determination Modifier", null, style);
+               // TODO remove this
 //             checkbox_preferredFlag = formFactory.createCheckbox(element,
 //                                     "Current", false, style);
-               selection_taxon = (TaxonSelectionElement) formFactory
-                               .createSelectionElement(SelectionType.TAXON,
+               selection_taxonBase = (TaxonBaseSelectionElement) formFactory
+                               .createSelectionElement(SelectionType.TAXON_BASE,
                                                getConversationHolder(), element, "Taxon", null,
                                                TaxonSelectionElement.DEFAULT, style);
 
@@ -120,8 +124,8 @@ public class DeterminationEventDetailElement extends
                        getEntity().setModifier(combo_determinationModifier.getSelection());
                } else if (eventSource == checkbox_preferredFlag) {
                        getEntity().setPreferredFlag(checkbox_preferredFlag.getSelection());
-               } else if (eventSource == selection_taxon) {
-                       getEntity().setTaxon(selection_taxon.getSelection());
+               } else if (eventSource == selection_taxonBase) {
+                       getEntity().setTaxon(selection_taxonBase.getSelection());
                }
                // else if(eventSource == TODO set of references){
                //