fix #8526: fix problem swap synonym and taxon

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/SwapSynonymAndAcceptedHandlerE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/SwapSynonymAndAcceptedHandlerE4.java
index ba096a52574412a7163d5b24aaf116c866b89916..ec7fbb54e7ccd9434fde21cad8c81cf413c53d7e 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/SwapSynonymAndAcceptedHandlerE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/SwapSynonymAndAcceptedHandlerE4.java
@@ -26,6 +26,7 @@ import org.eclipse.swt.widgets.Shell;
 
 import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
+import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;
 import eu.etaxonomy.taxeditor.editor.l10n.Messages;
 import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditorE4;
@@ -43,12 +44,12 @@ import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
  */
 public class SwapSynonymAndAcceptedHandlerE4 implements IPostOperationEnabled {
 
-    private TaxonNameEditorE4 editor;
-    private Taxon taxon;
-    private EPartService partService;
-    private MPart activePart;
-    private MApplication application;
-    private EModelService modelService;
+    protected TaxonNameEditorE4 editor;
+    protected Taxon taxon;
+    protected EPartService partService;
+    protected MPart activePart;
+    protected MApplication application;
+    protected EModelService modelService;
 
     @Execute
     public void execute(@Named(IServiceConstants.ACTIVE_PART) MPart activePart,
@@ -95,12 +96,14 @@ public class SwapSynonymAndAcceptedHandlerE4 implements IPostOperationEnabled {
         // Redraw existing editor
         // ((IPostOperationEnabled) editor).postOperation(null);
 
-        editor.save(AbstractUtility.getMonitor());
+       // editor.save(AbstractUtility.getMonitor());
         partService.hidePart(activePart);
 
         if (objectAffectedByOperation instanceof Taxon) {
             taxon = (Taxon) objectAffectedByOperation;
         }
+
+
         return true;
     }
 
@@ -111,7 +114,15 @@ public class SwapSynonymAndAcceptedHandlerE4 implements IPostOperationEnabled {
             @Override
             public void run() {
                 try {
-                    EditorUtil.openTaxonBaseE4(taxon.getUuid(), modelService, partService, application);
+                    TaxonNode node;
+                    if (!taxon.getTaxonNodes().isEmpty()) {
+                        node = taxon.getTaxonNodes().iterator().next();
+                    } else {
+                        node = null;
+                    }
+                    if (node != null){
+                        EditorUtil.openTaxonNodeE4((node).getUuid(), modelService, partService, application);
+                    }
                 } catch (Exception e) {
                     MessagingUtils.warningDialog(Messages.SwapSynonymAndAcceptedHandler_COULD_NOT_OPEN, this,
                             e.getMessage());

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/SwapSynonymAndAcceptedSetNameInSourceHandlerE5.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/SwapSynonymAndAcceptedSetNameInSourceHandlerE5.java
index 2cf81a1b4df58da01e1f111aef8c76d95b7dc137..e94aa72f6198ba68ad76f1dd55307ba981c60381 100755 (executable)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/SwapSynonymAndAcceptedSetNameInSourceHandlerE5.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/SwapSynonymAndAcceptedSetNameInSourceHandlerE5.java
@@ -11,7 +11,6 @@ package eu.etaxonomy.taxeditor.editor.name.e4.handler;
 
 import javax.inject.Named;
 
-import org.eclipse.e4.core.di.annotations.CanExecute;
 import org.eclipse.e4.core.di.annotations.Execute;
 import org.eclipse.e4.ui.di.UISynchronize;
 import org.eclipse.e4.ui.model.application.MApplication;
@@ -21,18 +20,13 @@ import org.eclipse.e4.ui.services.IServiceConstants;
 import org.eclipse.e4.ui.workbench.modeling.EModelService;
 import org.eclipse.e4.ui.workbench.modeling.EPartService;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
 
 import eu.etaxonomy.cdm.model.taxon.Synonym;
-import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;
-import eu.etaxonomy.taxeditor.editor.l10n.Messages;
 import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditorE4;
-import eu.etaxonomy.taxeditor.editor.name.handler.NameEditorMenuPropertyTester;
 import eu.etaxonomy.taxeditor.editor.name.operation.SwapSynonymAndAcceptedOperation;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
-import eu.etaxonomy.taxeditor.model.MessagingUtils;
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 
 /**
@@ -41,15 +35,12 @@ import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
  * @since Aug 28, 2017
  *
  */
-public class SwapSynonymAndAcceptedSetNameInSourceHandlerE5 implements IPostOperationEnabled {
+public class SwapSynonymAndAcceptedSetNameInSourceHandlerE5 extends SwapSynonymAndAcceptedHandlerE4 implements IPostOperationEnabled {
 
-    private TaxonNameEditorE4 editor;
-    private Taxon taxon;
-    private EPartService partService;
-    private MPart activePart;
-    private MApplication application;
-    private EModelService modelService;
 
+
+
+    @Override
     @Execute
     public void execute(@Named(IServiceConstants.ACTIVE_PART) MPart activePart,
             @Named(IServiceConstants.ACTIVE_SELECTION) IStructuredSelection selection,
@@ -78,47 +69,5 @@ public class SwapSynonymAndAcceptedSetNameInSourceHandlerE5 implements IPostOper
 
     }
 
-    @CanExecute
-    public boolean canExecute(@Named(IServiceConstants.ACTIVE_SELECTION)IStructuredSelection selection,
-            MHandledMenuItem menuItem){
-        boolean canExecute = false;
-        if(selection.size()==1){
-            Object selectedElement = selection.getFirstElement();
-            canExecute = NameEditorMenuPropertyTester.isSynonym(selectedElement);
-        }
-        menuItem.setVisible(canExecute);
-        return canExecute;
-    }
-
-    @Override
-    public boolean postOperation(Object objectAffectedByOperation) {
-        // Redraw existing editor
-        // ((IPostOperationEnabled) editor).postOperation(null);
 
-        editor.save(AbstractUtility.getMonitor());
-        partService.hidePart(activePart);
-
-        if (objectAffectedByOperation instanceof Taxon) {
-            taxon = (Taxon) objectAffectedByOperation;
-        }
-        return true;
-    }
-
-    @Override
-    public boolean onComplete() {
-        Display display = Display.getCurrent();
-        display.asyncExec(new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    EditorUtil.openTaxonBaseE4(taxon.getUuid(), modelService, partService, application);
-                } catch (Exception e) {
-                    MessagingUtils.warningDialog(Messages.SwapSynonymAndAcceptedHandler_COULD_NOT_OPEN, this,
-                            e.getMessage());
-                }
-
-            }
-        });
-        return true;
-    }
 }

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/SwapSynonymAndAcceptedOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/SwapSynonymAndAcceptedOperation.java
index 3d7f94a350770425cf974f878ed33c38e017c602..0319c8a6fcb591bf3edffa7140c6494a79be4a5d 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/SwapSynonymAndAcceptedOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/SwapSynonymAndAcceptedOperation.java
@@ -9,17 +9,24 @@
 
 package eu.etaxonomy.taxeditor.editor.name.operation;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.commands.operations.IUndoContext;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 
+import eu.etaxonomy.cdm.api.service.ITaxonNodeService;
 import eu.etaxonomy.cdm.api.service.ITaxonService;
 import eu.etaxonomy.cdm.api.service.UpdateResult;
+import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.SynonymType;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
+import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.taxeditor.editor.l10n.Messages;
 import eu.etaxonomy.taxeditor.model.MessagingUtils;
 import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;
@@ -39,6 +46,8 @@ public class SwapSynonymAndAcceptedOperation extends AbstractPostTaxonOperation
        // TODO store the old relationship for undo reasons
        private SynonymType synonymType;
 
+       private List<TaxonNode> nodes;
+
        private boolean setNameInSource;
 
        /**
@@ -56,6 +65,9 @@ public class SwapSynonymAndAcceptedOperation extends AbstractPostTaxonOperation
                super(Messages.SwapSynonymAndAcceptedOperation_SWAP_SYN_ACC_TAXON, undoContext, taxon, postOperationEnabled, cdmEntitySessionEnabled);
                this.setNameInSource = setNameInSource;
                this.synonym = synonym;
+               this.nodes = new ArrayList(taxon.getTaxonNodes());
+
+
        }
 
        /** {@inheritDoc} */
@@ -66,10 +78,27 @@ public class SwapSynonymAndAcceptedOperation extends AbstractPostTaxonOperation
                monitor.worked(20);
 
                UpdateResult result = CdmStore.getService(ITaxonService.class).swapSynonymAndAcceptedTaxon(synonym.getUuid(), element.getUuid(), setNameInSource);//TODO
+               //Taxon taxon = (Taxon)result.getCdmEntity();
+               List<String> propertyPath = new ArrayList<>();
+               propertyPath.add("synonyms");
+               Taxon taxon = (Taxon) CdmStore.getService(ITaxonService.class).load(result.getCdmEntity().getUuid(), propertyPath);
+               List<UUID> nodeUuids = new ArrayList<>();
+               for (TaxonNode node: nodes){
+                   nodeUuids.add(node.getUuid());
+        }
+               //nodes = CdmStore.getService(ITaxonNodeService.class).load(nodeUuids, null);
+               List<TaxonNode> parents = new ArrayList<>();
+               for (TaxonNode node: nodes){
+                   TaxonNode parent = HibernateProxyHelper.deproxy(node.getParent(), TaxonNode.class);
+                   TaxonNode newTaxonNode = parent.addChildTaxon(taxon, null, null);
+                   parents.add(parent);
+                   CdmStore.getService(ITaxonNodeService.class).saveNewTaxonNode(newTaxonNode);
+
+               }
 
                monitor.worked(40);
 
-               return postExecute(element);
+               return postExecute(taxon);
        }
 
        /** {@inheritDoc} */