Merge branch 'master' into grid-unbuffered-editor

Conflicts:
	server/src/com/vaadin/data/RpcDataProviderExtension.java

Change-Id: I1bd55b03a8c114823ed8655fc89758f37b16e9c4

2 files changed, 25 insertions, 1 deletions

diff --git a/shared/src/com/vaadin/shared/data/DataProviderRpc.java b/shared/src/com/vaadin/shared/data/DataProviderRpc.java
index 4bfdb8b6c5..bddbdd113d 100644
--- a/shared/src/com/vaadin/shared/data/DataProviderRpc.java
+++ b/shared/src/com/vaadin/shared/data/DataProviderRpc.java
@@ -20,6 +20,7 @@ import com.vaadin.shared.annotations.NoLayout;
 import com.vaadin.shared.communication.ClientRpc;
 
 import elemental.json.JsonArray;
+import elemental.json.JsonObject;
 
 /**
  * RPC interface used for pushing container data to the client.
@@ -91,4 +92,15 @@ public interface DataProviderRpc extends ClientRpc {
      *            the size of the new data set
      */
     public void resetDataAndSize(int size);
+
+    /**
+     * Informs the client that a row has updated. The client-side DataSource
+     * will map the given data to correct index if it should be in the cache.
+     * 
+     * @since
+     * @param row
+     *            the updated row data
+     */
+    @NoLayout
+    public void updateRowData(JsonObject row);
 }
diff --git a/shared/src/com/vaadin/shared/data/DataRequestRpc.java b/shared/src/com/vaadin/shared/data/DataRequestRpc.java
index 0d9b919a4e..84216f0fab 100644
--- a/shared/src/com/vaadin/shared/data/DataRequestRpc.java
+++ b/shared/src/com/vaadin/shared/data/DataRequestRpc.java
@@ -16,8 +16,8 @@
 
 package com.vaadin.shared.data;
 
-import com.vaadin.shared.annotations.NoLoadingIndicator;
 import com.vaadin.shared.annotations.Delayed;
+import com.vaadin.shared.annotations.NoLoadingIndicator;
 import com.vaadin.shared.communication.ServerRpc;
 
 /**
@@ -55,5 +55,17 @@ public interface DataRequestRpc extends ServerRpc {
      *            pinned status of referenced item
      */
     @Delayed
+    @NoLoadingIndicator
     public void setPinned(String key, boolean isPinned);
+
+    /**
+     * Informs the server that an item is dropped from the client cache.
+     * 
+     * @since
+     * @param rowKey
+     *            key mapping to item
+     */
+    @Delayed
+    @NoLoadingIndicator
+    public void dropRow(String rowKey);
 }