Fix regression with DnD tooltips (#7766)

Change-Id: I74e6c35ef0aa30dbb24301bfb5858cedd0008e71

2 files changed, 11 insertions, 9 deletions

diff --git a/client/src/com/vaadin/client/TooltipInfo.java b/client/src/com/vaadin/client/TooltipInfo.java
index 06940536c8..c1dd5037eb 100644
--- a/client/src/com/vaadin/client/TooltipInfo.java
+++ b/client/src/com/vaadin/client/TooltipInfo.java
@@ -15,6 +15,8 @@
  */
 package com.vaadin.client;
 
+import com.vaadin.shared.util.SharedUtil;
+
 public class TooltipInfo {
 
     private String title;
@@ -79,7 +81,7 @@ public class TooltipInfo {
     }
 
     public boolean equals(TooltipInfo other) {
-        return (other != null && other.title == title
-                && other.errorMessageHtml == errorMessageHtml && other.identifier == identifier);
+        return (other != null && SharedUtil.equals(other.title, title)
+                && SharedUtil.equals(other.errorMessageHtml, errorMessageHtml) && other.identifier == identifier);
     }
 }
diff --git a/client/src/com/vaadin/client/VTooltip.java b/client/src/com/vaadin/client/VTooltip.java
index 4db4477caa..d1a2c395f7 100644
--- a/client/src/com/vaadin/client/VTooltip.java
+++ b/client/src/com/vaadin/client/VTooltip.java
@@ -22,13 +22,13 @@ import com.google.gwt.dom.client.Element;
 import com.google.gwt.dom.client.Style.Display;
 import com.google.gwt.event.dom.client.BlurEvent;
 import com.google.gwt.event.dom.client.BlurHandler;
-import com.google.gwt.event.dom.client.ClickEvent;
-import com.google.gwt.event.dom.client.ClickHandler;
 import com.google.gwt.event.dom.client.DomEvent;
 import com.google.gwt.event.dom.client.FocusEvent;
 import com.google.gwt.event.dom.client.FocusHandler;
 import com.google.gwt.event.dom.client.KeyDownEvent;
 import com.google.gwt.event.dom.client.KeyDownHandler;
+import com.google.gwt.event.dom.client.MouseDownEvent;
+import com.google.gwt.event.dom.client.MouseDownHandler;
 import com.google.gwt.event.dom.client.MouseMoveEvent;
 import com.google.gwt.event.dom.client.MouseMoveHandler;
 import com.google.gwt.user.client.DOM;
@@ -337,7 +337,7 @@ public class VTooltip extends VWindowOverlay {
     }
 
     private class TooltipEventHandler implements MouseMoveHandler,
-            ClickHandler, KeyDownHandler, FocusHandler, BlurHandler {
+            KeyDownHandler, FocusHandler, BlurHandler, MouseDownHandler {
 
         /**
          * Current element hovered
@@ -403,7 +403,7 @@ public class VTooltip extends VWindowOverlay {
         }
 
         @Override
-        public void onClick(ClickEvent event) {
+        public void onMouseDown(MouseDownEvent event) {
             handleHideEvent();
         }
 
@@ -449,9 +449,9 @@ public class VTooltip extends VWindowOverlay {
             // TooltipInfo contains a reference to the parent component that is
             // checked in it's equals-method.
             if (currentElement != null && isTooltipOpen()) {
-                TooltipInfo currentTooltip = getTooltipFor(currentElement);
                 TooltipInfo newTooltip = getTooltipFor(element);
-                if (currentTooltip != null && currentTooltip.equals(newTooltip)) {
+                if (currentTooltipInfo != null
+                        && currentTooltipInfo.equals(newTooltip)) {
                     return;
                 }
             }
@@ -498,7 +498,7 @@ public class VTooltip extends VWindowOverlay {
     public void connectHandlersToWidget(Widget widget) {
         Profiler.enter("VTooltip.connectHandlersToWidget");
         widget.addDomHandler(tooltipEventHandler, MouseMoveEvent.getType());
-        widget.addDomHandler(tooltipEventHandler, ClickEvent.getType());
+        widget.addDomHandler(tooltipEventHandler, MouseDownEvent.getType());
         widget.addDomHandler(tooltipEventHandler, KeyDownEvent.getType());
         widget.addDomHandler(tooltipEventHandler, FocusEvent.getType());
         widget.addDomHandler(tooltipEventHandler, BlurEvent.getType());