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

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
index a47a4284f73c0a120981b0e26b46d6bb0435314c..2b3ed25f71a3101929d9118b4b0bb161711a0a7d 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
@@ -503,14 +503,14 @@ public class TransientTaxonService implements ITaxonService {
         return defaultService.searchTaxaByName(name, sec);
     }
 
+
     /**
-     * @param synonym
-     * @param acceptedTaxon
-     * @see eu.etaxonomy.cdm.api.service.ITaxonService#swapSynonymAndAcceptedTaxon(eu.etaxonomy.cdm.model.taxon.Synonym, eu.etaxonomy.cdm.model.taxon.Taxon)
+     * {@inheritDoc}
      */
     @Override
-    public void swapSynonymAndAcceptedTaxon(Synonym synonym, Taxon acceptedTaxon) {
-        defaultService.swapSynonymAndAcceptedTaxon(synonym, acceptedTaxon);
+    public UpdateResult swapSynonymAndAcceptedTaxon(Synonym arg0, Taxon arg1) {
+        return defaultService.swapSynonymAndAcceptedTaxon(arg0, arg1);
+
     }
 
     /**
@@ -1340,11 +1340,6 @@ public class TransientTaxonService implements ITaxonService {
         return defaultService.deleteSynonym(arg0, arg1, arg2);
     }
 
-    @Override
-    public DeleteResult deleteTaxon(Taxon arg0, TaxonDeletionConfigurator arg1, Classification arg2) {
-        return defaultService.deleteTaxon(arg0, arg1, arg2);
-    }
-
     @Override
     public List<List<Synonym>> getSynonymsByHomotypicGroup(Taxon taxon, List<String> propertyPaths) {
         return defaultService.getSynonymsByHomotypicGroup(taxon, propertyPaths);
@@ -1430,9 +1425,9 @@ public class TransientTaxonService implements ITaxonService {
     }
 
 
+    /**
+     * {@inheritDoc}
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.cdm.api.service.ITaxonService#swapSynonymAndAcceptedTaxon(java.util.UUID, java.util.UUID)
      */
     @Override
     public UpdateResult swapSynonymAndAcceptedTaxon(UUID synonymUUid, UUID acceptedTaxonUuid) {
@@ -1447,6 +1442,16 @@ public class TransientTaxonService implements ITaxonService {
         return defaultService.deleteTaxon(taxonUuid, config, classificationUuid);
     }
 
+
+       @Override
+       public UpdateResult moveFactualDateToAnotherTaxon(UUID arg0, UUID arg1) {
+               return defaultService.moveFactualDateToAnotherTaxon(arg0, arg1);
+       }
+
+
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public SynonymRelationship moveSynonymToAnotherTaxon(
             SynonymRelationship oldSynonymRelation, UUID newTaxonUUID,