merge-update from trunk

[taxeditor.git] / eu.etaxonomy.taxeditor.editor / src / main / java / eu / etaxonomy / taxeditor / editor / view / descriptive / operation / MoveDescriptionToOtherTaxonOperation.java

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 d4eaf56fe115c0edeff600af6f580177bc0f79d1..8ab3fe60b5235e890a0223edc1650b4aa5361ad5 100644 (file)
--- 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
@@ -19,13 +19,10 @@ import org.eclipse.core.runtime.IStatus;
 
 import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
 import eu.etaxonomy.cdm.api.service.IDescriptionService;
-import eu.etaxonomy.cdm.api.service.ITaxonNodeService;
-import eu.etaxonomy.cdm.api.service.exception.DataChangeNoRollbackException;
 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.Synonym;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;
 import eu.etaxonomy.taxeditor.operation.AbstractPersistentPostOperation;
@@ -81,12 +78,12 @@ public class MoveDescriptionToOtherTaxonOperation extends
                        if(!StringUtils.isBlank(description.getTitleCache())){
                                separator = " - ";
                        }
-                       description.setTitleCache(description.getTitleCache() + separator + moveMessage);
+                       description.setTitleCache(description.getTitleCache() + separator + moveMessage, true);
                }
-               Annotation annotation = Annotation.NewInstance(moveMessage, Language.DEFAULT());
+               Annotation annotation = Annotation.NewInstance(moveMessage, Language.getDefaultLanguage());
                annotation.setAnnotationType(AnnotationType.TECHNICAL());
                description.addAnnotation(annotation);
-               description.setTaxon(newAcceptedTaxonNode.getTaxon());
+               newAcceptedTaxonNode.getTaxon().addDescription(description);
                CdmStore.getService(IDescriptionService.class).saveOrUpdate(description);       
                monitor.worked(40);