From: Patric Plitzner Date: Thu, 20 Nov 2014 10:15:47 +0000 (+0000) Subject: - made use of TermType DnaQuality X-Git-Tag: 3.6.0~357 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/b3271304c6e5407f6256368ef924e161ad827ee9 - made use of TermType DnaQuality --- diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/DnaQualityDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/DnaQualityDetailElement.java index 3384b2571..0190431a3 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/DnaQualityDetailElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/DnaQualityDetailElement.java @@ -12,6 +12,7 @@ package eu.etaxonomy.taxeditor.ui.section.occurrence.dna; import org.joda.time.DateTime; import eu.etaxonomy.cdm.model.common.DefinedTerm; +import eu.etaxonomy.cdm.model.common.TermType; import eu.etaxonomy.cdm.model.molecular.DnaQuality; import eu.etaxonomy.cdm.model.molecular.DnaSample; import eu.etaxonomy.taxeditor.ui.combo.TermComboElement; @@ -29,9 +30,6 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; */ public class DnaQualityDetailElement extends AbstractCdmDetailElement { - //TODO: add vocabulary -// private final TermType qualityTermVocabulary = CdmStore.getService(IVocabularyService.class).find(VocabularyEnum.DnaQualityTerm.getUuid()); - private TextWithLabelElement textPurificationMethod; private NumberWithLabelElement numberRatioOfAbsorbance260_280; private NumberWithLabelElement numberRatioOfAbsorbance260_230; @@ -64,14 +62,13 @@ public class DnaQualityDetailElement extends AbstractCdmDetailElement Double ratioOfAbsorbance260_230 = dnaQuality.getRatioOfAbsorbance260_230(); Double ratioOfAbsorbance260_280 = dnaQuality.getRatioOfAbsorbance260_280(); Double concentration = dnaQuality.getConcentration(); - //TODO quality term DefinedTerm qualityTerm = dnaQuality.getQualityTerm(); textPurificationMethod = formFactory.createTextWithLabelElement(formElement, "DNA Purification Details", dnaQuality.getPurificationMethod(), style); numberRatioOfAbsorbance260_280 = formFactory.createNumberTextWithLabelElement(formElement, "Ratio of absorbance 260-280", ratioOfAbsorbance260_280, style); numberRatioOfAbsorbance260_230 = formFactory.createNumberTextWithLabelElement(formElement, "Ratio of absorbance 260-230", ratioOfAbsorbance260_230, style); numberConcentration = formFactory.createNumberTextWithLabelElement(formElement, "Concentration", concentration, style); -// comboQualityTerm = formFactory.createDefinedTermComboElement(qualityTermVocabulary, formElement, "Quality Term", qualityTerm, style); + comboQualityTerm = formFactory.createDefinedTermComboElement(TermType.DnaQuality, formElement, "Quality Term", qualityTerm, style); dateQualityCheck = formFactory.createDateElement(formElement, "Quality Check", dnaQuality.getQualityCheckDate(), style); }