final implementation of MaterialOrMethodEvent, Cloning, PreservationMethod, ... ...

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

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/SingleRead.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/SingleRead.java
index f20042076c56c962901605d1c5993c214dc87fbc..7a49e2b6e5a844cb28eec397adb2dea5205792f4 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/SingleRead.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/SingleRead.java
@@ -28,9 +28,9 @@ import org.hibernate.envers.Audited;
 \r
 import eu.etaxonomy.cdm.model.agent.AgentBase;\r
 import eu.etaxonomy.cdm.model.common.EventBase;\r
-import eu.etaxonomy.cdm.model.common.MaterialAndMethod;\r
 import eu.etaxonomy.cdm.model.common.TimePeriod;\r
 import eu.etaxonomy.cdm.model.media.Media;\r
+import eu.etaxonomy.cdm.model.occurrence.MaterialOrMethodEvent;\r
 \r
 /**\r
  * Instances of this the {@link SingleRead} class describe the process and the result of a single\r
@@ -55,7 +55,7 @@ import eu.etaxonomy.cdm.model.media.Media;
        "primer",\r
        "direction",\r
        "pherogram",\r
-       "materialAndMethod"\r
+       "materialOrMethod"\r
 })\r
 @XmlRootElement(name = "Primer")\r
 @Entity\r
@@ -97,11 +97,11 @@ public class SingleRead extends EventBase implements Cloneable{
        )\r
        private SequenceDirection direction;\r
        \r
-       @XmlElement(name = "MaterialAndMethod")\r
+       @XmlElement(name = "MaterialOrMethod")\r
     @XmlIDREF\r
     @XmlSchemaType(name = "IDREF")\r
     @ManyToOne(fetch = FetchType.LAZY)\r
-       private MaterialAndMethod materialAndMethod;\r
+       private MaterialOrMethodEvent materialOrMethod;\r
        \r
        \r
        // ******************** FACTORY METHOD ******************/      \r
@@ -198,15 +198,15 @@ public class SingleRead extends EventBase implements Cloneable{
        /**\r
         * The material and/or method used for this sequencing.\r
         */\r
-       public MaterialAndMethod getMaterialAndMethod() {\r
-               return materialAndMethod;\r
+       public MaterialOrMethodEvent getMaterialOrMethod() {\r
+               return materialOrMethod;\r
        }\r
 \r
        /**\r
-        * @see #getMaterialAndMethod()\r
+        * @see #getMaterialOrMethod()\r
         */\r
-       public void setMaterialAndMethod(MaterialAndMethod materialAndMethod) {\r
-               this.materialAndMethod = materialAndMethod;\r
+       public void setMaterialOrMethod(MaterialOrMethodEvent materialOrMethod) {\r
+               this.materialOrMethod = materialOrMethod;\r
        }\r
 \r
        \r