summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2014-12-31 11:42:18 +0200
committerTeemu Suo-Anttila <teemusa@vaadin.com>2014-12-31 10:41:34 +0000
commit68e3c8586655f19d1ff0054f4d70d0f57e4ca30c (patch)
tree40713eea45f58326b51dc3886322dd001d1a5f63 /client
parent68e50ff6371bbe68e19d9145e7dfa787a7f18e89 (diff)
downloadvaadin-framework-68e3c8586655f19d1ff0054f4d70d0f57e4ca30c.tar.gz
vaadin-framework-68e3c8586655f19d1ff0054f4d70d0f57e4ca30c.zip
Ignore selection col for server-side cell style generator (#15486)
Change-Id: Ia66ee24da787ca99d16705e699e46729d9aaaca6
Diffstat (limited to 'client')
-rw-r--r--client/src/com/vaadin/client/connectors/GridConnector.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/client/src/com/vaadin/client/connectors/GridConnector.java b/client/src/com/vaadin/client/connectors/GridConnector.java
index d3954f2366..44aa276382 100644
--- a/client/src/com/vaadin/client/connectors/GridConnector.java
+++ b/client/src/com/vaadin/client/connectors/GridConnector.java
@@ -57,6 +57,7 @@ import com.vaadin.client.widget.grid.sort.SortEvent;
import com.vaadin.client.widget.grid.sort.SortHandler;
import com.vaadin.client.widget.grid.sort.SortOrder;
import com.vaadin.client.widgets.Grid;
+import com.vaadin.client.widgets.Grid.Column;
import com.vaadin.client.widgets.Grid.FooterCell;
import com.vaadin.client.widgets.Grid.FooterRow;
import com.vaadin.client.widgets.Grid.HeaderCell;
@@ -102,7 +103,12 @@ public class GridConnector extends AbstractHasComponentsConnector implements
return null;
}
- CustomGridColumn c = (CustomGridColumn) cellReference.getColumn();
+ Column<?, JsonObject> column = cellReference.getColumn();
+ if (!(column instanceof CustomGridColumn)) {
+ // Selection checkbox column
+ return null;
+ }
+ CustomGridColumn c = (CustomGridColumn) column;
JsonObject cellStylesObject = row
.getObject(GridState.JSONKEY_CELLSTYLES);