Fix Table ColumnCollapseEvents to work with generated columns (#6914)

Change-Id: Id2039cc4869695a8f4bbaa8f25f44f804433e909

1 files changed, 3 insertions, 2 deletions

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);