SourceCollectionDetailSection : updated construction of DervivedUnit using SpecimenOr...

SpecimenCollectionDetailSection : updated construction of DervivedUnit using SpecimenOrObservationType
GeneralDetailElement : added combo box to choose from known SpecimenOrObservationTypes
DerivedUnitBaseDetailElement : commenting out duplicates section for now until furthur discussion
GatheringEventDetailElement : FIXME3.3MC tags for the gathering event min,max,freetext updates

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailElement.java
index 1569bc08eb3467d5abbece97c0e85d93f9f332dd..f95ae13cb55108064eb6adc91168770ac5211323 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailElement.java
@@ -14,10 +14,13 @@ import org.eclipse.ui.forms.widgets.Section;
 
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
 import eu.etaxonomy.cdm.api.facade.MethodNotSupportedByDerivedUnitTypeException;
+import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.occurrence.PreservationMethod;
+import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
+import eu.etaxonomy.taxeditor.ui.combo.EnumComboElement;
 import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.EntityDetailType;
@@ -48,7 +51,8 @@ public class DerivedUnitBaseDetailElement extends
        private EntitySelectionElement<TaxonNameBase> selection_storedUnder;
 
        private TextWithLabelElement text_exsicatum;
-
+       
+       
        private TermComboElement<PreservationMethod> combo_preservationMethod;
 
        private SpecimenCollectionDetailSection section_duplicates;
@@ -88,6 +92,7 @@ public class DerivedUnitBaseDetailElement extends
                                .createTextWithLabelElement(formElement, "Catalog Number",
                                                entity.getCatalogNumber(), style);
 
