bugfix for Coordinate Parser with whitespaces, Dateparsing, etc.

[cdmlib.git] / cdmlib-model / src / main / java / eu / etaxonomy / cdm / model / common / ReferencedEntityBase.java

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/ReferencedEntityBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/ReferencedEntityBase.java
index cf02c286d96defd57ba6d40b374f824070b5f4bc..0f865b7caf8d1825296066fe7d8a47d367f52408 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/ReferencedEntityBase.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/ReferencedEntityBase.java
@@ -25,7 +25,7 @@ import org.apache.log4j.Logger;
 import org.hibernate.annotations.Cascade;
 import org.hibernate.annotations.CascadeType;
 
-import eu.etaxonomy.cdm.model.reference.ReferenceBase;
+import eu.etaxonomy.cdm.model.reference.Reference;
 
 /**
  * abstract class for all objects that may have a reference
@@ -52,8 +52,8 @@ public abstract class ReferencedEntityBase extends AnnotatableEntity implements
     @XmlIDREF
     @XmlSchemaType(name = "IDREF")
     @ManyToOne(fetch = FetchType.LAZY)
-    @Cascade(CascadeType.SAVE_UPDATE)
-       private ReferenceBase citation;
+    @Cascade({CascadeType.SAVE_UPDATE,CascadeType.MERGE})
+       private Reference citation;
 
     @XmlElement(name = "CitationMicroReference")
        private String citationMicroReference;
@@ -66,7 +66,7 @@ public abstract class ReferencedEntityBase extends AnnotatableEntity implements
        }
 
 
-       public ReferencedEntityBase(ReferenceBase citation, String citationMicroReference,
+       public ReferencedEntityBase(Reference citation, String citationMicroReference,
                        String originalNameString) {
                super();
                this.citationMicroReference = citationMicroReference;
@@ -89,10 +89,10 @@ public abstract class ReferencedEntityBase extends AnnotatableEntity implements
                this.originalNameString = originalNameString;
        }
 
-       public ReferenceBase getCitation(){
+       public Reference getCitation(){
                return this.citation;
        }
-       public void setCitation(ReferenceBase citation) {
+       public void setCitation(Reference citation) {
                this.citation = citation;
        }