X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/blobdiff_plain/ccc940f94cb0041ad904ff3a3ba5fb4e0a802995..98db3bf7c580d59b92cfd65d23b8e5cb2d51eb5d:/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 97207a2ba..000378148 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,4 +1,3 @@
-// $Id$
 /**
  * Copyright (C) 2007 EDIT
  * European Distributed Institute of Taxonomy
@@ -10,22 +9,21 @@
 
 package eu.etaxonomy.taxeditor.ui.section.occurrence;
 
-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.cdm.model.name.TaxonName;
 import eu.etaxonomy.cdm.model.occurrence.PreservationMethod;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
+import eu.etaxonomy.cdm.model.term.TermType;
 import eu.etaxonomy.taxeditor.model.MessagingUtils;
 import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
 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;
+import eu.etaxonomy.taxeditor.ui.element.OriginalLabelDataElement;
 import eu.etaxonomy.taxeditor.ui.element.TextWithLabelElement;
-import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
 import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
 
 /**
@@ -38,9 +36,7 @@ import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
  * @version 1.0
  */
 public class DerivedUnitBaseDetailElement extends
-		AbstractCdmDetailElement<DerivedUnitFacade> {
-
-    private TextWithLabelElement textOriginalLabelData;
+		AbstractSpecimenOrObservationDetailElement {
 
 	private TextWithLabelElement text_derivedUnitDefinitions;
 
@@ -48,7 +44,7 @@ public class DerivedUnitBaseDetailElement extends
 
 	private TextWithLabelElement text_catalogNumber;
 
-	private EntitySelectionElement<TaxonNameBase> selection_storedUnder;
+	private EntitySelectionElement<TaxonName> selection_storedUnder;
 
 	private TextWithLabelElement text_exsicatum;
 
@@ -58,6 +54,10 @@ public class DerivedUnitBaseDetailElement extends
 
 	private SourceCollectionDetailSection section_source;
 
+    private OriginalLabelDataElement textOriginalLabel;
+
+
+
 	/**
 	 * <p>
 	 * Constructor for DerivedUnitBaseDetailElement.
@@ -84,9 +84,6 @@ 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);
 
@@ -98,7 +95,8 @@ public class DerivedUnitBaseDetailElement extends
 			// we ignore this
             MessagingUtils.info(e.getMessage());
 		}
-        selection_storedUnder = formFactory.createSelectionElement(TaxonNameBase.class, getConversationHolder(), formElement, "Stored Under", entity.getStoredUnder(), EntitySelectionElement.ALL, style);
+        selection_storedUnder = formFactory.createSelectionElement(TaxonName.class, //getConversationHolder(),
+                formElement, "Stored Under", entity.getStoredUnder(), EntitySelectionElement.ALL, style);
 
 		try {
             text_exsicatum = formFactory.createTextWithLabelElement(formElement, "Exsiccatum", entity.getExsiccatum(), style);
@@ -115,14 +113,22 @@ public class DerivedUnitBaseDetailElement extends
 //				.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
 //		section_duplicates.setEntity(entity);
 
-        section_source = formFactory.createSourceCollectionDetailSection(getConversationHolder(), formElement, ExpandableComposite.TWISTIE);
+		textOriginalLabel = formFactory.createOriginalLabelDataElement(formElement);
+		textOriginalLabel.setEntity(getEntity());
+
+		super.createControls(formElement, entity, style);
+
+        section_source = formFactory.createSourceCollectionDetailSection(getConversationHolder(), formElement, StoreUtil.getSectionStyle(SourceCollectionDetailSection.class, entity.getClass().getCanonicalName()));
 		section_source.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
 		section_source.setEntity(entity);
+
+
 	}
 
     /** {@inheritDoc} */
     @Override
     public void handleEvent(Object eventSource) {
+    	super.handleEvent(eventSource);
         if (eventSource == text_derivedUnitDefinitions) {
             getEntity().addDerivedUnitDefinition(text_derivedUnitDefinitions.getText(), CdmStore.getDefaultLanguage());
         } else if (eventSource == text_barcode) {