X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/blobdiff_plain/0ed0ef35638570c39d06cd56a8f51f01df0daaea..9677085d08567ca5a55d2db7bf9660ab86cc3ee9:/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/SpecimenTypeDesignation.java

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/SpecimenTypeDesignation.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/SpecimenTypeDesignation.java
index aac0bec685..dac6973057 100644
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/SpecimenTypeDesignation.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/SpecimenTypeDesignation.java
@@ -11,7 +11,6 @@ package eu.etaxonomy.cdm.model.name;
 
 
 import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;
-import eu.etaxonomy.cdm.model.occurrence.Specimen;
 import eu.etaxonomy.cdm.model.reference.ReferenceBase;
 import eu.etaxonomy.cdm.model.common.ReferencedEntityBase;
 import org.apache.log4j.Logger;
@@ -19,26 +18,69 @@ import org.hibernate.annotations.Cascade;
 import org.hibernate.annotations.CascadeType;
 
 import java.util.*;
+
 import javax.persistence.*;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
 
 /**
- * {only for typified names which have the "species" rank or below}
+ * Taxon names which have the a rank "species" or below can only be typified
+ * by specimens. Above the species rank the taxon names are generally typified
+ * by taxon names with lower rank (species for genus and genus for family) but
+ * can also be typified directly by specimens.
+ * 
  * @author m.doering
  * @version 1.0
  * @created 08-Nov-2007 13:06:52
  */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "SpecimenTypeDesignation", propOrder = {
+    "homotypicalGroup",
+    "typeSpecimen",
+    "typeStatus",
+    "typifiedNames"
+})
 @Entity
 public class SpecimenTypeDesignation extends ReferencedEntityBase {
+	
 	static Logger logger = Logger.getLogger(SpecimenTypeDesignation.class);
+	
+	@XmlElement(name = "HomotypicalGroup")
+	@XmlIDREF
+	@XmlSchemaType(name = "IDREF")
 	private HomotypicalGroup homotypicalGroup;
+	
+	@XmlElement(name = "TypeSpecimen")
+//	@XmlIDREF
+//	@XmlSchemaType(name = "IDREF")
 	private DerivedUnitBase typeSpecimen;
+	
+	@XmlElement(name = "TypeStatus")
 	private TypeDesignationStatus typeStatus;
-
-	public SpecimenTypeDesignation(HomotypicalGroup homotypicalGroup,
-			DerivedUnitBase specimen, TypeDesignationStatus status,
-			ReferenceBase citation, String citationMicroReference, String originalNameString) {
+	
+	@XmlElementWrapper(name = "TypifiedNames")
+	@XmlElement(name = "TypifiedName")
+	@XmlIDREF
+	@XmlSchemaType(name = "IDREF")
+	private Set<TaxonNameBase> typifiedNames = new HashSet<TaxonNameBase>();
+	
+	public static SpecimenTypeDesignation NewInstance(DerivedUnitBase specimen, TypeDesignationStatus status,
+			ReferenceBase citation, String citationMicroReference, String originalNameString){
+		SpecimenTypeDesignation specTypeDesig = new SpecimenTypeDesignation(specimen, status, citation, citationMicroReference, originalNameString);
+		return specTypeDesig;
+	}
+	
+	protected SpecimenTypeDesignation(){
+		
+	}
+	
+	private SpecimenTypeDesignation(DerivedUnitBase specimen, TypeDesignationStatus status, ReferenceBase citation, String citationMicroReference, String originalNameString) {
 		super(citation, citationMicroReference, originalNameString);
-		this.setHomotypicalGroup(homotypicalGroup);
 		this.setTypeSpecimen(specimen);
 		this.setTypeStatus(status);
 	}
@@ -49,13 +91,6 @@ public class SpecimenTypeDesignation extends ReferencedEntityBase {
 		return homotypicalGroup;
 	}
 	public void setHomotypicalGroup(HomotypicalGroup newHomotypicalGroup) {
-		if(this.homotypicalGroup == newHomotypicalGroup) return;
-		if (homotypicalGroup != null) { 
-			homotypicalGroup.typeDesignations.remove(this);
-		}
-		if (newHomotypicalGroup!= null) { 
-			newHomotypicalGroup.typeDesignations.add(this);
-		}
 		this.homotypicalGroup = newHomotypicalGroup;		
 	}
 
@@ -77,4 +112,21 @@ public class SpecimenTypeDesignation extends ReferencedEntityBase {
 		this.typeStatus = typeStatus;
 	}
 
+	/**
+	 * @return the typifiedNames
+	 */
+	@ManyToMany
+	public Set<TaxonNameBase> getTypifiedNames() {
+		return typifiedNames;
+	}
+
+	/**
+	 * @param typifiedNames the typifiedNames to set
+	 */
+	public void setTypifiedNames(Set<TaxonNameBase> typifiedNames) {
+		this.typifiedNames = typifiedNames;
+	}
+	
+	
+
 }
\ No newline at end of file