Trim code

[taxeditor.git] / eu.etaxonomy.taxeditor.editor / src / main / java / eu / etaxonomy / taxeditor / editor / view / descriptive / handler / MoveDescriptionElementsHandler.java

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/MoveDescriptionElementsHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/MoveDescriptionElementsHandler.java
index 3c1fee4fb25fe4fedafaefdb96797c876f3bb951..6ae90dc0479865b53921c32b5bfcb630dc06ec02 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/MoveDescriptionElementsHandler.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/MoveDescriptionElementsHandler.java
@@ -26,10 +26,7 @@ import org.eclipse.ui.handlers.HandlerUtil;
 
 import eu.etaxonomy.cdm.api.service.IDescriptionService;
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
-import eu.etaxonomy.cdm.model.common.Annotation;
-import eu.etaxonomy.cdm.model.common.AnnotationType;
 import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.description.DescriptionBase;
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
 import eu.etaxonomy.cdm.model.description.TaxonDescription;
@@ -58,9 +55,7 @@ import eu.etaxonomy.taxeditor.ui.dialog.selection.TaxonNodeSelectionDialog;
 public class MoveDescriptionElementsHandler extends AbstractHandler implements IPostOperationEnabled{
        private UUID newAcceptedTaxonNodeUuid;
        private TaxonNameEditor editor;
-       /* (non-Javadoc)
-        * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
-        */
+
        @Override
        public Object execute(ExecutionEvent event) throws ExecutionException {
 
@@ -118,19 +113,15 @@ public class MoveDescriptionElementsHandler extends AbstractHandler implements I
                                return null;
                        }
                        newAcceptedTaxonNodeUuid = newAcceptedTaxonNode.getUuid();
-                       TaxonDescription targetDescription = TaxonDescription.NewInstance(targetTaxon);
+
                        String moveMessage = String.format("Elements moved from %s", EditorUtil.getActiveMultiPageTaxonEditor().getTaxon());
-                       targetDescription.setTitleCache(moveMessage, true);
-                       Annotation annotation = Annotation.NewInstance(moveMessage, Language.getDefaultLanguage());
-                       annotation.setAnnotationType(AnnotationType.TECHNICAL());
-                       targetDescription.addAnnotation(annotation);
 
                        try {
                                AbstractPostOperation operation = new MoveDescriptionElementsOperation(
                                                event.getCommand().getName(), EditorUtil.getUndoContext(),
-                                               targetDescription, elements, false, this);
+                                               targetTaxon.getUuid(), moveMessage, elements, false, this);
 
-                               EditorUtil.executeOperation(operation);
+                               AbstractUtility.executeOperation(operation);
 
                                //CdmStore.getService(ITaxonService.class).saveOrUpdate(targetTaxon);
 
@@ -143,9 +134,6 @@ public class MoveDescriptionElementsHandler extends AbstractHandler implements I
                return null;
        }
 
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.operations.IPostOperationEnabled#postOperation(eu.etaxonomy.cdm.model.common.CdmBase)
-        */
        /** {@inheritDoc} */
        @Override
     public boolean postOperation(CdmBase objectAffectedByOperation) {
@@ -180,7 +168,6 @@ public class MoveDescriptionElementsHandler extends AbstractHandler implements I
 
        @Override
        public boolean onComplete() {
-               // TODO Auto-generated method stub
                return false;
        }