Merge branch 'master' of wp5.e-taxonomy.eu:/var/git/cdmlib into remoting-4.0

[cdmlib.git] / cdmlib-services / src / main / java / eu / etaxonomy / cdm / api / service / NameServiceImpl.java

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/NameServiceImpl.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/NameServiceImpl.java
index 086ba3996ef4eb05d51506f44da5906bf8199b35..b6d22f8a27b373a654b65f9f77f429070a06aebf 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/NameServiceImpl.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/NameServiceImpl.java
@@ -56,7 +56,6 @@ import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.ReferencedEntityBase;\r
 import eu.etaxonomy.cdm.model.common.RelationshipBase;\r
 import eu.etaxonomy.cdm.model.common.RelationshipBase.Direction;\r
-import eu.etaxonomy.cdm.model.common.UuidAndTitleCache;\r
 import eu.etaxonomy.cdm.model.description.DescriptionElementSource;\r
 import eu.etaxonomy.cdm.model.name.HomotypicalGroup;\r
 import eu.etaxonomy.cdm.model.name.HybridRelationship;\r
@@ -80,6 +79,7 @@ import eu.etaxonomy.cdm.persistence.dao.name.IHomotypicalGroupDao;
 import eu.etaxonomy.cdm.persistence.dao.name.INomenclaturalStatusDao;\r
 import eu.etaxonomy.cdm.persistence.dao.name.ITaxonNameDao;\r
 import eu.etaxonomy.cdm.persistence.dao.name.ITypeDesignationDao;\r
+import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;\r
 import eu.etaxonomy.cdm.persistence.query.MatchMode;\r
 import eu.etaxonomy.cdm.persistence.query.OrderHint;\r
 import eu.etaxonomy.cdm.strategy.cache.TaggedText;\r
@@ -160,7 +160,7 @@ public class NameServiceImpl extends IdentifiableServiceBase<TaxonNameBase,ITaxo
             if (homotypicalGroup != null){\r
                 homotypicalGroup.removeTypifiedName(name, false);\r
             }\r
-            \r
+\r
              //all type designation relationships are removed as they belong to the name\r
                deleteTypeDesignation(name, null);\r
        //              //type designations\r
@@ -172,7 +172,7 @@ public class NameServiceImpl extends IdentifiableServiceBase<TaxonNameBase,ITaxo
 \r
                try{\r
                UUID nameUuid = dao.delete(name);\r
-               \r
+\r
                }catch(Exception e){\r
                        result.addException(e);\r
                        result.setError();\r
@@ -853,7 +853,7 @@ public class NameServiceImpl extends IdentifiableServiceBase<TaxonNameBase,ITaxo
 \r
        if (!name.getNameRelations().isEmpty() && !nameConfig.isRemoveAllNameRelationships()){\r
                HomotypicalGroup homotypicalGroup = HibernateProxyHelper.deproxy(name.getHomotypicalGroup(), HomotypicalGroup.class);\r
-               \r
+\r
                if (!nameConfig.isIgnoreIsBasionymFor() && homotypicalGroup.getBasionyms().contains(name)){\r
                                result.addException(new Exception( "Name can't be deleted as it is a basionym."));\r
                                result.setAbort();\r
@@ -944,13 +944,14 @@ public class NameServiceImpl extends IdentifiableServiceBase<TaxonNameBase,ITaxo
         name.setAsGroupsBasionym();\r
         result.addUpdatedObject(name);\r
         return result;\r
+\r
     }\r
 \r
     @Override\r
     public List<HashMap<String,String>> getNameRecords(){\r
-       \r
+\r
                return dao.getNameRecords();\r
-       \r
+\r
     }\r
 \r
 }\r