dna Quality purification method

[cdmlib.git] / cdmlib-model / src / main / java / eu / etaxonomy / cdm / model / molecular / DnaQuality.java

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/DnaQuality.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/DnaQuality.java
index fa0f29fe815f745b919de314a876f75f99655c4d..efec243b05b6bfce0c1ec0f96f5d1d4b1d427a27 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/DnaQuality.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/DnaQuality.java
@@ -33,10 +33,11 @@ import org.joda.time.DateTime;
 
 import eu.etaxonomy.cdm.hibernate.search.DateTimeBridge;
 import eu.etaxonomy.cdm.jaxb.DateTimeAdapter;
-import eu.etaxonomy.cdm.model.common.DefinedTerm;
+import eu.etaxonomy.cdm.model.common.OrderedTerm;
 import eu.etaxonomy.cdm.model.common.VersionableEntity;
 import eu.etaxonomy.cdm.model.description.MeasurementUnit;
 import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
+import eu.etaxonomy.cdm.model.occurrence.MaterialOrMethodEvent;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;
 
 /**
@@ -77,9 +78,12 @@ public class DnaQuality extends VersionableEntity implements Cloneable {
 // ************** ATTRIBUTES ****************************/
 
     //TODO
-//    @XmlTransient
-//    @Transient
-//    private MaterialOrMethodEvent purificationMethod;
+//     @XmlElement(name = "PurificationMethod")
+//    @XmlIDREF
+//    @XmlSchemaType(name = "IDREF")
+//    @ManyToOne(fetch = FetchType.LAZY)
+//    private MaterialOrMethodEvent purificationMethodTerm;
+       
     private String purificationMethod;
 
 
@@ -89,7 +93,7 @@ public class DnaQuality extends VersionableEntity implements Cloneable {
 
        private Double concentration;
 
-       @XmlElement(name = "Type")
+       @XmlElement(name = "concentrationUnit")
     @XmlIDREF
     @XmlSchemaType(name = "IDREF")
     @ManyToOne(fetch = FetchType.LAZY)
@@ -100,7 +104,7 @@ public class DnaQuality extends VersionableEntity implements Cloneable {
     @XmlIDREF
     @XmlSchemaType(name = "IDREF")
     @ManyToOne(fetch = FetchType.LAZY)
-       private DefinedTerm qualityTerm;
+       private OrderedTerm qualityTerm;
 
     @XmlElement (name = "QualityCheckDate", type= String.class)
     @XmlJavaTypeAdapter(DateTimeAdapter.class)
@@ -171,11 +175,11 @@ public class DnaQuality extends VersionableEntity implements Cloneable {
                this.qualityCheckDate = qualityCheckDate;
        }
 
-       public DefinedTerm getQualityTerm() {
+       public OrderedTerm getQualityTerm() {
                return qualityTerm;
        }
 
-       public void setQualityTerm(DefinedTerm qualityTerm) {
+       public void setQualityTerm(OrderedTerm qualityTerm) {
                this.qualityTerm = qualityTerm;
        }