X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/blobdiff_plain/bb7cf1c5559896c0ab131e63415e0455245f610f..2e032176b9d210a6d313b218be9f0f8ba329143d:/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 546e2bf03a..4bee6d613e 100644 --- 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 @@ */ package eu.etaxonomy.cdm.model.molecular; +import java.io.Serializable; + import javax.persistence.Entity; import javax.persistence.FetchType; import javax.persistence.Lob; -import javax.persistence.ManyToOne; +import javax.persistence.OneToOne; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; @@ -39,14 +41,14 @@ import eu.etaxonomy.cdm.model.common.VersionableEntity; @XmlRootElement(name = "SingleReadAlignment") @Entity @Audited -public class SingleReadAlignment extends VersionableEntity { +public class SingleReadAlignment extends VersionableEntity implements Serializable { private static final long serialVersionUID = 6141518347067279304L; /** @see #getDnaMarker() */ @XmlElement(name = "ConsensusAlignment") @XmlIDREF @XmlSchemaType(name = "IDREF") - @ManyToOne(fetch = FetchType.LAZY) + @OneToOne(fetch = FetchType.LAZY) //for now we do not cascade but expect the user to save the sequence manually private Sequence consensusAlignment; @@ -54,7 +56,7 @@ public class SingleReadAlignment extends VersionableEntity { @XmlElement(name = "SingleRead") @XmlIDREF @XmlSchemaType(name = "IDREF") - @ManyToOne(fetch = FetchType.LAZY) + @OneToOne(fetch = FetchType.LAZY) @Cascade({CascadeType.SAVE_UPDATE, CascadeType.MERGE}) private SingleRead singleRead; @@ -76,7 +78,7 @@ public class SingleReadAlignment extends VersionableEntity { private boolean reverseComplement; - public static class Shift implements Cloneable{ + public static class Shift implements Cloneable, Serializable { public int position; public int shift; @@ -180,11 +182,10 @@ public class SingleReadAlignment extends VersionableEntity { // ******************* CLONE *********************/ - - @Override - public Object clone() throws CloneNotSupportedException { - SingleReadAlignment result = (SingleReadAlignment)super.clone(); + public SingleReadAlignment clone() throws CloneNotSupportedException { + + SingleReadAlignment result = (SingleReadAlignment)super.clone(); //deep copy shifts Shift[] oldShifts = this.getShifts();