Fix Editor selection checkbox handling to be more specific (#18818)

Change-Id: Ic33572d3cd9e6117dc133bbfe26bc707c4b84f21

1 files changed, 4 insertions, 1 deletions

diff --git a/client/src/com/vaadin/client/widgets/Grid.java b/client/src/com/vaadin/client/widgets/Grid.java
index 4e5aa869ba..4d1788639c 100644
--- a/client/src/com/vaadin/client/widgets/Grid.java
+++ b/client/src/com/vaadin/client/widgets/Grid.java
@@ -149,6 +149,7 @@ import com.vaadin.client.widget.grid.events.ScrollHandler;
 import com.vaadin.client.widget.grid.events.SelectAllEvent;
 import com.vaadin.client.widget.grid.events.SelectAllHandler;
 import com.vaadin.client.widget.grid.selection.HasSelectionHandlers;
+import com.vaadin.client.widget.grid.selection.MultiSelectionRenderer;
 import com.vaadin.client.widget.grid.selection.SelectionEvent;
 import com.vaadin.client.widget.grid.selection.SelectionHandler;
 import com.vaadin.client.widget.grid.selection.SelectionModel;
@@ -1556,7 +1557,9 @@ public class Grid<T> extends ResizeComposite implements
         }
 
         private void updateSelectionCheckboxesAsNeeded(boolean isEnabled) {
-            if (grid.getSelectionModel() instanceof Multi) {
+            // FIXME: This is too much guessing. Define a better way to do this.
+            if (grid.selectionColumn != null
+                    && grid.selectionColumn.getRenderer() instanceof MultiSelectionRenderer) {
                 grid.refreshBody();
                 CheckBox checkBox = (CheckBox) grid.getDefaultHeaderRow()
                         .getCell(grid.selectionColumn).getWidget();