Fix server side HeaderCell.setHtml() (#13334)

Change-Id: Iac4d555f941e95ed56db4ce3772666d8b9acd5b4

1 files changed, 5 insertions, 3 deletions

diff --git a/client/src/com/vaadin/client/ui/grid/GridConnector.java b/client/src/com/vaadin/client/ui/grid/GridConnector.java
index 73440232b1..72de944848 100644
--- a/client/src/com/vaadin/client/ui/grid/GridConnector.java
+++ b/client/src/com/vaadin/client/ui/grid/GridConnector.java
@@ -298,7 +298,8 @@ public class GridConnector extends AbstractHasComponentsConnector {
                 selectionOffset = 0;
             }
 
-            assert rowState.cells.size() == getWidget().getColumnCount() - selectionOffset;
+            assert rowState.cells.size() == getWidget().getColumnCount()
+                    - selectionOffset;
 
             int i = 0 + selectionOffset;
             for (CellState cellState : rowState.cells) {
@@ -308,7 +309,7 @@ public class GridConnector extends AbstractHasComponentsConnector {
                     cell.setText(cellState.text);
                     break;
                 case HTML:
-                    cell.setHtml(cellState.text);
+                    cell.setHtml(cellState.html);
                     break;
                 case WIDGET:
                     ComponentConnector connector = (ComponentConnector) cellState.connector;
@@ -324,7 +325,8 @@ public class GridConnector extends AbstractHasComponentsConnector {
                 GridColumn<?, ?>[] columns = new GridColumn<?, ?>[group.size()];
                 i = 0;
                 for (Integer colIndex : group) {
-                    columns[i++] = getWidget().getColumn(selectionOffset + colIndex);
+                    columns[i++] = getWidget().getColumn(
+                            selectionOffset + colIndex);
                 }
                 row.join(columns);
             }