Merge branch 'release/5.2.0'

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / featuretree / e4 / FeatureNodeDragListener.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/FeatureNodeDragListener.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/FeatureNodeDragListener.java
index 10ddd7fc8114cfcfed9d3991a6afe5f503459901..e479ae99ff01b97930fb114d9328f70ae8509625 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/FeatureNodeDragListener.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/FeatureNodeDragListener.java
@@ -10,14 +10,13 @@ package eu.etaxonomy.taxeditor.featuretree.e4;
 
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.swt.dnd.DND;
 import org.eclipse.swt.dnd.DragSourceAdapter;
 import org.eclipse.swt.dnd.DragSourceEvent;
 
 import eu.etaxonomy.cdm.model.description.FeatureNode;
 import eu.etaxonomy.taxeditor.featuretree.FeatureNodeTransfer;
 
-class FeatureNodeDragListener extends DragSourceAdapter {
+public class FeatureNodeDragListener extends DragSourceAdapter {
 
        private final TreeViewer viewer;
 
@@ -25,37 +24,17 @@ class FeatureNodeDragListener extends DragSourceAdapter {
                this.viewer = viewer;
        }
 
-       /**
-        * Method declared on DragSourceListener
-        */
-       @Override
-       public void dragFinished(DragSourceEvent event) {
-               if (!event.doit) {
-            return;
+    /**
+     * Method declared on DragSourceListener
+     */
+    @Override
+    public void dragSetData(DragSourceEvent event) {
+        IStructuredSelection selection = (IStructuredSelection) viewer.getSelection();
+        FeatureNode[] featureNodes = (FeatureNode[]) selection.toList().toArray(new FeatureNode[selection.size()]);
+        if (FeatureNodeTransfer.getInstance().isSupportedType(event.dataType)) {
+            event.data = featureNodes;
         }
-               // if the featureNode was moved, remove it from the source viewer
-               if (event.detail == DND.DROP_MOVE) {
-                       IStructuredSelection selection = (IStructuredSelection) viewer
-                                       .getSelection();
-                       viewer.remove(selection);
-                       viewer.refresh();
-               }
-       }
-
-       /**
-        * Method declared on DragSourceListener
-        */
-       @Override
-       public void dragSetData(DragSourceEvent event) {
-               IStructuredSelection selection = (IStructuredSelection) viewer
-                               .getSelection();
-               FeatureNode[] featureNodes = (FeatureNode[]) selection.toList()
-                               .toArray(new FeatureNode[selection.size()]);
-               if (FeatureNodeTransfer.getInstance().isSupportedType(
-                               event.dataType)) {
-                       event.data = featureNodes;
-               }
-       }
+    }
 
        /**
         * Method declared on DragSourceListener