GeneralDetailElement : removed elevation element

FieldObservationDetailElement : calling new create function for filling in DefinedTerm combos (still requires a model side update)
GatheringEventDetailElement : added elements for elevation / distance to ground / distance to water surface

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldObservationDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldObservationDetailElement.java
index 5c54f7847e6fd36e12db7a63fe4dd24ca04db29f..647dc069c4ff6c705b33ef5674353cb97578f59a 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldObservationDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldObservationDetailElement.java
@@ -12,6 +12,7 @@ package eu.etaxonomy.taxeditor.ui.section.occurrence;
 
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
 import eu.etaxonomy.cdm.model.common.DefinedTerm;
+import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
@@ -65,9 +66,11 @@ public class FieldObservationDetailElement extends AbstractCdmDetailElement<Deri
                text_fieldNotes = formFactory.createTextWithLabelElement(formElement, "Field Notes", entity.getFieldNotes(), style);
                
                number_individualCount = formFactory.createNumberTextWithLabelElement(formElement, "Individual Count", entity.getIndividualCount(), style);
-               //FIXME:3.3MC
-               combo_lifeStage = formFactory.createTermComboElement(DefinedTerm.class, formElement, "Life Stage", entity.getLifeStage(), style);
-               combo_sex = formFactory.createTermComboElement(DefinedTerm.class, formElement, "Sex", entity.getSex(), style);
+               //FIXME:3.3MC----
+               // Need to make sure that the hard coded terms in DefinedTerm have a term type (currently null)
+               //combo_lifeStage = formFactory.createDefinedTermComboElement(TermType.Stage, formElement, "Life Stage", entity.getLifeStage(), style);
+               //combo_sex = formFactory.createDefinedTermComboElement(TermType.Sex, formElement, "Sex", entity.getSex(),style);
+               //FIXME:3.3MC----
        }
 
        /** {@inheritDoc} */

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GatheringEventDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GatheringEventDetailElement.java
index 1e41c11e46108513999460a7d91f9849ce3cffa7..caa6840e2dd218c5b6c5a7377bd86c5c7270d4d2 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GatheringEventDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GatheringEventDetailElement.java
@@ -17,8 +17,10 @@ import eu.etaxonomy.taxeditor.preference.Resources;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.EntityDetailType;
+import eu.etaxonomy.taxeditor.ui.element.GatheringEventUnitElement;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.element.LayoutConstants;
+import eu.etaxonomy.taxeditor.ui.element.MinMaxTextSection;
 import eu.etaxonomy.taxeditor.ui.element.NumberWithLabelElement;
 import eu.etaxonomy.taxeditor.ui.element.TextWithLabelElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
