From: Patrick Plitzner
Date: Wed, 1 Jul 2015 07:23:39 +0000 (+0200)
Subject: Map preparation materials to derivation event description
X-Git-Tag: 3.7.0~1^2~27
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/6747184aa0509713e81f420844844df477a755fb
Map preparation materials to derivation event description
---
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/DnaSamplePreparationPreservationDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/DnaSamplePreparationPreservationDetailElement.java
index 7db3cfaaf..f31ad03dc 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/DnaSamplePreparationPreservationDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/DnaSamplePreparationPreservationDetailElement.java
@@ -66,7 +66,9 @@ public class DnaSamplePreparationPreservationDetailElement extends AbstractCdmDe
String materialOrMethodText = null;
if(entity.getPreservation()!=null){
temperature = entity.getPreservation().getTemperature();
- materialOrMethodText = entity.getPreservation().getMaterialMethodText();
+ }
+ if(entity.getDerivedFrom()!=null){
+ materialOrMethodText = entity.getDerivedFrom().getDescription();
}
selectionInstitution = formFactory.createSelectionElement(Institution.class, getConversationHolder(), formElement, "Institution", institution, EntitySelectionElement.ALL, style);
selectionStaff = formFactory.createSelectionElement(AgentBase.class, getConversationHolder(), formElement, "Staff", staff, EntitySelectionElement.ALL, style);
@@ -103,8 +105,8 @@ public class DnaSamplePreparationPreservationDetailElement extends AbstractCdmDe
else if(eventSource==numberPreservationTemperature && numberPreservationTemperature.getText()!=null){
addPreservationMethod().setTemperature(numberPreservationTemperature.getDouble());
}
- else if(eventSource==txtMaterialOrMethods){
- addPreservationMethod().setMaterialMethodText(txtMaterialOrMethods.getText());
+ else if(eventSource==txtMaterialOrMethods && getEntity().getDerivedFrom()!=null){
+ getEntity().getDerivedFrom().setDescription(txtMaterialOrMethods.getText());
}
}