Removed extra "Widget" prefix from ApplicationConnection method names

diff --git a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
index ee6091e925b3e274443e6467a3594289efcd926d..cecfcfd39ab052432de60df308e5bb1b443f7af5 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
+++ b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
@@ -2215,24 +2215,24 @@ public class ApplicationConnection {
     }
 
     @Deprecated
-    public void handleWidgetTooltipEvent(Event event, Widget owner, Object key) {
+    public void handleTooltipEvent(Event event, Widget owner, Object key) {
         handleTooltipEvent(event, getPaintableMap().getPaintable(owner), key);
 
     }
 
     @Deprecated
-    public void handleWidgetTooltipEvent(Event event, Widget owner) {
+    public void handleTooltipEvent(Event event, Widget owner) {
         handleTooltipEvent(event, getPaintableMap().getPaintable(owner));
 
     }
 
     @Deprecated
-    public void registerWidgetTooltip(Widget owner, Object key, TooltipInfo info) {
+    public void registerTooltip(Widget owner, Object key, TooltipInfo info) {
         registerTooltip(getPaintableMap().getPaintable(owner), key, info);
     }
 
     @Deprecated
-    public boolean hasWidgetEventListeners(Widget widget, String eventIdentifier) {
+    public boolean hasEventListeners(Widget widget, String eventIdentifier) {
         return hasEventListeners(getPaintableMap().getPaintable(widget),
                 eventIdentifier);
     }

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VButton.java b/src/com/vaadin/terminal/gwt/client/ui/VButton.java
index 6e8f03b18c024b76652f20dd9665af98c6705656..60a6a895e6b44765f8a02b8b5352dc4f26b5b2c6 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VButton.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VButton.java
@@ -131,7 +131,7 @@ public class VButton extends FocusWidget implements ClickHandler, FocusHandler,
      */
     public void onBrowserEvent(Event event) {
         if (client != null) {
-            client.handleWidgetTooltipEvent(event, this);
+            client.handleTooltipEvent(event, this);
         }
         if (DOM.eventGetType(event) == Event.ONLOAD) {
             Util.notifyParentOfSizeChange(this, true);

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VCheckBox.java b/src/com/vaadin/terminal/gwt/client/ui/VCheckBox.java
index c439163595d15bc57c3940d1833f64eceb7c4bc7..e1b3bf5fb4e6affcfe5ad5ce23551436bde0ba47 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VCheckBox.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VCheckBox.java
@@ -81,7 +81,7 @@ public class VCheckBox extends com.google.gwt.user.client.ui.CheckBox implements
             Util.notifyParentOfSizeChange(this, true);
         }
         if (client != null) {
-            client.handleWidgetTooltipEvent(event, this);
+            client.handleTooltipEvent(event, this);
         }
     }
 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VDateField.java b/src/com/vaadin/terminal/gwt/client/ui/VDateField.java
index 14c3b99210000f03574e6b9ad2bd2f02dcdb9878..325b72dda7c379beb3900cf91223d1a20caf6565 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VDateField.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VDateField.java
@@ -72,7 +72,7 @@ public class VDateField extends FlowPanel implements Field {
     public void onBrowserEvent(Event event) {
         super.onBrowserEvent(event);
         if (client != null) {
-            client.handleWidgetTooltipEvent(event, this);
+            client.handleTooltipEvent(event, this);
         }
     }
 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VDragAndDropWrapper.java b/src/com/vaadin/terminal/gwt/client/ui/VDragAndDropWrapper.java
index 0297e8df3f2b94f79e94b1557d0a173155b22cb4..b77c9b7a2dd1559806f116b7b990ea7ead8a6565 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VDragAndDropWrapper.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VDragAndDropWrapper.java
@@ -94,7 +94,7 @@ public class VDragAndDropWrapper extends VCustomComponent implements
         super.onBrowserEvent(event);
 
         if (client != null) {
-            client.handleWidgetTooltipEvent(event, this);
+            client.handleTooltipEvent(event, this);
         }
     }
 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VEmbedded.java b/src/com/vaadin/terminal/gwt/client/ui/VEmbedded.java
index 549a7b4549da6c4a1d2ca5e98394d70a4fd89ca7..e2247b627d31f1726b589c79bd8d8d874a76002f 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VEmbedded.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VEmbedded.java
@@ -253,7 +253,7 @@ public class VEmbedded extends HTML {
             Util.notifyParentOfSizeChange(this, true);
         }
 
-        client.handleWidgetTooltipEvent(event, this);
+        client.handleTooltipEvent(event, this);
     }
 
     /**

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java b/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java
index 08d8a39e6eeffc93b5d15502d28cbb646af5923e..0c581efa68a8f178ddce743ca95af431ec2b4fd6 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java
@@ -817,7 +817,7 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler,
         public void onBrowserEvent(Event event) {
             super.onBrowserEvent(event);
             if (client != null) {
-                client.handleWidgetTooltipEvent(event, VFilterSelect.this);
+                client.handleTooltipEvent(event, VFilterSelect.this);
             }
         }
 
@@ -850,7 +850,7 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler,
         public void onBrowserEvent(Event event) {
             super.onBrowserEvent(event);
             if (client != null) {
-                client.handleWidgetTooltipEvent(event, VFilterSelect.this);
+                client.handleTooltipEvent(event, VFilterSelect.this);
             }
 
             /*
@@ -1429,7 +1429,7 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler,
                 // request immediately; otherwise queue in the same burst as the
                 // focus event. Fixes #8321.
                 boolean immediate = focused
-                        || !client.hasWidgetEventListeners(this, EventId.FOCUS);
+                        || !client.hasEventListeners(this, EventId.FOCUS);
                 filterOptions(-1, "", immediate);
                 popupOpenerClicked = true;
                 lastFilter = "";
@@ -1495,7 +1495,7 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler,
         }
         addStyleDependentName("focus");
 
-        if (client.hasWidgetEventListeners(this, EventId.FOCUS)) {
+        if (client.hasEventListeners(this, EventId.FOCUS)) {
             client.updateVariable(paintableId, EventId.FOCUS, "", true);
         }
     }
@@ -1560,7 +1560,7 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler,
         }
         removeStyleDependentName("focus");
 
-        if (client.hasWidgetEventListeners(this, EventId.BLUR)) {
+        if (client.hasEventListeners(this, EventId.BLUR)) {
             client.updateVariable(paintableId, EventId.BLUR, "", true);
         }
     }

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VLink.java b/src/com/vaadin/terminal/gwt/client/ui/VLink.java
index df651c0a4d7f617831402c721d7ee53f4c0a196f..674153b7164d85dfbac8fc31b95babccc8675f34 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VLink.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VLink.java
@@ -103,7 +103,7 @@ public class VLink extends HTML implements ClickHandler {
             Util.notifyParentOfSizeChange(this, true);
         }
         if (client != null) {
-            client.handleWidgetTooltipEvent(event, this);
+            client.handleTooltipEvent(event, this);
         }
         if (target == captionElement || target == anchor
                 || (icon != null && target == icon.getElement())) {

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VListSelect.java b/src/com/vaadin/terminal/gwt/client/ui/VListSelect.java
index 1ea2f4f70513f978954db544352b525acccdf0e2..9ac5e5ab4c69ed27ab2a300957ed47cbf79c7fbf 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VListSelect.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VListSelect.java
@@ -136,7 +136,7 @@ class TooltipListBox extends ListBox {
     public void onBrowserEvent(Event event) {
         super.onBrowserEvent(event);
         if (client != null) {
-            client.handleWidgetTooltipEvent(event, widget);
+            client.handleTooltipEvent(event, widget);
         }
     }
 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java b/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java
index 5e5830a0f332c6b2aedd9b22a50dc3c733d5221d..f5cab6a643763c4271fd7bbdf63771834a476e64 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java
@@ -346,7 +346,7 @@ public class VMenuBar extends SimpleFocusablePanel implements
         // Handle tooltips
         if (targetItem == null && client != null) {
             // Handle root menubar tooltips
-            client.handleWidgetTooltipEvent(e, this);
+            client.handleTooltipEvent(e, this);
         } else if (targetItem != null) {
             // Handle item tooltips
             targetItem.onBrowserEvent(e);
@@ -926,7 +926,7 @@ public class VMenuBar extends SimpleFocusablePanel implements
                 TooltipInfo info = new TooltipInfo(description);
 
                 VMenuBar root = findRootMenu();
-                client.registerWidgetTooltip(root, this, info);
+                client.registerTooltip(root, this, info);
             }
         }
 
@@ -934,7 +934,7 @@ public class VMenuBar extends SimpleFocusablePanel implements
         public void onBrowserEvent(Event event) {
             super.onBrowserEvent(event);
             if (client != null) {
-                client.handleWidgetTooltipEvent(event, findRootMenu(), this);
+                client.handleTooltipEvent(event, findRootMenu(), this);
             }
         }
 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VNativeButton.java b/src/com/vaadin/terminal/gwt/client/ui/VNativeButton.java
index da11154208680cc267d99aa76fb0c4195f77399b..039acbd3426967d9e7499ea6e3b83816c6d66afe 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VNativeButton.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VNativeButton.java
@@ -92,7 +92,7 @@ public class VNativeButton extends Button implements ClickHandler,
         }
 
         if (client != null) {
-            client.handleWidgetTooltipEvent(event, this);
+            client.handleTooltipEvent(event, this);
         }
     }
 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VPanel.java b/src/com/vaadin/terminal/gwt/client/ui/VPanel.java
index b1b3ff27ff51ac97c3dc183bf768320530275178..c7b36a2e3d8c13cc883cdb7d0ce77c3ab88c41a3 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VPanel.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VPanel.java
@@ -264,7 +264,7 @@ public class VPanel extends SimplePanel implements Container,
             }
         } else if (captionNode.isOrHasChild(target)) {
             if (client != null) {
-                client.handleWidgetTooltipEvent(event, this);
+                client.handleTooltipEvent(event, this);
             }
         }
     }

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VPopupView.java b/src/com/vaadin/terminal/gwt/client/ui/VPopupView.java
index b3acc9a9a76a259594ed15dbb3692b5a9723e877..1f22aa7da8248a734deaca49b518992bf269cc23 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VPopupView.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VPopupView.java
@@ -394,7 +394,7 @@ public class VPopupView extends HTML implements Container, Iterable<Widget> {
     public void onBrowserEvent(Event event) {
         super.onBrowserEvent(event);
         if (client != null) {
-            client.handleWidgetTooltipEvent(event, this);
+            client.handleTooltipEvent(event, this);
         }
     }
 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
index 44fea19f76d67595b37fa397db66faf45fcd5cf5..b4499cd2d52b8516383d463462ade88c65421f27 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
@@ -1579,7 +1579,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets,
             }
         }
         client.updateVariable(paintableId, "columnorder", columnOrder, false);
-        if (client.hasWidgetEventListeners(this, COLUMN_REORDER_EVENT_ID)) {
+        if (client.hasEventListeners(this, COLUMN_REORDER_EVENT_ID)) {
             client.sendPendingVariableChanges();
         }
     }
@@ -2270,7 +2270,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets,
                     handleCaptionEvent(event);
                     boolean stopPropagation = true;
                     if (event.getTypeInt() == Event.ONCONTEXTMENU
-                            && !client.hasWidgetEventListeners(
+                            && !client.hasEventListeners(
                                     VScrollTable.this, HEADER_CLICK_EVENT_ID)) {
                         // Prevent showing the browser's context menu only when
                         // there is a header click listener.
@@ -2323,7 +2323,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets,
          *            The click event
          */
         private void fireHeaderClickedEvent(Event event) {
-            if (client.hasWidgetEventListeners(VScrollTable.this,
+            if (client.hasEventListeners(VScrollTable.this,
                     HEADER_CLICK_EVENT_ID)) {
                 MouseEventDetails details = new MouseEventDetails(event);
                 client.updateVariable(paintableId, "headerClickEvent",
@@ -3346,7 +3346,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets,
                 }
                 boolean stopPropagation = true;
                 if (event.getTypeInt() == Event.ONCONTEXTMENU
-                        && !client.hasWidgetEventListeners(VScrollTable.this,
+                        && !client.hasEventListeners(VScrollTable.this,
                                 FOOTER_CLICK_EVENT_ID)) {
                     // Show browser context menu if a footer click listener is
                     // not present
@@ -3380,7 +3380,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets,
          *            The click event
          */
         private void fireFooterClickedEvent(Event event) {
-            if (client.hasWidgetEventListeners(VScrollTable.this,
+            if (client.hasEventListeners(VScrollTable.this,
                     FOOTER_CLICK_EVENT_ID)) {
                 MouseEventDetails details = new MouseEventDetails(event);
                 client.updateVariable(paintableId, "footerClickEvent",
@@ -4132,12 +4132,12 @@ public class VScrollTable extends FlowPanel implements HasWidgets,
             final VScrollTableRow toBeRemoved = (VScrollTableRow) renderedRows
                     .get(index);
             // Unregister row tooltip
-            client.registerWidgetTooltip(VScrollTable.this,
+            client.registerTooltip(VScrollTable.this,
                     toBeRemoved.getElement(), null);
             for (int i = 0; i < toBeRemoved.getElement().getChildCount(); i++) {
                 // Unregister cell tooltips
                 Element td = toBeRemoved.getElement().getChild(i).cast();
-                client.registerWidgetTooltip(VScrollTable.this, td, null);
+                client.registerTooltip(VScrollTable.this, td, null);
             }
             lazyUnregistryBag.add(toBeRemoved);
             tBodyElement.removeChild(toBeRemoved.getElement());
@@ -4395,11 +4395,11 @@ public class VScrollTable extends FlowPanel implements HasWidgets,
                 String rowDescription = uidl.getStringAttribute("rowdescr");
                 if (rowDescription != null && !rowDescription.equals("")) {
                     TooltipInfo info = new TooltipInfo(rowDescription);
-                    client.registerWidgetTooltip(VScrollTable.this, rowElement,
+                    client.registerTooltip(VScrollTable.this, rowElement,
                             info);
                 } else {
                     // Remove possibly previously set tooltip
-                    client.registerWidgetTooltip(VScrollTable.this, rowElement,
+                    client.registerTooltip(VScrollTable.this, rowElement,
                             null);
                 }
 
@@ -4636,10 +4636,10 @@ public class VScrollTable extends FlowPanel implements HasWidgets,
 
                 if (description != null && !description.equals("")) {
                     TooltipInfo info = new TooltipInfo(description);
-                    client.registerWidgetTooltip(VScrollTable.this, td, info);
+                    client.registerTooltip(VScrollTable.this, td, info);
                 } else {
                     // Remove possibly previously set tooltip
-                    client.registerWidgetTooltip(VScrollTable.this, td, null);
+                    client.registerTooltip(VScrollTable.this, td, null);
                 }
 
                 td.appendChild(container);
@@ -4718,7 +4718,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets,
              */
             private boolean handleClickEvent(Event event, Element targetTdOrTr,
                     boolean immediate) {
-                if (!client.hasWidgetEventListeners(VScrollTable.this,
+                if (!client.hasEventListeners(VScrollTable.this,
                         ITEM_CLICK_EVENT_ID)) {
                     // Don't send an event if nobody is listening
                     return false;
@@ -4765,12 +4765,12 @@ public class VScrollTable extends FlowPanel implements HasWidgets,
                         if (VPaintableMap.get(client).getWidgetTooltipInfo(
                                 VScrollTable.this, target) != null) {
                             // Cell has description, use it
-                            client.handleWidgetTooltipEvent(event,
+                            client.handleTooltipEvent(event,
                                     VScrollTable.this, target);
                         } else {
                             // Cell might have row description, use row
                             // description
-                            client.handleWidgetTooltipEvent(event,
+                            client.handleTooltipEvent(event,
                                     VScrollTable.this,
                                     target.getParentElement());
                         }
@@ -4778,7 +4778,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets,
 
                 } else {
                     // Table row (tr)
-                    client.handleWidgetTooltipEvent(event, VScrollTable.this,
+                    client.handleTooltipEvent(event, VScrollTable.this,
                             target);
                 }
             }
@@ -4795,7 +4795,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets,
                         showContextMenu(event);
                         if (enabled
                                 && (actionKeys != null || client
-                                        .hasWidgetEventListeners(
+                                        .hasEventListeners(
                                                 VScrollTable.this,
                                                 ITEM_CLICK_EVENT_ID))) {
                             /*

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java b/src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java
index 97eaca8b53d9f71cc0f79e0572e9c9fd838e5a31..c126e81aecc24f83d395959a3489c769e30f8c06 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java
@@ -208,10 +208,10 @@ public class VTabsheet extends VTabsheetBase {
                 if (uidl.hasAttribute(VAbstractPaintableWidget.ATTRIBUTE_ERROR)) {
                     tooltipInfo.setErrorUidl(uidl.getErrors());
                 }
-                client.registerWidgetTooltip(getTabsheet(), getElement(),
+                client.registerTooltip(getTabsheet(), getElement(),
                         tooltipInfo);
             } else {
-                client.registerWidgetTooltip(getTabsheet(), getElement(), null);
+                client.registerTooltip(getTabsheet(), getElement(), null);
             }
 
             // TODO need to call this instead of super because the caption does
@@ -245,7 +245,7 @@ public class VTabsheet extends VTabsheetBase {
             if (event.getTypeInt() == Event.ONLOAD) {
                 getTabsheet().tabSizeMightHaveChanged(getTab());
             }
-            client.handleWidgetTooltipEvent(event, getTabsheet(), getElement());
+            client.handleTooltipEvent(event, getTabsheet(), getElement());
         }
 
         public Tab getTab() {

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTextField.java b/src/com/vaadin/terminal/gwt/client/ui/VTextField.java
index 80b27e6c8c4c44fa3d00b12f36b1c3f292c8c685..cb7c53f21628d0f2701491cb75ddbbf7474b9c20 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VTextField.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VTextField.java
@@ -112,7 +112,7 @@ public class VTextField extends TextBoxBase implements Field, ChangeHandler,
     public void onBrowserEvent(Event event) {
         super.onBrowserEvent(event);
         if (client != null) {
-            client.handleWidgetTooltipEvent(event, this);
+            client.handleTooltipEvent(event, this);
         }
 
         if (listenTextChangeEvents
@@ -302,7 +302,7 @@ public class VTextField extends TextBoxBase implements Field, ChangeHandler,
             boolean sendBlurEvent = false;
             boolean sendValueChange = false;
 
-            if (blurred && client.hasWidgetEventListeners(this, EventId.BLUR)) {
+            if (blurred && client.hasEventListeners(this, EventId.BLUR)) {
                 sendBlurEvent = true;
                 client.updateVariable(paintableId, EventId.BLUR, "", false);
             }
@@ -368,7 +368,7 @@ public class VTextField extends TextBoxBase implements Field, ChangeHandler,
             setPrompting(false);
         }
         focusedTextField = this;
-        if (client.hasWidgetEventListeners(this, EventId.FOCUS)) {
+        if (client.hasEventListeners(this, EventId.FOCUS)) {
             client.updateVariable(paintableId, EventId.FOCUS, "", true);
         }
     }

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTextualDate.java b/src/com/vaadin/terminal/gwt/client/ui/VTextualDate.java
index bb808321b9e99d65a214c05c47efcf2fc1606ca0..a3bf98592521548a8d3bb548cf908cf4f24b4d37 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VTextualDate.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VTextualDate.java
@@ -62,7 +62,7 @@ public class VTextualDate extends VDateField implements Field, ChangeHandler,
                     setPrompting(false);
                 }
                 if (getClient() != null
-                        && getClient().hasWidgetEventListeners(
+                        && getClient().hasEventListeners(
                                 VTextualDate.this, EventId.FOCUS)) {
                     getClient()
                             .updateVariable(getId(), EventId.FOCUS, "", true);
@@ -80,7 +80,7 @@ public class VTextualDate extends VDateField implements Field, ChangeHandler,
                     text.setText(readonly ? "" : inputPrompt);
                 }
                 if (getClient() != null
-                        && getClient().hasWidgetEventListeners(
+                        && getClient().hasEventListeners(
                                 VTextualDate.this, EventId.BLUR)) {
                     getClient().updateVariable(getId(), EventId.BLUR, "", true);
                 }

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTree.java b/src/com/vaadin/terminal/gwt/client/ui/VTree.java
index be337ae0cb3eda17c49be5d8bc4573bdda90d8e9..d0cc52cffba09cc553ec8856849cb616197c8bd7 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VTree.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VTree.java
@@ -642,13 +642,13 @@ public class VTree extends FocusElementPanel implements VHasDropHandler,
             }
 
             if (target == nodeCaptionSpan) {
-                client.handleWidgetTooltipEvent(event, VTree.this, key);
+                client.handleTooltipEvent(event, VTree.this, key);
             }
 
             final boolean inCaption = target == nodeCaptionSpan
                     || (icon != null && target == icon.getElement());
             if (inCaption
-                    && client.hasWidgetEventListeners(VTree.this,
+                    && client.hasEventListeners(VTree.this,
                             ITEM_CLICK_EVENT_ID)
 
                     && (type == Event.ONDBLCLICK || type == Event.ONMOUSEUP)) {

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VUpload.java b/src/com/vaadin/terminal/gwt/client/ui/VUpload.java
index bc94ae317a5650cf6d56aa4ce19ee2dfa0cd2d87..f7fb5878d5f5f13ea89a8c5ddcdbe80f43a60242 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VUpload.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VUpload.java
@@ -134,7 +134,7 @@ public class VUpload extends SimplePanel {
     @Override
     public void onBrowserEvent(Event event) {
         if ((event.getTypeInt() & VTooltip.TOOLTIP_EVENTS) > 0) {
-            client.handleWidgetTooltipEvent(event, this);
+            client.handleTooltipEvent(event, this);
         }
         super.onBrowserEvent(event);
     }

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VWindow.java b/src/com/vaadin/terminal/gwt/client/ui/VWindow.java
index d4c8f746058eff99eeae18b30be8cc1a1dc0a8a8..3ab843836575d9b39b4f5ea4b16ec6c24c507742 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VWindow.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VWindow.java
@@ -598,7 +598,7 @@ public class VWindow extends VOverlay implements Container,
 
         if (client != null && header.isOrHasChild(target)) {
             // Handle window caption tooltips
-            client.handleWidgetTooltipEvent(event, this);
+            client.handleTooltipEvent(event, this);
         }
 
         if (resizing || resizeBox == target) {
@@ -1029,13 +1029,13 @@ public class VWindow extends VOverlay implements Container,
     }
 
     public void onBlur(BlurEvent event) {
-        if (client.hasWidgetEventListeners(this, EventId.BLUR)) {
+        if (client.hasEventListeners(this, EventId.BLUR)) {
             client.updateVariable(id, EventId.BLUR, "", true);
         }
     }
 
     public void onFocus(FocusEvent event) {
-        if (client.hasWidgetEventListeners(this, EventId.FOCUS)) {
+        if (client.hasEventListeners(this, EventId.FOCUS)) {
             client.updateVariable(id, EventId.FOCUS, "", true);
         }
     }

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 3fe3516f1c1ceb79f21933e67abbce76e18239e6..433907eb0491d3fcc6f4cd04ef0a6eb2863fdabe 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/label/VLabel.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/label/VLabel.java
@@ -41,7 +41,7 @@ public class VLabel extends HTML {
             return;
         }
         if (connection != null) {
-            connection.handleWidgetTooltipEvent(event, this);
+            connection.handleTooltipEvent(event, this);
         }
     }