From 98c7c2f184f20ad715aae0e1ea896fd4227c8a62 Mon Sep 17 00:00:00 2001 From: "U-BGBM\\k.luther" Date: Thu, 3 Sep 2015 12:35:48 +0200 Subject: [PATCH 1/1] moving taxonnode with drag & drop as predecessor fixed --- .../taxeditor/navigation/navigator/TreeNodeDropAdapter.java | 3 ++- .../navigation/navigator/TreeNodeDropAdapterAssistant.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TreeNodeDropAdapter.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TreeNodeDropAdapter.java index 2dd550d23..e0f8a0566 100644 --- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TreeNodeDropAdapter.java +++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TreeNodeDropAdapter.java @@ -235,9 +235,10 @@ public class TreeNodeDropAdapter extends ViewerDropAdapter implements IPostOpera logger.error("Workspace undo context is null. DND operation cancelled"); return false; } + TaxonNode targetNode = (TaxonNode) targetITaxonTreeNode; AbstractPostOperation operation = new MoveTaxonOperation - ("Move Taxon", workspaceUndoContext, uuids, targetITaxonTreeNode, this, taxonNavigator, false); + ("Move Taxon", workspaceUndoContext, uuids, targetNode.getParent(), this, taxonNavigator, false); NavigationUtil.executeOperation(operation); logger.info("Moved taxa to new parent " + targetITaxonTreeNode); 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 cca66d57c..289d9d1b9 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 @@ -225,9 +225,9 @@ public class TreeNodeDropAdapterAssistant extends CommonDropAdapterAssistant imp logger.error("Workspace undo context is null. DND operation cancelled"); return Status.CANCEL_STATUS; } - + TaxonNode targetNode = (TaxonNode) targetITaxonTreeNode; AbstractPostOperation operation = new MoveTaxonOperation - ("Move Taxon", workspaceUndoContext, uuids, targetITaxonTreeNode, this, taxonNavigator, false); + ("Move Taxon", workspaceUndoContext, uuids, targetNode.getParent(), this, taxonNavigator, false); NavigationUtil.executeOperation(operation); logger.info("Moved taxa to new parent " + targetITaxonTreeNode); -- 2.34.1