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

Conflicts:
	eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteTaxonOperation.java
	eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java
	eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCollectionService.java
	eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
	eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java

diff --cc eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteTaxonOperation.java
index dc969940dff268fcc41b7db946548ce88c243a80,8c51e6668ce76e28b8280aeee42a13a4fdcca6b2..b22c6b6771a45528a47b9628c518a99c4d1a7024
--- 1/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteTaxonOperation.java
--- 2/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteTaxonOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteTaxonOperation.java
@@@ -71,9 -63,9 +71,9 @@@ public class DeleteTaxonOperation exten
                                controller = CdmStore.getCurrentApplicationConfiguration();\r
  \r
                                ITaxonService service = controller.getTaxonService();\r
- 
+ \r
 -\r
                                DeleteResult result =   service.deleteTaxon(element.getUuid(), configurator, classification.getUuid());\r
 +
                                if (result.isError()){\r
                                        MessageDialog.openError(null, "Delete failed", result.toString());\r
                                } else if (!result.getUpdatedObjects().isEmpty()){\r

diff --cc eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java
index 79ac9ccf06ff0942ab6317813f644ab58e7b41f5,3279e09ffa7a8fcd504354cbd89a69d26df2d3cd..de5efa8b4b8e81b3e889adc8f1288dfb88853ce5
--- 1/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java
--- 2/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java
@@@ -949,4 -941,14 +941,13 @@@ public class TransientClassificationSer
      public UpdateResult createHierarchyInClassification(Classification arg1, CreateHierarchyForClassificationConfigurator arg2) {
         return defaultService.createHierarchyInClassification(arg1, arg2);
      }
 -
+ 
+     /* (non-Javadoc)
+      * @see eu.etaxonomy.cdm.api.service.IService#delete(java.util.UUID)
+      */
+     @Override
+     public DeleteResult delete(UUID arg0) {
+         return defaultService.delete(arg0);
+     }
+ 
  }

diff --cc eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCollectionService.java
index bae1a44883429dc2b2dc96912bb5897d9a54450d,fccff4b0e7ff964d02dcf1b3d3104cd763892943..d5e0c3bf280d21e50183c80491e666cba748a65e
--- 1/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCollectionService.java
--- 2/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCollectionService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCollectionService.java
@@@ -712,4 -704,9 +704,10 @@@ public class TransientCollectionServic
                return defaultService.findByIdentifier(clazz, identifier, identifierType, matchmode, includeEntity, pageSize, pageNumber, propertyPaths);
        }
  
++
+       @Override
+       public DeleteResult delete(UUID arg0) {
+               return defaultService.delete(arg0);
+       }
+ 
  }

diff --cc eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
index 76eea8fcbd4003e81e455547acc038214ae057df,e3c0935ac2337e2ec89c3e662cedb109038aaaf3..2b3ed25f71a3101929d9118b4b0bb161711a0a7d
--- 1/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
--- 2/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,15 -503,13 +503,14 @@@ public class TransientTaxonService impl
          return defaultService.searchTaxaByName(name, sec);
      }
  
+ 
      /**
-      * @param synonym
-      * @param acceptedTaxon
-      * @return
-      * @see eu.etaxonomy.cdm.api.service.ITaxonService#swapSynonymAndAcceptedTaxon(eu.etaxonomy.cdm.model.taxon.Synonym, eu.etaxonomy.cdm.model.taxon.Taxon)
+      * {@inheritDoc}
       */
      @Override
-     public UpdateResult swapSynonymAndAcceptedTaxon(Synonym synonym, Taxon acceptedTaxon) {
-         return defaultService.swapSynonymAndAcceptedTaxon(synonym, acceptedTaxon);
+     public UpdateResult swapSynonymAndAcceptedTaxon(Synonym arg0, Taxon arg1) {
+         return defaultService.swapSynonymAndAcceptedTaxon(arg0, arg1);
++
      }
  
      /**

diff --cc eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java
index aeffb6d6af502e5fd6d6653bb5826f2279306f14,813701c91f55f4c041d29d407b69d3f6bd54f40e..3643bf5a5e69cb90919eec28e5b1f14fee1e765a
--- 1/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java
--- 2/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java
@@@ -34,9 -32,9 +34,15 @@@ import eu.etaxonomy.cdm.api.conversatio
  import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
  import eu.etaxonomy.cdm.api.service.IClassificationService;
  import eu.etaxonomy.cdm.model.common.CdmBase;
++<<<<<<< HEAD
 +import eu.etaxonomy.cdm.model.taxon.Classification;
 +import eu.etaxonomy.cdm.model.taxon.TaxonNaturalComparator;
 +import eu.etaxonomy.cdm.model.taxon.TaxonNode;
++=======
+ 
+ import eu.etaxonomy.cdm.model.taxon.TaxonNaturalComparator;
+ import eu.etaxonomy.cdm.model.taxon.TaxonNodeComparator;
++>>>>>>> ea8a5aa23f73340312c1d094997e7f87c3b82fc6
  import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
  import eu.etaxonomy.taxeditor.model.DataChangeBridge;
  import eu.etaxonomy.taxeditor.model.IDataChangeBehavior;