From 63c04b36e0d4195967f9d42c4b55ae8644e1dbf9 Mon Sep 17 00:00:00 2001 From: Katja Luther Date: Thu, 1 Jun 2017 09:33:35 +0200 Subject: [PATCH] adapt changeSynonymToAcceptedTaxonOperation to changed return type of service method --- ...ChangeSynonymToAcceptedTaxonOperation.java | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToAcceptedTaxonOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToAcceptedTaxonOperation.java index 165c1ca54..3b6a0736e 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToAcceptedTaxonOperation.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToAcceptedTaxonOperation.java @@ -19,6 +19,7 @@ import org.eclipse.core.runtime.IStatus; import eu.etaxonomy.cdm.api.conversation.IConversationEnabled; import eu.etaxonomy.cdm.api.service.ITaxonService; +import eu.etaxonomy.cdm.api.service.UpdateResult; import eu.etaxonomy.cdm.api.service.exception.HomotypicalGroupChangeException; import eu.etaxonomy.cdm.model.name.TaxonNameBase; import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode; @@ -84,15 +85,25 @@ public class ChangeSynonymToAcceptedTaxonOperation extends AbstractPersistentPos public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException { + + UpdateResult result; try { - newNode = (TaxonNode) CdmStore.getService(ITaxonService.class).changeSynonymToAcceptedTaxon(synonym.getUuid(), + result = CdmStore.getService(ITaxonService.class).changeSynonymToAcceptedTaxon(synonym.getUuid(), element.getUuid(), parentNode.getUuid(), - true).getCdmEntity(); + true); + if (result.isAbort()){ + + MessagingUtils.warningDialog(Messages.ChangeSynonymToAcceptedTaxonOperation_INCONSISTENT_DATA, getClass(), result.toString()); + return postExecute(null); + } + newNode = (TaxonNode) result.getCdmEntity(); } catch (HomotypicalGroupChangeException e) { - MessagingUtils.warningDialog(Messages.ChangeSynonymToAcceptedTaxonOperation_INCONSISTENT_DATA, getClass(), e.getMessage()); - return postExecute(null); + // TODO Auto-generated catch block + e.printStackTrace(); } + + monitor.worked(20); //newTaxon = (Taxon) CdmStore.getService(ITaxonService.class).merge(newTaxon); //element.removeSynonym(synonym); -- 2.34.1