minor

[cdmlib.git] / cdmlib-model / src / main / java / eu / etaxonomy / cdm / model / agent / Contact.java

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/Contact.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/Contact.java
index 8f756415f9b0d9ae1f926c70a080d53471ae4fae..7e521a53c71364cc3adec65328b426bfefae8cd3 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/Contact.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/Contact.java
@@ -35,7 +35,7 @@ import org.hibernate.annotations.CascadeType;
 import org.hibernate.envers.Audited;
 
 import eu.etaxonomy.cdm.model.location.Point;
-import eu.etaxonomy.cdm.model.location.WaterbodyOrCountry;
+import eu.etaxonomy.cdm.model.location.Country;
 import eu.etaxonomy.cdm.strategy.merge.MergeException;
 
 /**
@@ -88,7 +88,7 @@ public class Contact implements Serializable, Cloneable {
         * @return
         */
        public static Contact NewInstance(String street, String postcode, String locality,
-                       WaterbodyOrCountry country, String pobox, String region,
+                       Country country, String pobox, String region,
                        String email, String faxNumber, String phoneNumber, String url, Point location) {
                Contact result = new Contact();
                if (country != null || StringUtils.isNotBlank(locality) || StringUtils.isNotBlank(pobox) || StringUtils.isNotBlank(postcode) ||
@@ -167,8 +167,8 @@ public class Contact implements Serializable, Cloneable {
 
     @XmlElementWrapper(name = "Addresses", nillable = true)
     @XmlElement(name = "Address")
-    @OneToMany(fetch = FetchType.LAZY)
-       @Cascade({CascadeType.SAVE_UPDATE, CascadeType.MERGE, CascadeType.DELETE_ORPHAN})
+    @OneToMany(fetch = FetchType.LAZY, orphanRemoval=true)
+       @Cascade({CascadeType.SAVE_UPDATE, CascadeType.MERGE})
        protected Set<Address> addresses;
 
 
@@ -226,7 +226,7 @@ public class Contact implements Serializable, Cloneable {
        }
 
        public void addAddress(String street, String postcode, String locality,
-                       WaterbodyOrCountry country, String pobox, String region, Point location){
+                       Country country, String pobox, String region, Point location){
                Address newAddress = Address.NewInstance(country, locality, pobox, postcode, region, street, location);
                getAddresses().add(newAddress);
        }