diff options
4 files changed, 34 insertions, 4 deletions
diff --git a/server/src/com/vaadin/server/communication/data/RpcDataProviderExtension.java b/server/src/com/vaadin/server/communication/data/RpcDataProviderExtension.java index fed31646f4..55b486d4b6 100644 --- a/server/src/com/vaadin/server/communication/data/RpcDataProviderExtension.java +++ b/server/src/com/vaadin/server/communication/data/RpcDataProviderExtension.java @@ -499,11 +499,12 @@ public class RpcDataProviderExtension extends AbstractExtension { return; } + Collection<Object> activeItemIds = activeItemHandler.getActiveItemIds(); List<Column> columns = getGrid().getColumns(); JsonArray rowData = Json.createArray(); int i = 0; for (Object itemId : itemIds) { - if (activeItemHandler.getActiveItemIds().contains(itemId)) { + if (activeItemIds.contains(itemId)) { Item item = container.getItem(itemId); if (item != null) { JsonObject row = getRowData(columns, itemId, item); diff --git a/server/src/com/vaadin/ui/Grid.java b/server/src/com/vaadin/ui/Grid.java index 0f3e634ed3..c75013b8c6 100644 --- a/server/src/com/vaadin/ui/Grid.java +++ b/server/src/com/vaadin/ui/Grid.java @@ -1810,12 +1810,18 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, if (!added.isEmpty()) { changed = true; selection.addAll(added); + for (Object id : added) { + refreshRow(id); + } } Set<Object> removed = getDifference(selection, selectedRows); if (!removed.isEmpty()) { changed = true; selection.removeAll(removed); + for (Object id : removed) { + refreshRow(id); + } } if (changed) { @@ -5826,8 +5832,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, } /** - * Gets the - * {@link KeyMapper } being used by the data source. + * Gets the {@link KeyMapper } being used by the data source. * * @return the key mapper being used by the data source */ diff --git a/uitest/src/com/vaadin/tests/components/grid/GridMultiSelectionOnInit.java b/uitest/src/com/vaadin/tests/components/grid/GridMultiSelectionOnInit.java index 10d4977623..4a11c19242 100644 --- a/uitest/src/com/vaadin/tests/components/grid/GridMultiSelectionOnInit.java +++ b/uitest/src/com/vaadin/tests/components/grid/GridMultiSelectionOnInit.java @@ -17,18 +17,30 @@ package com.vaadin.tests.components.grid; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Grid; +import com.vaadin.ui.Grid.MultiSelectionModel; import com.vaadin.ui.Grid.SelectionMode; public class GridMultiSelectionOnInit extends AbstractTestUI { @Override protected void setup(VaadinRequest request) { - Grid grid = new Grid(); + final Grid grid = new Grid(); grid.addColumn("foo", String.class); grid.addRow("Foo 1"); grid.addRow("Foo 2"); grid.setSelectionMode(SelectionMode.MULTI); addComponent(grid); + + addComponent(new Button("Select rows", new Button.ClickListener() { + + @Override + public void buttonClick(ClickEvent event) { + ((MultiSelectionModel) grid.getSelectionModel()) + .setSelected(grid.getContainerDataSource().getItemIds()); + } + })); } } diff --git a/uitest/src/com/vaadin/tests/components/grid/GridMultiSelectionOnInitTest.java b/uitest/src/com/vaadin/tests/components/grid/GridMultiSelectionOnInitTest.java index d5eedae824..1818baa4c9 100644 --- a/uitest/src/com/vaadin/tests/components/grid/GridMultiSelectionOnInitTest.java +++ b/uitest/src/com/vaadin/tests/components/grid/GridMultiSelectionOnInitTest.java @@ -15,11 +15,13 @@ */ package com.vaadin.tests.components.grid; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import org.junit.Test; import org.openqa.selenium.By; +import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.elements.GridElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTest; @@ -34,4 +36,14 @@ public class GridMultiSelectionOnInitTest extends MultiBrowserTest { $(GridElement.class).first().getHeaderCell(0, 0) .isElementPresent(By.tagName("input"))); } + + @Test + public void testSetSelectedUpdatesClient() { + openTestURL(); + assertFalse("Rows should not be selected initially.", + $(GridElement.class).first().getRow(0).isSelected()); + $(ButtonElement.class).first().click(); + assertTrue("Rows should be selected after button click.", + $(GridElement.class).first().getRow(0).isSelected()); + } } |