- moved ICdmFormElement to campanula.compatibility

[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..eb5d84bbf416b0a0df6ca9f60f1e5446c61c5206 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
@@ -13,14 +13,14 @@ package eu.etaxonomy.taxeditor.ui.section.occurrence;
 import org.eclipse.swt.events.SelectionListener;
 
 import eu.etaxonomy.cdm.model.occurrence.DeterminationEvent;
-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.TaxonSelectionElement;
-import eu.etaxonomy.taxeditor.ui.term.DeterminationModifierComboElement;
+import eu.etaxonomy.cdm.model.occurrence.DeterminationModifier;
+import eu.etaxonomy.cdm.model.taxon.TaxonBase;
+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.section.campanula.compatibility.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
 
 /**
  * <p>
@@ -34,9 +34,9 @@ import eu.etaxonomy.taxeditor.ui.term.DeterminationModifierComboElement;
 public class DeterminationEventDetailElement extends
                AbstractEventDetailElement<DeterminationEvent> {
 
-       private DeterminationModifierComboElement combo_determinationModifier;
+       private TermComboElement<DeterminationModifier> combo_determinationModifier;
        private CheckboxElement checkbox_preferredFlag;
-       private TaxonSelectionElement selection_taxon;
+       private EntitySelectionElement<TaxonBase> selection_taxonBase;
 
        // private TODO a set of references
 
@@ -46,10 +46,10 @@ public class DeterminationEventDetailElement 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.occurrence.DeterminationEvent}
@@ -76,6 +76,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);
        }
 
@@ -89,21 +91,22 @@ public class DeterminationEventDetailElement extends
        /** {@inheritDoc} */
        @Override
        public void createControls(ICdmFormElement element, int style) {
-
-               combo_determinationModifier = (DeterminationModifierComboElement) formFactory
-                               .createTermComboElement(TermComboType.DETERMINATION_MODIFIER,
-                                               element, "Determination Modifier", null, style);
-//             checkbox_preferredFlag = formFactory.createCheckbox(element,
-//                                     "Current", false, style);
-               selection_taxon = (TaxonSelectionElement) formFactory
-                               .createSelectionElement(SelectionType.TAXON,
+               selection_taxonBase = formFactory
+                               .createSelectionElement(TaxonBase.class,
                                                getConversationHolder(), element, "Taxon", null,
-                                               TaxonSelectionElement.DEFAULT, style);
+                                               EntitySelectionElement.NOTHING, style);
+               
 
                // TODO set of references
 
                super.createControls(element, style);
+               
+               element_timePeriod.setLabel("Determined When");
                selection_agent.setLabel("Determined by");
+               
+               
+               combo_determinationModifier = formFactory.createTermComboElement(DeterminationModifier.class,
+                               element, "Modifier", null, style);
        }
 
        /*
@@ -120,8 +123,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){
                //