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

[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 e9803317c41e950705fb06318d69b833081b8be8..66d18dee7686e3288fee1dba2a4d4fe7c621516b 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
@@ -1107,6 +1107,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,52 +1120,47 @@ public class TransientDescriptionService implements IDescriptionService {
            return defaultService.pageNamedAreasInUse(includeAllParents, pageSize, pageNumber);
        }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public DeleteResult delete(UUID arg0) {
-        return defaultService.delete(arg0);
-    }
 
-    /**
-     * {@inheritDoc}
+    /* (non-Javadoc)
+     * @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID)
      */
     @Override
-    public DeleteResult deleteDescription(DescriptionBase arg0) {
-        return defaultService.deleteDescription(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(UUID 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 UUID deleteDescriptionElement(UUID arg0) {
-        return defaultService.deleteDescriptionElement(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 UpdateResult moveTaxonDescriptions(Taxon arg0, Taxon arg1) {
-        return defaultService.moveTaxonDescriptions(arg0, arg1);
+    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(UUID arg0, UUID arg1) {
-        return defaultService.moveTaxonDescriptions(arg0, arg1);
+    public UpdateResult moveTaxonDescriptions(UUID sourceTaxonUuid, UUID targetTaxonUuid) {
+        return defaultService.moveTaxonDescriptions(sourceTaxonUuid, targetTaxonUuid);
+
     }
 
     /* (non-Javadoc)
@@ -1170,4 +1170,5 @@ public class TransientDescriptionService implements IDescriptionService {
     public DeleteResult delete(Collection<UUID> arg0) {
         return defaultService.delete(arg0);
     }
+
 }