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 / TransientNameService.java

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java
index ac716302506ce0b871606446ffc8d6adf3122370..f24a603c9f69f2d6af09f5ae3213787b47cca29b 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java
@@ -221,8 +221,8 @@ public class TransientNameService implements INameService {
      * @see eu.etaxonomy.cdm.api.service.INameService#delete(eu.etaxonomy.cdm.model.name.TaxonNameBase, eu.etaxonomy.cdm.api.service.config.NameDeletionConfigurator)
      */
     @Override
-    public DeleteResult delete(TaxonNameBase name, NameDeletionConfigurator config)  {
-        return defaultService.delete(name, config);
+    public DeleteResult delete(UUID nameUuid, NameDeletionConfigurator config)  {
+        return defaultService.delete(nameUuid, config);
     }
 
     /**
@@ -1174,15 +1174,16 @@ public class TransientNameService implements INameService {
        }
 
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID)
+    /**
+     * {@inheritDoc}
      */
     @Override
-    public DeleteResult delete(UUID uuid) {
-        return defaultService.delete(uuid);
+    public DeleteResult delete(UUID arg0) {
+        return defaultService.delete(arg0);
     }
 
 
 
 
+
 }