From: Cherian Mathew <c.mathew@bgbm.org>
Date: Tue, 23 Jun 2015 11:15:53 +0000 (+0200)
Subject: Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0
X-Git-Tag: remoting-3.9.0~141
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/d2fa54b8c7852561989edc7f686d92a6e8971782

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
---

d2fa54b8c7852561989edc7f686d92a6e8971782
diff --cc eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteTaxonOperation.java
index dc969940d,8c51e6668..b22c6b677
--- a/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();
  
  				ITaxonService service = controller.getTaxonService();
- 
+ 
 -
  				DeleteResult result =	service.deleteTaxon(element.getUuid(), configurator, classification.getUuid());
 +
  				if (result.isError()){
  					MessageDialog.openError(null, "Delete failed", result.toString());
  				} else if (!result.getUpdatedObjects().isEmpty()){
diff --cc eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java
index 79ac9ccf0,3279e09ff..de5efa8b4
--- a/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 bae1a4488,fccff4b0e..d5e0c3bf2
--- a/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 76eea8fcb,e3c0935ac..2b3ed25f7
--- 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,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 aeffb6d6a,813701c91..3643bf5a5
--- a/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;