+               
                try {
                        combo_preservationMethod = formFactory.createTermComboElement(PreservationMethod.class,
                                                        formElement, "Preservation Method",
@@ -110,13 +115,13 @@ public class DerivedUnitBaseDetailElement extends
                        StoreUtil.info(e.getMessage());
                }
 
-               section_duplicates = (SpecimenCollectionDetailSection) formFactory
-                               .createEntityDetailSection(
-                                               EntityDetailType.SPECIMEN_COLLECTION,
-                                               getConversationHolder(), formElement, Section.TWISTIE);
-               section_duplicates
-                               .setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
-               section_duplicates.setEntity(entity);
+//             section_duplicates = (SpecimenCollectionDetailSection) formFactory
+//                             .createEntityDetailSection(
+//                                             EntityDetailType.SPECIMEN_COLLECTION,
+//                                             getConversationHolder(), formElement, Section.TWISTIE);
+//             section_duplicates
+//                             .setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
+//             section_duplicates.setEntity(entity);
 
                section_source = (SourceCollectionDetailSection) formFactory
                                .createEntityDetailSection(

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 44002562e76bade1018044598bf4b4325fa53a35..1e41c11e46108513999460a7d91f9849ce3cffa7 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
@@ -73,14 +73,15 @@ public class GatheringEventDetailElement extends
        protected void createControls(ICdmFormElement formElement,
                        DerivedUnitFacade entity, int style) {
                // collectingArea
-               number_absoluteElevationError = formFactory
-                               .createNumberTextWithLabelElement(formElement,
-                                               "Elevation Error", entity.getAbsoluteElevationError(),
-                                               style);
-               number_absoluteElevationMinimum = formFactory
-                               .createNumberTextWithLabelElement(formElement,
-                                               "Elevation Minimum (m)",
-                                               entity.getAbsoluteElevationMinimum(), style);
+               //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)",
@@ -89,7 +90,7 @@ public class GatheringEventDetailElement extends
                text_collectingMethod = formFactory.createTextWithLabelElement(
                                formElement, "Collecting Method", entity.getCollectingMethod(),
                                style);
-               //FIXME:3.3MC
+
                number_distanceToGround = formFactory
                                .createNumberTextWithLabelElement(formElement,
                                                "Distance To Ground (m)", entity.getDistanceToGround(),
@@ -115,10 +116,12 @@ public class GatheringEventDetailElement extends
        /** {@inheritDoc} */
        @Override
        public void handleEvent(Object eventSource) {
-               if (eventSource == number_absoluteElevationError) {
-                       getEntity().setAbsoluteElevationError(
-                                       number_absoluteElevationError.getInteger());
-               } else if (eventSource == number_absoluteElevationMinimum) {
+               //FIXME:3.3MC
+//             if (eventSource == number_absoluteElevationError) {
+//                     getEntity().setAbsoluteElevationError(
+//                                     number_absoluteElevationError.getInteger());
+//             } else 
+               if (eventSource == number_absoluteElevationMinimum) {
                        try {
                                getEntity().setAbsoluteElevationRange(
                                                number_absoluteElevationMinimum.getInteger(),
@@ -146,10 +149,10 @@ public class GatheringEventDetailElement extends
                        getEntity().setCollectingMethod(text_collectingMethod.getText());
                } else if (eventSource == number_distanceToGround) {
                        getEntity().setDistanceToGround(
-                                       number_distanceToGround.getInteger());
+                                       number_distanceToGround.getDouble());
                } else if (eventSource == number_distanceToWaterSurface) {
                        getEntity().setDistanceToWaterSurface(
-                                       number_distanceToWaterSurface.getInteger());
+                                       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 a20485029060e4de8b4058020f91ccc54373563d..32970e0fd5f2cb9ebf7d57a1ccb07465d2e165ce 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
@@ -15,6 +15,8 @@ import eu.etaxonomy.cdm.model.agent.AgentBase;
 import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.location.NamedArea;
 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.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.element.LanguageStringWithLabelElement;
@@ -35,7 +37,7 @@ public class GeneralDetailElement extends
                AbstractCdmDetailElement<DerivedUnitFacade> {
 
        private ToggleableTextElement toggleableText_titleCache;
-
+       private EnumComboElement<SpecimenOrObservationType> combo_specorobstype;
        private EntitySelectionElement<NamedArea> selection_country;
        private LanguageStringWithLabelElement languageText_locality;
        private PointElement element_point;
@@ -68,7 +70,10 @@ public class GeneralDetailElement extends
                toggleableText_titleCache = formFactory.createToggleableTextField(
                                formElement, "Title Cache", entity.getTitleCache(),
                                entity.isProtectedTitleCache(), style);
-
+               combo_specorobstype = formFactory
+                               .createEnumComboElement(SpecimenOrObservationType.class,
+                                               formElement, style);
+               combo_specorobstype.setSelection(entity.getType());
                selection_country = formFactory.createSelectionElement(NamedArea.class, getConversationHolder(),
                                formElement, "Country",
                                entity.getCountry(), EntitySelectionElement.NOTHING, style);
@@ -131,6 +136,8 @@ public class GeneralDetailElement extends
                        getEntity().setCollection(selection_collection.getSelection());
                } else if (eventSource == text_accessionNumber) {
                        getEntity().setAccessionNumber(text_accessionNumber.getText());
+               } else if (eventSource == combo_specorobstype) {
+                       getEntity().setType(combo_specorobstype.getSelection());
                }
 
                if (eventSource != toggleableText_titleCache) {

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SourceCollectionDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SourceCollectionDetailSection.java
index 157480d4c45405d32c992c98183c3e82ca97061b..501d000bac2073ec9965b0a81fd5cc58f1a968d0 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SourceCollectionDetailSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SourceCollectionDetailSection.java
@@ -15,6 +15,7 @@ import java.util.Collection;
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
 import eu.etaxonomy.cdm.model.common.IdentifiableSource;
+import eu.etaxonomy.cdm.model.common.OriginalSourceType;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
@@ -57,7 +58,7 @@ public class SourceCollectionDetailSection extends
        /** {@inheritDoc} */
        @Override
        public IdentifiableSource createNewElement() {
-               return IdentifiableSource.NewInstance();
+               return IdentifiableSource.NewInstance(OriginalSourceType.PrimaryTaxonomicSource);               
        }
 
        /* (non-Javadoc)

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SpecimenCollectionDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SpecimenCollectionDetailSection.java
index 59682023bbfe059aac284f768b93aeab08ce34e2..7caf8bd4ce5a222857e23815911b7c1df32743b3 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SpecimenCollectionDetailSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SpecimenCollectionDetailSection.java
@@ -15,6 +15,7 @@ import java.util.Collection;
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
 import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
+import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
@@ -56,8 +57,8 @@ public class SpecimenCollectionDetailSection extends
         */
        /** {@inheritDoc} */
        @Override
-       public DerivedUnit createNewElement() {
-               return DerivedUnit.NewInstance();
+       public DerivedUnit createNewElement() {         
+               return DerivedUnit.NewInstance(SpecimenOrObservationType.PreservedSpecimen);            
        }
 
        /* (non-Javadoc)