From 3ab88b718cdb480058fc9c53506a3dabe4980554 Mon Sep 17 00:00:00 2001
From: Teemu Suo-Anttila <teemusa@vaadin.com>
Date: Tue, 16 Sep 2014 17:01:21 +0300
Subject: Fix GridStaticSection communication to use column ids (#13334)

Change-Id: Ic5174543cab912ea8647b92445f33ec3d9fca366
---
 shared/src/com/vaadin/shared/ui/grid/GridStaticSectionState.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'shared')

diff --git a/shared/src/com/vaadin/shared/ui/grid/GridStaticSectionState.java b/shared/src/com/vaadin/shared/ui/grid/GridStaticSectionState.java
index c3c373b5af..3dde4989b8 100644
--- a/shared/src/com/vaadin/shared/ui/grid/GridStaticSectionState.java
+++ b/shared/src/com/vaadin/shared/ui/grid/GridStaticSectionState.java
@@ -37,6 +37,8 @@ public class GridStaticSectionState implements Serializable {
         public Connector connector = null;
 
         public GridStaticCellType type = GridStaticCellType.TEXT;
+
+        public String columnId;
     }
 
     public static class RowState implements Serializable {
@@ -44,7 +46,7 @@ public class GridStaticSectionState implements Serializable {
 
         public boolean defaultRow = false;
 
-        public List<List<Integer>> cellGroups = new ArrayList<List<Integer>>();
+        public List<List<String>> cellGroups = new ArrayList<List<String>>();
     }
 
     public List<RowState> rows = new ArrayList<RowState>();
-- 
cgit v1.2.3