X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/blobdiff_plain/aeefa3f9c3c2358ebe722df23771d24cad32032c..b46dec0a0a06c22cab0ae2f4eb753034f4a8cb4e:/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 8422ed5d9..4abbb14a7 100644
--- 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
@@ -1,27 +1,27 @@
 // $Id$
 /**
  * Copyright (C) 2007 EDIT
- * European Distributed Institute of Taxonomy 
+ * European Distributed Institute of Taxonomy
  * http://www.e-taxonomy.eu
- * 
+ *
  * The contents of this file are subject to the Mozilla Public License Version 1.1
  * See LICENSE.TXT at the top of this package for the full license terms.
  */
 
 package eu.etaxonomy.taxeditor.ui.section.occurrence;
 
-import org.eclipse.ui.forms.widgets.Section;
+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.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.occurrence.PreservationMethod;
+import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.store.CdmStore;
-import eu.etaxonomy.taxeditor.store.StoreUtil;
+import eu.etaxonomy.taxeditor.ui.campanula.compatibility.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
-import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory.EntityDetailType;
-import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.element.LayoutConstants;
 import eu.etaxonomy.taxeditor.ui.element.TextWithLabelElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
@@ -31,7 +31,7 @@ import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
  * <p>
  * DerivedUnitBaseDetailElement class.
  * </p>
- * 
+ *
  * @author n.hoffmann
  * @created Jun 24, 2010
  * @version 1.0
@@ -41,7 +41,7 @@ public class DerivedUnitBaseDetailElement extends
 
 	private TextWithLabelElement text_derivedUnitDefinitions;
 
-	private TextWithLabelElement text_accessionNumber;
+	private TextWithLabelElement text_barcode;
 
 	private TextWithLabelElement text_catalogNumber;
 
@@ -49,7 +49,7 @@ public class DerivedUnitBaseDetailElement extends
 
 	private TextWithLabelElement text_exsicatum;
 
-	private TermComboElement<PreservationMethod> combo_preservationMethod;
+	private TermComboElement<DefinedTerm> combo_preservationMethod;
 
 	private SpecimenCollectionDetailSection section_duplicates;
 
@@ -59,7 +59,7 @@ public class DerivedUnitBaseDetailElement extends
 	 * <p>
 	 * Constructor for DerivedUnitBaseDetailElement.
 	 * </p>
-	 * 
+	 *
 	 * @param formFactory
 	 *            a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory}
 	 *            object.
@@ -74,90 +74,77 @@ public class DerivedUnitBaseDetailElement extends
 
 	/** {@inheritDoc} */
 	@Override
-	protected void createControls(ICdmFormElement formElement,
-			DerivedUnitFacade entity, int style) {
+    protected void createControls(ICdmFormElement formElement, DerivedUnitFacade entity, int style) {
 		// Disable for now
 		// text_derivedUnitDefinitions =
 		// formFactory.createTextWithLabelElement(formElement,
 		// "Specimen Definition",
 		// facade.getDerivedUnitDefinition(CdmStore.getDefaultLanguage()),
 		// style);
-		text_accessionNumber = formFactory.createTextWithLabelElement(
-				formElement, "Accession Number", entity.getAccessionNumber(),
-				style);
-		text_catalogNumber = formFactory
-				.createTextWithLabelElement(formElement, "Catalog Number",
-						entity.getCatalogNumber(), style);
+        text_barcode = formFactory.createTextWithLabelElement(formElement, "Barcode", entity.getBarcode(), style);
+        text_catalogNumber = formFactory.createTextWithLabelElement(formElement, "Catalog Number", entity.getCatalogNumber(), style);
+
 
 		try {
-			combo_preservationMethod = formFactory.createTermComboElement(PreservationMethod.class,
-							formElement, "Preservation Method",
-							entity.getPreservationMethod(), style);
+            PreservationMethod preservationMethod = entity.getPreservationMethod();
+            combo_preservationMethod = formFactory.createTermComboElement(DefinedTerm.class, formElement, "Preservation Method", preservationMethod==null?null:preservationMethod.getDefinedMaterialOrMethod(), style);
 		} catch (MethodNotSupportedByDerivedUnitTypeException e) {
 			// we ignore this
-			StoreUtil.info(e.getMessage());
+            AbstractUtility.info(e.getMessage());
 		}
-		selection_storedUnder = formFactory
-				.createSelectionElement(TaxonNameBase.class,
-						getConversationHolder(), formElement, "Stored Under",
-						entity.getStoredUnder(), EntitySelectionElement.ALL,
-						style);
+        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);
+            text_exsicatum = formFactory.createTextWithLabelElement(formElement, "Exsiccatum", entity.getExsiccatum(), style);
 		} catch (MethodNotSupportedByDerivedUnitTypeException e) {
 			// we ignore this
-			StoreUtil.info(e.getMessage());
+            AbstractUtility.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_source = (SourceCollectionDetailSection) formFactory
-				.createEntityDetailSection(
-						EntityDetailType.IDENTIFIABLE_SOURCE_COLLECTION,
-						getConversationHolder(), formElement, Section.TWISTIE);
+//		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 = formFactory.createSourceCollectionDetailSection(getConversationHolder(), formElement, ExpandableComposite.TWISTIE);
 		section_source.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
 		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_accessionNumber) {
-			getEntity().setAccessionNumber(text_accessionNumber.getText());
-		} else if (eventSource == text_catalogNumber) {
-			getEntity().setCatalogNumber(text_catalogNumber.getText());
-		} else if (eventSource == combo_preservationMethod) {
-			try {
-				getEntity().setPreservationMethod(
-						combo_preservationMethod.getSelection());
-			} catch (MethodNotSupportedByDerivedUnitTypeException e) {
-				StoreUtil
-						.errorDialog(
-								"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) {
-				StoreUtil.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) {
+                AbstractUtility
+                        .errorDialog(
+                                "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) {
+                AbstractUtility.error(this.getClass(), e);
+            }
+        }
+    }
 }