Fixes two 'rolling index' bugs when removing columns

Change-Id: I0b278121bf46c3c05c05f73c2aa71f7bfc70cf3a

diff --git a/client/src/com/vaadin/client/ui/grid/Escalator.java b/client/src/com/vaadin/client/ui/grid/Escalator.java
index f306166a744c078301e5b63be73feaa8c9d9b243..887db8a758ccd5dd7f08d0a1ca5057081543a6ca 100644 (file)
--- a/client/src/com/vaadin/client/ui/grid/Escalator.java
+++ b/client/src/com/vaadin/client/ui/grid/Escalator.java
@@ -2761,10 +2761,9 @@ public class Escalator extends Widget {
                 }
             }
 
-            flyweightRow.removeCells(index, numberOfColumns);
             List<Column> removedColumns = new ArrayList<Column>();
             for (int i = 0; i < numberOfColumns; i++) {
-                removedColumns.add(columns.remove(i));
+                removedColumns.add(columns.remove(index));
             }
 
             if (hasSomethingInDom()) {