@@ -35,18 +37,16 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
 public class GatheringEventDetailElement extends
                AbstractCdmDetailElement<DerivedUnitFacade> {
 
-       private NumberWithLabelElement number_absoluteElevationError;
+       private GatheringEventUnitElement element_elevation;
 
-       private NumberWithLabelElement number_absoluteElevationMinimum;
-
-       private NumberWithLabelElement number_absoluteElevationMaximum;
+       private GatheringEventUnitElement element_distToGround;
+       
+       private GatheringEventUnitElement element_distToWater;
+       
+       private MinMaxTextSection section_minMaxText;
 
        private TextWithLabelElement text_collectingMethod;
 
-       private NumberWithLabelElement number_distanceToGround;
-
-       private NumberWithLabelElement number_distanceToWaterSurface;
-
        private TextWithLabelElement text_gatheringEventDescription;
 
        private CollectingAreasDetailSection section_collectingAreas;
@@ -70,89 +70,46 @@ public class GatheringEventDetailElement extends
 
        /** {@inheritDoc} */
        @Override
-       protected void createControls(ICdmFormElement formElement,
-                       DerivedUnitFacade entity, int style) {
+       protected void createControls(ICdmFormElement formElement, DerivedUnitFacade entity, int style) {
+               
+
                // collectingArea
-               //FIXME:3.3MC
-//             number_absoluteElevationError = formFactory
-//                             .createNumberTextWithLabelElement(formElement,
-//                                             "Elevation Error", entity.getAbsoluteElevationError(),
-//                                             style);
-//             number_absoluteElevationMinimum = formFactory
-//                             .createNumberTextWithLabelElement(formElement,
-//                                             "Elevation Minimum (m)",
-//                                             entity.getAbsoluteElevationMinimum(), style);
-               number_absoluteElevationMaximum = formFactory
-                               .createNumberTextWithLabelElement(formElement,
-                                               "Elevation Maximum (m)",
-                                               entity.getAbsoluteElevationMaximum(), style);
+
 
                text_collectingMethod = formFactory.createTextWithLabelElement(
                                formElement, "Collecting Method", entity.getCollectingMethod(),
                                style);
 
-               number_distanceToGround = formFactory
-                               .createNumberTextWithLabelElement(formElement,
-                                               "Distance To Ground (m)", entity.getDistanceToGround(),
-                                               style);
-               number_distanceToWaterSurface = formFactory
-                               .createNumberTextWithLabelElement(formElement,
-                                               "Distance To Water Surface (m)",
-                                               entity.getDistanceToWaterSurface(), style);
+
                // exactLocation
                text_gatheringEventDescription = formFactory
                                .createTextWithLabelElement(formElement,
                                                "Gathering Event Description",
                                                entity.getGatheringEventDescription(), style);
-
+               element_elevation = formFactory.createGatheringEventUnitElement(
+                               formElement, "Elevation : ", entity, MinMaxTextSection.UnitType.ELEVATION,  style);
+               
+               
+               element_distToGround = formFactory.createGatheringEventUnitElement(
+                               formElement, "Dist. To Ground : ", entity, MinMaxTextSection.UnitType.DIST_TO_GROUND,  style);
+               
+               element_distToWater = formFactory.createGatheringEventUnitElement(
+                               formElement, "Dist. To Water : ", entity, MinMaxTextSection.UnitType.DIST_TO_WATER,  style);
+               
                section_collectingAreas = (CollectingAreasDetailSection) formFactory
                                .createEntityDetailSection(EntityDetailType.COLLECTING_AREA,
                                                getConversationHolder(), formElement, Section.TWISTIE);
                section_collectingAreas.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(
                                2, 1));
                section_collectingAreas.setEntity(entity);
+
        }
 
        /** {@inheritDoc} */
        @Override
        public void handleEvent(Object eventSource) {
-               //FIXME:3.3MC
-//             if (eventSource == number_absoluteElevationError) {
-//                     getEntity().setAbsoluteElevationError(
-//                                     number_absoluteElevationError.getInteger());
-//             } else 
-               if (eventSource == number_absoluteElevationMinimum) {
-                       try {
-                               getEntity().setAbsoluteElevationRange(
-                                               number_absoluteElevationMinimum.getInteger(),
-                                               number_absoluteElevationMaximum.getInteger());
-                               number_absoluteElevationMinimum
-                                               .setBackground(getColor(Resources.COLOR_COMPOSITE_BACKGROUND));
-                       } catch (IllegalArgumentException e) {
-                               number_absoluteElevationMinimum
-                                               .setBackground(getColor(Resources.COLOR_PARSE_ERROR));
-                               StoreUtil.warn(getClass(), e.getLocalizedMessage());
-                       }
-               } else if (eventSource == number_absoluteElevationMaximum) {
-                       try {
-                               getEntity().setAbsoluteElevationRange(
-                                               number_absoluteElevationMinimum.getInteger(),
-                                               number_absoluteElevationMaximum.getInteger());
-                               number_absoluteElevationMaximum
-                                               .setBackground(getColor(Resources.COLOR_COMPOSITE_BACKGROUND));
-                       } catch (IllegalArgumentException e) {
-                               number_absoluteElevationMaximum
-                                               .setBackground(getColor(Resources.COLOR_PARSE_ERROR));
-                               StoreUtil.warn(getClass(), e.getLocalizedMessage());
-                       }
-               } else if (eventSource == text_collectingMethod) {
+               if (eventSource == text_collectingMethod) {
                        getEntity().setCollectingMethod(text_collectingMethod.getText());
-               } else if (eventSource == number_distanceToGround) {
-                       getEntity().setDistanceToGround(
-                                       number_distanceToGround.getDouble());
-               } else if (eventSource == number_distanceToWaterSurface) {
-                       getEntity().setDistanceToWaterSurface(
-                                       number_distanceToWaterSurface.getDouble());
                } else if (eventSource == text_gatheringEventDescription) {
                        getEntity().setGatheringEventDescription(
                                        text_gatheringEventDescription.getText());

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GeneralDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GeneralDetailElement.java
index 32970e0fd5f2cb9ebf7d57a1ccb07465d2e165ce..30d76a4cfde1700a68ca0ae44d7a5afdcfbbf051 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GeneralDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GeneralDetailElement.java
@@ -18,6 +18,7 @@ import eu.etaxonomy.cdm.model.occurrence.Collection;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;
 import eu.etaxonomy.taxeditor.ui.combo.EnumComboElement;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.element.GatheringEventUnitElement;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.element.LanguageStringWithLabelElement;
 import eu.etaxonomy.taxeditor.ui.element.NumberWithLabelElement;
@@ -27,6 +28,7 @@ import eu.etaxonomy.taxeditor.ui.element.TimePeriodElement;
 import eu.etaxonomy.taxeditor.ui.element.ToggleableTextElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
 import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
+import eu.etaxonomy.taxeditor.ui.element.MinMaxTextSection;
 
 /**
  * @author n.hoffmann
@@ -47,6 +49,7 @@ public class GeneralDetailElement extends
        private TextWithLabelElement text_collectingNumber;
        private EntitySelectionElement<Collection> selection_collection;
        private TextWithLabelElement text_accessionNumber;
+       
 
        /**
         * @param formFactory
@@ -82,9 +85,6 @@ public class GeneralDetailElement extends
                                                entity.getLocality(), style);           
                element_point = formFactory.createPointElement(formElement,
                                entity.getExactLocation(), style);
-               number_elevation = formFactory.createNumberTextWithLabelElement(
-                               formElement, "Absolute Elevation (m)",
-                               entity.getAbsoluteElevation(), style);
                element_date = formFactory.createTimePeriodElement(formElement, "Date",
                                entity.getGatheringPeriod(), style);
                selection_collector = formFactory