From: U-BGBM\k.luther <k.luther@BGBM11732.bgbm.fu-berlin.de>
Date: Wed, 23 Sep 2015 12:29:31 +0000 (+0200)
Subject: merge with local branch
X-Git-Tag: 3.12.0^2~135
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/8de05ed8187d801967847fd9734cff62accbe256

merge with local branch
---

8de05ed8187d801967847fd9734cff62accbe256
diff --cc eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/ChangeAcceptedTaxonToSynonymOperation.java
index d427aba71,9d0ca8872..d06bfba63
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/ChangeAcceptedTaxonToSynonymOperation.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/ChangeAcceptedTaxonToSynonymOperation.java
@@@ -16,10 -16,12 +16,10 @@@ import org.eclipse.core.runtime.IAdapta
  import org.eclipse.core.runtime.IProgressMonitor;
  import org.eclipse.core.runtime.IStatus;
  import org.eclipse.core.runtime.Status;
 -import org.eclipse.jface.dialogs.MessageDialog;
  
  import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
--import eu.etaxonomy.cdm.api.service.DeleteResult;
  import eu.etaxonomy.cdm.api.service.ITaxonNodeService;
+ import eu.etaxonomy.cdm.api.service.UpdateResult;
  import eu.etaxonomy.cdm.api.service.config.TaxonDeletionConfigurator;
  import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
  import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode;
@@@ -72,12 -82,12 +80,14 @@@ public class ChangeAcceptedTaxonToSynon
  
  		monitor.worked(20);
  		bind();
+ 
 -    	Taxon oldTaxon = (Taxon) HibernateProxyHelper.deproxy(((TaxonNode) taxonNode).getTaxon());
 -		try {
 +    	Taxon oldTaxon = HibernateProxyHelper.deproxy(((TaxonNode) taxonNode).getTaxon(), Taxon.class);
 +    	Taxon newAcceptedTaxon = HibernateProxyHelper.deproxy(newAcceptedTaxonNode.getTaxon(), Taxon.class);
  
 +		try {
- 		    DeleteResult result = CdmStore.getService(ITaxonNodeService.class).makeTaxonNodeASynonymOfAnotherTaxonNode((TaxonNode) taxonNode, newAcceptedTaxonNode, null, null, null);
+ 		    UpdateResult result = CdmStore.getService(ITaxonNodeService.class).makeTaxonNodeASynonymOfAnotherTaxonNode(taxonNode.getUuid(), newAcceptedTaxonNode.getUuid(), null, null, null);
 -      
++
 +
  		    if (!result.getExceptions().isEmpty() && result.isOk()){
  		    	String separator = ", ";
  			    String exceptionString = "";