From 4e8eb29c548128a50a000699f60259243e4695ed Mon Sep 17 00:00:00 2001 From: elmot Date: Tue, 22 Nov 2016 12:49:37 +0200 Subject: Grid merging header cells Change-Id: Ia52bbef412fc8701f6b862960dfed9c08c17ff7a --- shared/src/main/java/com/vaadin/shared/ui/grid/SectionState.java | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'shared') diff --git a/shared/src/main/java/com/vaadin/shared/ui/grid/SectionState.java b/shared/src/main/java/com/vaadin/shared/ui/grid/SectionState.java index 39d2d2f2e9..dda6d3fe9f 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/grid/SectionState.java +++ b/shared/src/main/java/com/vaadin/shared/ui/grid/SectionState.java @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Set; import com.vaadin.shared.Connector; @@ -37,6 +38,9 @@ public class SectionState implements Serializable { /** The map from column ids to the cells in this row. */ public Map cells = new HashMap<>(); + /** The map from a joint cell to column id sets in this row. */ + public Map> cellGroups = new HashMap<>(); + /** * Whether this row is the default header row. Always false for footer * rows. -- cgit v1.2.3