Fixed compilation errors introduced by merge from 6.8

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java b/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java
index 5305bf6a2364a37ac254d23d0cd99d52b53d73b3..b54c3dd9431862e2cc7243a890ac35078212ba3b 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java
@@ -1422,7 +1422,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.hasEventListeners(this, EventId.FOCUS);
+                        || !client.hasWidgetEventListeners(this, EventId.FOCUS);
                 filterOptions(-1, "", immediate);
                 popupOpenerClicked = true;
                 lastFilter = "";

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
index e653e1e7b49eb70c2a0a3999b26359f081642854..b84fc1312f1382be7c756e044538362b20869f52 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
@@ -2270,8 +2270,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets,
                     handleCaptionEvent(event);
                     boolean stopPropagation = true;
                     if (event.getTypeInt() == Event.ONCONTEXTMENU
-                            && !client.hasEventListeners(VScrollTable.this,
-                                    HEADER_CLICK_EVENT_ID)) {
+                            && !client.hasWidgetEventListeners(
+                                    VScrollTable.this, HEADER_CLICK_EVENT_ID)) {
                         // Prevent showing the browser's context menu only when
                         // there is a header click listener.
                         stopPropagation = false;
@@ -3346,7 +3346,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets,
                 }
                 boolean stopPropagation = true;
                 if (event.getTypeInt() == Event.ONCONTEXTMENU
-                        && !client.hasEventListeners(VScrollTable.this,
+                        && !client.hasWidgetEventListeners(VScrollTable.this,
                                 FOOTER_CLICK_EVENT_ID)) {
                     // Show browser context menu if a footer click listener is
                     // not present