Merge remote-tracking branch 'origin/master' into grid-7.5

Change-Id: I53218c269f0701cddd8279bf25c493950144f4cb

1 files changed, 114 insertions, 0 deletions

diff --git a/uitest/src/com/vaadin/tests/widgetset/client/grid/GridCellFocusOnResetSizeWidget.java b/uitest/src/com/vaadin/tests/widgetset/client/grid/GridCellFocusOnResetSizeWidget.java
new file mode 100644
index 0000000000..b2893463a7
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/widgetset/client/grid/GridCellFocusOnResetSizeWidget.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2000-2014 Vaadin Ltd.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.tests.widgetset.client.grid;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.event.dom.client.ClickHandler;
+import com.google.gwt.user.client.ui.Button;
+import com.vaadin.client.data.DataChangeHandler;
+import com.vaadin.client.data.DataSource;
+import com.vaadin.client.renderers.HtmlRenderer;
+import com.vaadin.client.widgets.Grid;
+import com.vaadin.client.widgets.Grid.SelectionMode;
+
+public class GridCellFocusOnResetSizeWidget extends
+        PureGWTTestApplication<Grid<String[]>> {
+
+    private Grid<String[]> grid;
+
+    private final class MyDataSource implements DataSource<String[]> {
+        List<String[]> rows = new ArrayList<String[]>();
+        int ROWS_MAX = 10;
+        int size = ROWS_MAX;
+        DataChangeHandler handler = null;
+        {
+            for (int i = 0; i < ROWS_MAX; ++i) {
+                rows.add(new String[] { "Foo " + i });
+            }
+        }
+
+        @Override
+        public void ensureAvailability(int firstRowIndex, int numberOfRows) {
+            handler.dataAvailable(firstRowIndex, numberOfRows);
+        }
+
+        @Override
+        public int size() {
+            return size;
+        }
+
+        @Override
+        public void setDataChangeHandler(DataChangeHandler dataChangeHandler) {
+            handler = dataChangeHandler;
+        }
+
+        @Override
+        public RowHandle<String[]> getHandle(final String[] rowData) {
+            return null;
+        }
+
+        @Override
+        public String[] getRow(int rowIndex) {
+            if (rowIndex < size && rowIndex >= 0) {
+                return rows.get(rowIndex);
+            }
+            return null;
+        }
+
+        public void changeSize() {
+            size--;
+            if (size < ROWS_MAX / 2) {
+                size = ROWS_MAX;
+            }
+            handler.resetDataAndSize(size);
+        }
+    }
+
+    private class Col extends Grid.Column<String, String[]> {
+        public Col(String header) {
+            super(header, new HtmlRenderer());
+        }
+
+        @Override
+        public String getValue(String[] row) {
+            int index = grid.getColumns().indexOf(this);
+            return "<span>" + String.valueOf(row[index]) + "</span>";
+        }
+    }
+
+    public GridCellFocusOnResetSizeWidget() {
+        super(new Grid<String[]>());
+        grid = getTestedWidget();
+        grid.setSelectionMode(SelectionMode.NONE);
+        grid.setWidth("300px");
+        grid.addColumn(new Col("Foo"));
+        final MyDataSource dataSource = new MyDataSource();
+        grid.setDataSource(dataSource);
+        Button widget = new Button("Change Container Size");
+        widget.addClickHandler(new ClickHandler() {
+
+            @Override
+            public void onClick(ClickEvent event) {
+                dataSource.changeSize();
+            }
+        });
+        addNorth(grid, 400);
+        addNorth(widget, 50);
+    }
+}