From c905ac6adf1aeb3ff4f3b15ae6e5344a7ea3d490 Mon Sep 17 00:00:00 2001
From: Leif Åstrand <legioth@gmail.com>
Date: Fri, 12 Jan 2018 13:49:45 +0200
Subject: Rename widgetEventsAllowed to handleWidgetEvents (#10529)

---
 .../vaadin/client/connectors/grid/ColumnConnector.java |  8 ++++----
 .../src/main/java/com/vaadin/client/widgets/Grid.java  | 18 +++++++++---------
 2 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'client')

diff --git a/client/src/main/java/com/vaadin/client/connectors/grid/ColumnConnector.java b/client/src/main/java/com/vaadin/client/connectors/grid/ColumnConnector.java
index 20b624892c..5d66489ed1 100644
--- a/client/src/main/java/com/vaadin/client/connectors/grid/ColumnConnector.java
+++ b/client/src/main/java/com/vaadin/client/connectors/grid/ColumnConnector.java
@@ -39,7 +39,7 @@ import elemental.json.JsonValue;
 public class ColumnConnector extends AbstractExtensionConnector {
 
     public abstract static class CustomColumn
-            extends Column<Object, JsonObject> {
+    extends Column<Object, JsonObject> {
 
         private final String connectorId;
         private ContentMode tooltipContentMode;
@@ -195,9 +195,9 @@ public class ColumnConnector extends AbstractExtensionConnector {
         column.setTooltipContentMode(getState().tooltipContentMode);
     }
 
-    @OnStateChange("widgetEventsAllowed")
-    void updateWidgetEventsAllowed() {
-        column.setWidgetEventsAllowed(getState().widgetEventsAllowed);
+    @OnStateChange("handleWidgetEvents")
+    void updateHandleWidgetEvents() {
+        column.setHandleWidgetEvents(getState().handleWidgetEvents);
     }
 
     @Override
diff --git a/client/src/main/java/com/vaadin/client/widgets/Grid.java b/client/src/main/java/com/vaadin/client/widgets/Grid.java
index 9e186ba64d..f0b309bae7 100755
--- a/client/src/main/java/com/vaadin/client/widgets/Grid.java
+++ b/client/src/main/java/com/vaadin/client/widgets/Grid.java
@@ -2339,7 +2339,7 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
                     if (cell != null) {
                         Column<?, ?> column = grid
                                 .getVisibleColumn(cell.getColumn());
-                        if (column == null || !column.isWidgetEventsAllowed()) {
+                        if (column == null || !column.isHandleWidgetEvents()) {
                             return;
                         }
                     }
@@ -2463,7 +2463,7 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
                     Column<?, ?> column = grid
                             .getVisibleColumn(cell.getColumn());
                     handleWidgetEvent = column != null
-                            && column.isWidgetEventsAllowed();
+                            && column.isHandleWidgetEvents();
                 }
             }
 
@@ -4762,7 +4762,7 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
 
         private String hidingToggleCaption = null;
 
-        private boolean widgetEventsAllowed = false;
+        private boolean handleWidgetEvents = false;
 
         private double minimumWidthPx = GridConstants.DEFAULT_MIN_WIDTH;
         private double maximumWidthPx = GridConstants.DEFAULT_MAX_WIDTH;
@@ -5550,21 +5550,21 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
          *         not
          * @since 8.3
          */
-        public boolean isWidgetEventsAllowed() {
-            return widgetEventsAllowed;
+        public boolean isHandleWidgetEvents() {
+            return handleWidgetEvents;
         }
 
         /**
          * Sets whether Grid should handle events from Widgets in this Column.
-         * 
-         * @param widgetEventsAllowed
+         *
+         * @param handleWidgetEvents
          *            {@code true} to let grid handle events from widgets;
          *            {@code false} to not
          *
          * @since 8.3
          */
-        public void setWidgetEventsAllowed(boolean widgetEventsAllowed) {
-            this.widgetEventsAllowed = widgetEventsAllowed;
+        public void setHandleWidgetEvents(boolean handleWidgetEvents) {
+            this.handleWidgetEvents = handleWidgetEvents;
         }
 
     }
-- 
cgit v1.2.3