aboutsummaryrefslogtreecommitdiffstats
path: root/shared
diff options
context:
space:
mode:
authorTeemu Suo-Anttila <teemusa@vaadin.com>2014-09-16 17:01:21 +0300
committerTeemu Suo-Anttila <teemusa@vaadin.com>2014-09-24 14:15:33 +0300
commit3ab88b718cdb480058fc9c53506a3dabe4980554 (patch)
treed52830c9804f263c497d6651aed6542e82090e3e /shared
parentc4be1eb4ebf96e8f3e90771b889e00547fc55587 (diff)
downloadvaadin-framework-3ab88b718cdb480058fc9c53506a3dabe4980554.tar.gz
vaadin-framework-3ab88b718cdb480058fc9c53506a3dabe4980554.zip
Fix GridStaticSection communication to use column ids (#13334)
Change-Id: Ic5174543cab912ea8647b92445f33ec3d9fca366
Diffstat (limited to 'shared')
-rw-r--r--shared/src/com/vaadin/shared/ui/grid/GridStaticSectionState.java4
1 files changed, 3 insertions, 1 deletions
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>();