From c413b480663e9b3cbda00faf14eb4df224c6a10a Mon Sep 17 00:00:00 2001 From: Teemu Suo-Anttila <teemusa@vaadin.com> Date: Mon, 24 Aug 2015 14:38:19 +0300 Subject: Fix Table ColumnCollapseEvents to work with generated columns (#6914) Change-Id: Id2039cc4869695a8f4bbaa8f25f44f804433e909 --- server/src/com/vaadin/ui/Table.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'server/src/com/vaadin/ui/Table.java') diff --git a/server/src/com/vaadin/ui/Table.java b/server/src/com/vaadin/ui/Table.java index 2cd4084ad9..10d1c45ab6 100644 --- a/server/src/com/vaadin/ui/Table.java +++ b/server/src/com/vaadin/ui/Table.java @@ -1322,7 +1322,8 @@ public class Table extends AbstractSelect implements Action.Container, if (collapsed && noncollapsibleColumns.contains(propertyId)) { throw new IllegalStateException("The column is noncollapsible!"); } - if (!getContainerPropertyIds().contains(propertyId)) { + if (!getContainerPropertyIds().contains(propertyId) + && !columnGenerators.containsKey(propertyId)) { throw new IllegalArgumentException("Property '" + propertyId + "' was not found in the container"); } @@ -5772,7 +5773,7 @@ public class Table extends AbstractSelect implements Action.Container, * @param source * The source of the event * @param propertyId - * The id of the coumn + * The id of the column */ public ColumnCollapseEvent(Component source, Object propertyId) { super(source); -- cgit v1.2.3