From 4537c26d0f76d2e6e74695bc8ed66ad51d24bd59 Mon Sep 17 00:00:00 2001 From: "U-BGBM\\k.luther" Date: Wed, 30 Sep 2015 13:00:06 +0200 Subject: [PATCH] move descriptions in a service call --- .../TransientDescriptionService.java | 9 +++++++++ .../MoveDescriptionToOtherTaxonOperation.java | 11 ++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java index 350d7b909..52f3d9ff0 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java @@ -1204,4 +1204,13 @@ public class TransientDescriptionService implements IDescriptionService { return defaultService.merge(arg0, arg1); } + /* (non-Javadoc) + * @see eu.etaxonomy.cdm.api.service.IDescriptionService#moveTaxonDescription(java.util.UUID, java.util.UUID) + */ + @Override + public UpdateResult moveTaxonDescription(UUID descriptionUuid, UUID targetTaxonUuid) { + + return defaultService.moveTaxonDescription(descriptionUuid, targetTaxonUuid); + } + } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/MoveDescriptionToOtherTaxonOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/MoveDescriptionToOtherTaxonOperation.java index aeac3d41e..0c9d862f7 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/MoveDescriptionToOtherTaxonOperation.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/MoveDescriptionToOtherTaxonOperation.java @@ -10,7 +10,6 @@ package eu.etaxonomy.taxeditor.editor.view.descriptive.operation; -import org.apache.commons.lang.StringUtils; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.commands.operations.IUndoContext; import org.eclipse.core.runtime.IAdaptable; @@ -19,12 +18,8 @@ import org.eclipse.core.runtime.IStatus; import eu.etaxonomy.cdm.api.conversation.IConversationEnabled; import eu.etaxonomy.cdm.api.service.IDescriptionService; -import eu.etaxonomy.cdm.model.common.Annotation; -import eu.etaxonomy.cdm.model.common.AnnotationType; -import eu.etaxonomy.cdm.model.common.Language; import eu.etaxonomy.cdm.model.description.TaxonDescription; import eu.etaxonomy.cdm.model.taxon.TaxonNode; -import eu.etaxonomy.taxeditor.editor.EditorUtil; import eu.etaxonomy.taxeditor.operation.AbstractPersistentPostOperation; import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled; import eu.etaxonomy.taxeditor.session.ICdmEntitySessionEnabled; @@ -77,7 +72,7 @@ public class MoveDescriptionToOtherTaxonOperation extends monitor.worked(20); bind(); - String moveMessage = String.format("Description moved from %s", EditorUtil.getActiveMultiPageTaxonEditor().getTaxon()); + /*String moveMessage = String.format("Description moved from %s", EditorUtil.getActiveMultiPageTaxonEditor().getTaxon()); if(description.isProtectedTitleCache()){ String separator = ""; if(!StringUtils.isBlank(description.getTitleCache())){ @@ -89,7 +84,9 @@ public class MoveDescriptionToOtherTaxonOperation extends annotation.setAnnotationType(AnnotationType.TECHNICAL()); description.addAnnotation(annotation); newAcceptedTaxonNode.getTaxon().addDescription(description); - CdmStore.getService(IDescriptionService.class).merge(description); + CdmStore.getService(IDescriptionService.class).saveOrUpdate(description);*/ + + CdmStore.getService(IDescriptionService.class).moveTaxonDescription(description.getUuid(), newAcceptedTaxonNode.getTaxon().getUuid()); monitor.worked(40); return postExecute(description); -- 2.34.1