From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Tue, 2 Feb 2010 16:48:29 +0000 (+0000)
Subject: fixed typo affecting extra enter events
X-Git-Tag: 6.7.0.beta1~1988^2~29
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=08b9c2704ec86fc7f2f05dba057debe06d2e4334;p=vaadin-framework.git

fixed typo affecting extra enter events

svn changeset:11113/svn branch:6.3_dd
---

diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VDragAndDropManager.java b/src/com/vaadin/terminal/gwt/client/ui/dd/VDragAndDropManager.java
index 59e6067fd2..5347677fa4 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/dd/VDragAndDropManager.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/dd/VDragAndDropManager.java
@@ -69,8 +69,8 @@ public class VDragAndDropManager {
                         // pretty much all events are mousemove althout below
                         // kind of happens mouseover
                         switch (typeInt) {
-                        case Event.ONMOUSEOUT:
                         case Event.ONMOUSEOVER:
+                        case Event.ONMOUSEOUT:
                             ApplicationConnection
                                     .getConsole()
                                     .log(
@@ -102,6 +102,9 @@ public class VDragAndDropManager {
                         default:
                             // just update element over and let the actual
                             // handling code do the thing
+                            ApplicationConnection.getConsole().log(
+                                    "Target just modified on "
+                                            + event.getType());
                             currentDrag
                                     .setElementOver((com.google.gwt.user.client.Element) targetElement);
                             break;
@@ -122,7 +125,11 @@ public class VDragAndDropManager {
                 ApplicationConnection.getConsole().log(
                         event.getNativeEvent().getType());
                 VDropHandler target = findDragTarget(targetElement);
-                if (target != null && target != currentDrag) {
+
+                if (target != null && target != currentDropHandler) {
+                    if (currentDropHandler != null) {
+                        currentDropHandler.dragLeave(currentDrag);
+                    }
                     currentDropHandler = target;
                     target.dragEnter(currentDrag);
                 } else if (target == null && currentDropHandler != null) {