ref #6931 Migrate dnd for uses view

[taxeditor.git] / eu.etaxonomy.taxeditor.editor / src / main / java / eu / etaxonomy / taxeditor / editor / view / uses / e4 / UsesViewPartE4.java

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/e4/UsesViewPartE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/e4/UsesViewPartE4.java
index aebaa98183c11d2372be9c07c8010ee57c00f68d..0bdaa83550c9caee8ac0b3cddcd69ac1a0a8b8e8 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/e4/UsesViewPartE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/e4/UsesViewPartE4.java
@@ -20,6 +20,8 @@ import org.eclipse.swt.widgets.Tree;
 
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.taxeditor.editor.l10n.Messages;
+import eu.etaxonomy.taxeditor.editor.view.descriptive.DescriptionElementDragListener;
+import eu.etaxonomy.taxeditor.editor.view.descriptive.DescriptionElementDropAdapter;
 import eu.etaxonomy.taxeditor.editor.view.descriptive.DescriptionElementTransfer;
 import eu.etaxonomy.taxeditor.editor.view.descriptive.e4.FactualDataPartE4;
 import eu.etaxonomy.taxeditor.editor.view.uses.UsesContentProvider;
@@ -49,26 +51,26 @@ public class UsesViewPartE4 extends FactualDataPartE4 {
         treeViewer.setLabelProvider(new UsesLabelProvider());
         treeViewer.setAutoExpandLevel(2);
 
-        viewer = treeViewer;
+        Transfer[] transfers = new Transfer[] { DescriptionElementTransfer.getInstance() };
+        treeViewer.addDragSupport(dndOperations, transfers, new DescriptionElementDragListener(
+                this));
+        treeViewer.addDropSupport(dndOperations, transfers,
+                new DescriptionElementDropAdapter(treeViewer));
 
 
-        //FIXME E4 migrate drag and drop
-        Transfer[] transfers = new Transfer[] { DescriptionElementTransfer.getInstance() };
-//      viewer.addDragSupport(dndOperations, transfers, new DescriptionElementDragListener(
-//              this));
-//      viewer.addDropSupport(dndOperations, transfers,
-//              new DescriptionElementDropAdapter(viewer));
 
         // Propagate selection from viewer
         selectionChangedListener = (event -> selService.setSelection(AbstractUtility.getElementsFromSelectionChangedEvent(event)));
-        viewer.addSelectionChangedListener(selectionChangedListener);
+        treeViewer.addSelectionChangedListener(selectionChangedListener);
 
         //FIXME E4 migrate toggle actions
 //        showAllElementsAction = new ToggleDescriptionAction(false);
 //        hideAllElementsAction = new ToggleDescriptionAction(true);
 
         //create context menu
-        menuService.registerContextMenu(viewer.getControl(), "eu.etaxonomy.taxeditor.editor.popupmenu.usesView");
+        menuService.registerContextMenu(treeViewer.getControl(), "eu.etaxonomy.taxeditor.editor.popupmenu.usesView");
+
+        viewer = treeViewer;
 
         //FIXME E4 implement toolbar
 //        createToolbar();