diff options
Diffstat (limited to 'server/src/com/vaadin')
| -rw-r--r-- | server/src/com/vaadin/server/communication/data/RpcDataProviderExtension.java | 3 | ||||
| -rw-r--r-- | server/src/com/vaadin/ui/Grid.java | 9 |
2 files changed, 9 insertions, 3 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 */ |