ref #10322, ref #10472 further remove model objects, use DerivationEvent and some...

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

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/SingleReadAlignment.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/SingleReadAlignment.java
index 546e2bf03a6dac5a1a6c71c51f189fb4571df281..4bee6d613e66d9137d52fc496000e25b1efa4492 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/SingleReadAlignment.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/molecular/SingleReadAlignment.java
@@ -3,10 +3,12 @@
  */\r
 package eu.etaxonomy.cdm.model.molecular;\r
 \r
+import java.io.Serializable;\r
+\r
 import javax.persistence.Entity;\r
 import javax.persistence.FetchType;\r
 import javax.persistence.Lob;\r
-import javax.persistence.ManyToOne;\r
+import javax.persistence.OneToOne;\r
 import javax.xml.bind.annotation.XmlAccessType;\r
 import javax.xml.bind.annotation.XmlAccessorType;\r
 import javax.xml.bind.annotation.XmlElement;\r
@@ -39,14 +41,14 @@ import eu.etaxonomy.cdm.model.common.VersionableEntity;
 @XmlRootElement(name = "SingleReadAlignment")\r
 @Entity\r
 @Audited\r
-public class SingleReadAlignment extends VersionableEntity {\r
+public class SingleReadAlignment extends VersionableEntity implements Serializable {\r
        private static final long serialVersionUID = 6141518347067279304L;\r
 \r
        /** @see #getDnaMarker() */\r
        @XmlElement(name = "ConsensusAlignment")\r
     @XmlIDREF\r
     @XmlSchemaType(name = "IDREF")\r
-    @ManyToOne(fetch = FetchType.LAZY)\r
+    @OneToOne(fetch = FetchType.LAZY)\r
        //for now we do not cascade but expect the user to save the sequence manually\r
        private Sequence consensusAlignment;\r
 \r
@@ -54,7 +56,7 @@ public class SingleReadAlignment extends VersionableEntity {
        @XmlElement(name = "SingleRead")\r
     @XmlIDREF\r
     @XmlSchemaType(name = "IDREF")\r
-    @ManyToOne(fetch = FetchType.LAZY)\r
+    @OneToOne(fetch = FetchType.LAZY)\r
        @Cascade({CascadeType.SAVE_UPDATE, CascadeType.MERGE})\r
        private SingleRead singleRead;\r
 \r
@@ -76,7 +78,7 @@ public class SingleReadAlignment extends VersionableEntity {
     private boolean reverseComplement;\r
 \r
 \r
-       public static class Shift implements Cloneable{\r
+       public static class Shift implements Cloneable, Serializable {\r
                public int position;\r
                public int shift;\r
 \r
@@ -180,11 +182,10 @@ public class SingleReadAlignment extends VersionableEntity {
 \r
 // ******************* CLONE *********************/\r
 \r
-\r
-\r
        @Override\r
-       public Object clone() throws CloneNotSupportedException {\r
-               SingleReadAlignment result = (SingleReadAlignment)super.clone();\r
+       public SingleReadAlignment clone() throws CloneNotSupportedException {\r
+\r
+           SingleReadAlignment result = (SingleReadAlignment)super.clone();\r
 \r
                //deep copy shifts\r
                Shift[] oldShifts = this.getShifts();\r