#5247 Fix duplicate entity issue for new entities by using the new merge service...

[taxeditor.git] / eu.etaxonomy.taxeditor.editor / src / main / java / eu / etaxonomy / taxeditor / editor / view / dataimport / transientServices / TransientDescriptionService.java

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java
index ff2cdc1e3546e29c0cf355cf3e6754a300849089..350d7b9098bbfc93e87e8069f2dc2c79911fdfd4 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java
@@ -732,7 +732,7 @@ public class TransientDescriptionService implements IDescriptionService {
      * @see eu.etaxonomy.cdm.api.service.IService#save(eu.etaxonomy.cdm.model.common.ICdmBase)
      */
     @Override
-    public UUID save(DescriptionBase newInstance) {
+    public DescriptionBase save(DescriptionBase newInstance) {
         return null;
     }
 
@@ -1075,11 +1075,12 @@ public class TransientDescriptionService implements IDescriptionService {
      * @param descriptionElements
      * @param targetDescription
      * @param isPaste
+     * @return
      * @see eu.etaxonomy.cdm.api.service.IDescriptionService#moveDescriptionElementsToDescription(java.util.Collection, eu.etaxonomy.cdm.model.description.DescriptionBase, boolean)
      */
     @Override
-    public void moveDescriptionElementsToDescription(Collection<DescriptionElementBase> descriptionElements, DescriptionBase targetDescription, boolean isPaste) {
-        defaultService.moveDescriptionElementsToDescription(descriptionElements, targetDescription, isPaste);
+    public UpdateResult moveDescriptionElementsToDescription(Collection<DescriptionElementBase> descriptionElements, DescriptionBase targetDescription, boolean isPaste) {
+        return defaultService.moveDescriptionElementsToDescription(descriptionElements, targetDescription, isPaste);
     }
 
     /* (non-Javadoc)
@@ -1107,6 +1108,11 @@ public class TransientDescriptionService implements IDescriptionService {
                return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
        }
 
+       @Override
+       public DeleteResult deleteDescription(DescriptionBase description) {
+               return defaultService.deleteDescription(description);
+       }
+
        /* (non-Javadoc)
         * @see eu.etaxonomy.cdm.api.service.IDescriptionService#pageNamedAreasInUse(boolean, java.lang.Integer, java.lang.Integer)
         */
@@ -1115,51 +1121,87 @@ public class TransientDescriptionService implements IDescriptionService {
            return defaultService.pageNamedAreasInUse(includeAllParents, pageSize, pageNumber);
        }
 
-    /**
-     * {@inheritDoc}
+
+    /* (non-Javadoc)
+     * @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID)
      */
     @Override
-    public DeleteResult delete(UUID arg0) {
-        return defaultService.delete(arg0);
+    public DeleteResult delete(UUID uuid) {
+        return defaultService.deleteDescription(uuid);
     }
 
-    /**
-     * {@inheritDoc}
+
+    /* (non-Javadoc)
+     * @see eu.etaxonomy.cdm.api.service.IDescriptionService#deleteDescription(java.util.UUID)
      */
     @Override
-    public DeleteResult deleteDescription(DescriptionBase arg0) {
-        return defaultService.deleteDescription(arg0);
+    public DeleteResult deleteDescription(UUID uuid) {
+        return defaultService.delete(uuid);
     }
 
-    /**
-     * {@inheritDoc}
+    /* (non-Javadoc)
+     * @see eu.etaxonomy.cdm.api.service.IDescriptionService#deleteDescriptionElement(java.util.UUID)
      */
     @Override
-    public DeleteResult deleteDescription(UUID arg0) {
-        return defaultService.deleteDescription(arg0);
+    public UUID deleteDescriptionElement(UUID uuid) {
+        return defaultService.deleteDescriptionElement(uuid);
     }
 
-    /**
-     * {@inheritDoc}
+    /* (non-Javadoc)
+     * @see eu.etaxonomy.cdm.api.service.IDescriptionService#moveTaxonDescriptions(eu.etaxonomy.cdm.model.taxon.Taxon, eu.etaxonomy.cdm.model.taxon.Taxon)
      */
     @Override
-    public UUID deleteDescriptionElement(UUID arg0) {
-        return defaultService.deleteDescriptionElement(arg0);
+    public UpdateResult moveTaxonDescriptions(Taxon sourceTaxon, Taxon targetTaxon) {
+        return defaultService.moveTaxonDescriptions(sourceTaxon, targetTaxon);
     }
 
-    /**
-     * {@inheritDoc}
+    /* (non-Javadoc)
+     * @see eu.etaxonomy.cdm.api.service.IDescriptionService#moveTaxonDescriptions(java.util.UUID, java.util.UUID)
      */
     @Override
-    public UpdateResult moveTaxonDescriptions(Taxon arg0, Taxon arg1) {
-        return defaultService.moveTaxonDescriptions(arg0, arg1);
+    public UpdateResult moveTaxonDescriptions(UUID sourceTaxonUuid, UUID targetTaxonUuid) {
+        return defaultService.moveTaxonDescriptions(sourceTaxonUuid, targetTaxonUuid);
+
     }
 
-    /**
-     * {@inheritDoc}
+    /* (non-Javadoc)
+     * @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.Collection)
+     */
+    @Override
+    public DeleteResult delete(Collection<UUID> arg0) {
+        return defaultService.delete(arg0);
+    }
+
+    /* (non-Javadoc)
+     * @see eu.etaxonomy.cdm.api.service.IService#merge(java.util.List)
      */
     @Override
-    public UpdateResult moveTaxonDescriptions(UUID arg0, UUID arg1) {
-        return defaultService.moveTaxonDescriptions(arg0, arg1);
+    public List<DescriptionBase> merge(List<DescriptionBase> arg0) {
+        return defaultService.merge(arg0);
     }
+
+    /* (non-Javadoc)
+     * @see eu.etaxonomy.cdm.api.service.IDescriptionService#moveDescriptionElementsToDescription(java.util.Set, java.util.UUID, boolean)
+     */
+    @Override
+    public UpdateResult moveDescriptionElementsToDescription(Set<UUID> arg0, UUID arg1, boolean arg2) {
+        return defaultService.moveDescriptionElementsToDescription(arg0, arg1, arg2);
+    }
+
+    /* (non-Javadoc)
+     * @see eu.etaxonomy.cdm.api.service.IDescriptionService#moveDescriptionElementsToDescription(java.util.Set, java.util.UUID, java.lang.String, boolean)
+     */
+    @Override
+    public UpdateResult moveDescriptionElementsToDescription(Set<UUID> arg0, UUID arg1, String arg2, boolean arg3) {
+        return defaultService.moveDescriptionElementsToDescription(arg0, arg1, arg2, arg3);
+    }
+
+    /* (non-Javadoc)
+     * @see eu.etaxonomy.cdm.api.service.IService#merge(eu.etaxonomy.cdm.model.common.ICdmBase, boolean)
+     */
+    @Override
+    public DescriptionBase merge(DescriptionBase arg0, boolean arg1) {
+        return defaultService.merge(arg0, arg1);
+    }
+
 }