merge-update from trunk

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

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 61ab18ee531c749d38fad748f26b5f2add14ffd4..97207a2babd51d458d8e3e61580928f74bcdea31 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,9 +14,13 @@ import org.eclipse.ui.forms.widgets.ExpandableComposite;
 
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
 import eu.etaxonomy.cdm.api.facade.MethodNotSupportedByDerivedUnitTypeException;
+import eu.etaxonomy.cdm.model.common.DefinedTerm;
+import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
-import eu.etaxonomy.taxeditor.model.AbstractUtility;
+import eu.etaxonomy.cdm.model.occurrence.PreservationMethod;
+import eu.etaxonomy.taxeditor.model.MessagingUtils;
 import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.element.LayoutConstants;
@@ -36,6 +40,8 @@ import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
 public class DerivedUnitBaseDetailElement extends
                AbstractCdmDetailElement<DerivedUnitFacade> {
 
+    private TextWithLabelElement textOriginalLabelData;
+
        private TextWithLabelElement text_derivedUnitDefinitions;
 
        private TextWithLabelElement text_barcode;
@@ -46,9 +52,7 @@ public class DerivedUnitBaseDetailElement extends
 
        private TextWithLabelElement text_exsicatum;
 
-       //FIXME:3.3MC---- see Ticket #3732
-//     private TermComboElement<PreservationMethod> combo_preservationMethod;
-       //FIXME:3.3MC----
+       private TermComboElement<DefinedTerm> combo_preservationMethod;
 
        private SpecimenCollectionDetailSection section_duplicates;
 
@@ -80,25 +84,27 @@ public class DerivedUnitBaseDetailElement extends
                // "Specimen Definition",
                // facade.getDerivedUnitDefinition(CdmStore.getDefaultLanguage()),
                // style);
+           //FIXME map original label data to corresponding model field
+           //commented because we do not use this yet in the trunk
+//         textOriginalLabelData = formFactory.createTextWithLabelElement(formElement, "Original Label Data", null, style);
         text_barcode = formFactory.createTextWithLabelElement(formElement, "Barcode", entity.getBarcode(), style);
         text_catalogNumber = formFactory.createTextWithLabelElement(formElement, "Catalog Number", entity.getCatalogNumber(), style);
 
 
-        //FIXME:3.3MC----
-//             try {
-//            combo_preservationMethod = formFactory.createTermComboElement(PreservationMethod.class, formElement, "Preservation Method", entity.getPreservationMethod(), style);
-//             } catch (MethodNotSupportedByDerivedUnitTypeException e) {
-//                     // we ignore this
-//            AbstractUtility.info(e.getMessage());
-//             }
-               //FIXME:3.3MC----
+               try {
+            PreservationMethod preservationMethod = entity.getPreservationMethod();
+            combo_preservationMethod = formFactory.createDefinedTermComboElement(TermType.MaterialOrMethod, formElement, "Preservation Method", preservationMethod==null?null:preservationMethod.getDefinedMaterialOrMethod(), style);
+               } catch (MethodNotSupportedByDerivedUnitTypeException e) {
+                       // we ignore this
+            MessagingUtils.info(e.getMessage());
+               }
         selection_storedUnder = formFactory.createSelectionElement(TaxonNameBase.class, getConversationHolder(), formElement, "Stored Under", entity.getStoredUnder(), EntitySelectionElement.ALL, style);
 
                try {
             text_exsicatum = formFactory.createTextWithLabelElement(formElement, "Exsiccatum", entity.getExsiccatum(), style);
                } catch (MethodNotSupportedByDerivedUnitTypeException e) {
                        // we ignore this
-            AbstractUtility.info(e.getMessage());
+            MessagingUtils.info(e.getMessage());
                }
 
 //             section_duplicates = (SpecimenCollectionDetailSection) formFactory
@@ -114,39 +120,37 @@ public class DerivedUnitBaseDetailElement extends
                section_source.setEntity(entity);
        }
 
-       /** {@inheritDoc} */
-       @Override
-       public void handleEvent(Object eventSource) {
-               if (eventSource == text_derivedUnitDefinitions) {
-                       getEntity().addDerivedUnitDefinition(
-                                       text_derivedUnitDefinitions.getText(),
-                                       CdmStore.getDefaultLanguage());
-               } else if (eventSource == text_barcode) {
-                       getEntity().setBarcode(text_barcode.getText());
-               } else if (eventSource == text_catalogNumber) {
-                       getEntity().setCatalogNumber(text_catalogNumber.getText());
-                       //FIXME:3.3MC----
-//             } else if (eventSource == combo_preservationMethod) {
-//                     try {
-//                             getEntity().setPreservationMethod(
-//                                             combo_preservationMethod.getSelection());
-//                     } catch (MethodNotSupportedByDerivedUnitTypeException e) {
-//                             AbstractUtility
-//                                             .errorDialog(
-//                                                             "MethodNotSupportedByDerivedUnitTypeException",
-//                                                             this,
-//                                                             "MethodNotSupportedByDerivedUnitTypeException when trying to set preservation method for derive unit",
-//                                                             e);
-//                     }
-                       //FIXME:3.3MC----
-               } else if (eventSource == selection_storedUnder) {
-                       getEntity().setStoredUnder(selection_storedUnder.getEntity());
-               } else if (eventSource == text_exsicatum) {
-                       try {
-                               getEntity().setExsiccatum(text_exsicatum.getText());
-                       } catch (Exception e) {
-                               AbstractUtility.error(this.getClass(), e);
-                       }
-               }
-       }
+    /** {@inheritDoc} */
+    @Override
+    public void handleEvent(Object eventSource) {
+        if (eventSource == text_derivedUnitDefinitions) {
+            getEntity().addDerivedUnitDefinition(text_derivedUnitDefinitions.getText(), CdmStore.getDefaultLanguage());
+        } else if (eventSource == text_barcode) {
+            getEntity().setBarcode(text_barcode.getText());
+        } else if (eventSource == text_catalogNumber) {
+            getEntity().setCatalogNumber(text_catalogNumber.getText());
+        } else if (eventSource == combo_preservationMethod) {
+            try {
+                PreservationMethod preservationMethod = getEntity().getPreservationMethod();
+                if(preservationMethod!=null){
+                    preservationMethod.setDefinedMaterialOrMethod(combo_preservationMethod.getSelection());
+                }
+            } catch (MethodNotSupportedByDerivedUnitTypeException e) {
+                MessagingUtils
+                        .messageDialog(
+                                "MethodNotSupportedByDerivedUnitTypeException",
+                                this,
+                                "MethodNotSupportedByDerivedUnitTypeException when trying to set preservation method for derive unit",
+                                e);
+            }
+        } else if (eventSource == selection_storedUnder) {
+            getEntity().setStoredUnder(selection_storedUnder.getEntity());
+        } else if (eventSource == text_exsicatum) {
+            try {
+                getEntity().setExsiccatum(text_exsicatum.getText());
+            } catch (Exception e) {
+                MessagingUtils.error(this.getClass(), e);
+            }
+        }
+    }
 }