#8324 Made Label tooltips work again using the old method as it is

likely
the refactored tooltips will not make it into alpha2

diff --git a/src/com/vaadin/terminal/gwt/client/ui/label/VLabel.java b/src/com/vaadin/terminal/gwt/client/ui/label/VLabel.java
index 8828582b5711201398a1c70045ce1a9f41b986b9..3fe3516f1c1ceb79f21933e67abbce76e18239e6 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/label/VLabel.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/label/VLabel.java
@@ -6,6 +6,7 @@ package com.vaadin.terminal.gwt.client.ui.label;
 
 import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.ui.HTML;
+import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.BrowserInfo;
 import com.vaadin.terminal.gwt.client.Util;
 import com.vaadin.terminal.gwt.client.VTooltip;
@@ -17,6 +18,7 @@ public class VLabel extends HTML {
 
     private int verticalPaddingBorder = 0;
     private int horizontalPaddingBorder = 0;
+    private ApplicationConnection connection;
 
     public VLabel() {
         super();
@@ -38,6 +40,9 @@ public class VLabel extends HTML {
             event.stopPropagation();
             return;
         }
+        if (connection != null) {
+            connection.handleWidgetTooltipEvent(event, this);
+        }
     }
 
     @Override
@@ -67,4 +72,8 @@ public class VLabel extends HTML {
             super.setText(text);
         }
     }
+
+    void setConnection(ApplicationConnection client) {
+        connection = client;
+    }
 }

diff --git a/src/com/vaadin/terminal/gwt/client/ui/label/VLabelPaintable.java b/src/com/vaadin/terminal/gwt/client/ui/label/VLabelPaintable.java
index b61eb3eaba1bba13724a841d82fb7c3e76ccd603..5f9679d3cfdd95f13f2511ff26141e012db512e1 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/label/VLabelPaintable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/label/VLabelPaintable.java
@@ -19,6 +19,7 @@ public class VLabelPaintable extends VAbstractPaintableWidget {
     @Override
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
         super.updateFromUIDL(uidl, client);
+        getWidgetForPaintable().setConnection(client);
         if (!isRealUpdate(uidl)) {
             return;
         }