From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Mon, 15 Mar 2010 16:23:26 +0000 (+0000)
Subject: force emphasis style names to be cleaned
X-Git-Tag: 6.7.0.beta1~1926
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2680e9e39f52823802148ce9bf8e13e2f650be98;p=vaadin-framework.git

force emphasis style names to be cleaned

svn changeset:11889/svn branch:6.3
---

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTree.java b/src/com/vaadin/terminal/gwt/client/ui/VTree.java
index b5a1a7013e..c545e37c63 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VTree.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VTree.java
@@ -216,12 +216,10 @@ public class VTree extends FlowPanel implements Paintable, VHasDropHandler {
                                 "Change in Transferable " + currentMouseOverKey
                                         + " " + detail);
                         final String newKey = currentMouseOverKey;
-                        if (oldIdOver != null
-                                && oldIdOver != currentMouseOverKey) {
-                            TreeNode treeNode = keyToNode.get(oldIdOver);
-                            if (treeNode != null) {
-                                treeNode.emphasis(null);
-                            }
+                        TreeNode treeNode = keyToNode.get(oldIdOver);
+                        if (treeNode != null) {
+                        	// clear old styles
+                            treeNode.emphasis(null);
                         }
                         validate(new VAcceptCallback() {
                             public void accepted(VDragEvent event) {
@@ -271,8 +269,9 @@ public class VTree extends FlowPanel implements Paintable, VHasDropHandler {
         if (treeNode == null) {
             return null;
         }
-        VerticalDropLocation verticalDropLocation = DDUtil.getVerticalDropLocation(
-                treeNode.nodeCaptionDiv, event.getClientY(), 0.2);
+        VerticalDropLocation verticalDropLocation = DDUtil
+                .getVerticalDropLocation(treeNode.nodeCaptionDiv, event
+                        .getClientY(), 0.2);
         return verticalDropLocation;
     }