From a9f295ddf04c90888d30279f3f8e48caa5d3957c Mon Sep 17 00:00:00 2001 From: Katja Luther Date: Thu, 12 Mar 2015 11:47:03 +0000 Subject: [PATCH] --- .../navigator/TreeNodeDropAdapterAssistant.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TreeNodeDropAdapterAssistant.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TreeNodeDropAdapterAssistant.java index d78128c6e..a8828cbc7 100644 --- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TreeNodeDropAdapterAssistant.java +++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TreeNodeDropAdapterAssistant.java @@ -25,6 +25,7 @@ import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.TreeSelection; import org.eclipse.swt.dnd.DropTargetEvent; import org.eclipse.swt.dnd.TransferData; +import org.eclipse.ui.handlers.HandlerUtil; import org.eclipse.ui.navigator.CommonDropAdapter; import org.eclipse.ui.navigator.CommonDropAdapterAssistant; @@ -66,7 +67,13 @@ public class TreeNodeDropAdapterAssistant extends CommonDropAdapterAssistant imp Set taxonNodes = getSelectedTaxa(); ITaxonTreeNode targetTreeNode = (ITaxonTreeNode) target; if(taxonNodes != null) { - return moveTaxon(taxonNodes, targetTreeNode); + if (taxonNodes.size() == 1){ + return moveTaxon(taxonNodes.iterator().next(), targetTreeNode); + } else{ + if( MessageDialog.openConfirm(null, "Moving taxon", "The operation move accepted taxon to other parent is available only for a single taxon.")){ + return null; + } + } } } @@ -150,7 +157,7 @@ public class TreeNodeDropAdapterAssistant extends CommonDropAdapterAssistant imp * @param parentTaxon * @return */ - private IStatus moveTaxon(Set taxonNodes, ITaxonTreeNode targetITaxonTreeNode) { + private IStatus moveTaxon(TaxonNode taxonNode, ITaxonTreeNode targetITaxonTreeNode) { TaxonNavigator taxonNavigator; taxonNavigator = (TaxonNavigator) NavigationUtil.showView(TaxonNavigator.ID); @@ -194,9 +201,9 @@ public class TreeNodeDropAdapterAssistant extends CommonDropAdapterAssistant imp } AbstractPostOperation operation = new MoveTaxonOperation - ("Move Taxon", workspaceUndoContext, taxonNodes, targetITaxonTreeNode, this, taxonNavigator); + ("Move Taxon", workspaceUndoContext, taxonNode, targetITaxonTreeNode, this, taxonNavigator); NavigationUtil.executeOperation(operation); - + logger.info("Moved taxa to new parent " + targetITaxonTreeNode); return Status.OK_STATUS; } -- 2.34.1