Merge branch 'master-18493' into grid-unbuffered-editor

Conflicts:
	client/src/com/vaadin/client/connectors/GridConnector.java
	server/src/com/vaadin/data/RpcDataProviderExtension.java
	server/src/com/vaadin/ui/Grid.java

Change-Id: Ie8931fbae322c93aeb409e8a6d393623ba9d9dc6

2 files changed, 0 insertions, 34 deletions

diff --git a/shared/src/com/vaadin/shared/ui/grid/GridClientRpc.java b/shared/src/com/vaadin/shared/ui/grid/GridClientRpc.java
index 3c6d993482..ac1b1d5a78 100644
--- a/shared/src/com/vaadin/shared/ui/grid/GridClientRpc.java
+++ b/shared/src/com/vaadin/shared/ui/grid/GridClientRpc.java
@@ -15,8 +15,6 @@
  */
 package com.vaadin.shared.ui.grid;
 
-import java.util.Set;
-
 import com.vaadin.shared.communication.ClientRpc;
 
 /**
@@ -57,19 +55,4 @@ public interface GridClientRpc extends ClientRpc {
      * Command client Grid to recalculate column widths.
      */
     public void recalculateColumnWidths();
-
-    /**
-     * Informs the GridConnector on how the indexing of details connectors has
-     * changed.
-     * 
-     * @since 7.5.0
-     * @param connectorChanges
-     *            the indexing changes of details connectors
-     * @param fetchId
-     *            the id of the request for fetching the changes. A negative
-     *            number indicates a push (not requested by the client side)
-     */
-    public void setDetailsConnectorChanges(
-            Set<DetailsConnectorChange> connectorChanges, int fetchId);
-
 }
diff --git a/shared/src/com/vaadin/shared/ui/grid/GridServerRpc.java b/shared/src/com/vaadin/shared/ui/grid/GridServerRpc.java
index 99b339765a..a178ff63d0 100644
--- a/shared/src/com/vaadin/shared/ui/grid/GridServerRpc.java
+++ b/shared/src/com/vaadin/shared/ui/grid/GridServerRpc.java
@@ -86,23 +86,6 @@ public interface GridServerRpc extends ServerRpc {
             List<String> oldColumnOrder);
 
     /**
-     * This is a trigger for Grid to send whatever has changed regarding the
-     * details components.
-     * <p>
-     * The components can't be sent eagerly, since they are generated as a side
-     * effect in
-     * {@link com.vaadin.data.RpcDataProviderExtension#beforeClientResponse(boolean)}
-     * , and that is too late to change the hierarchy. So we need this
-     * round-trip to work around that limitation.
-     * 
-     * @since 7.5.0
-     * @param fetchId
-     *            an unique identifier for the request
-     * @see com.vaadin.ui.Grid#setDetailsVisible(Object, boolean)
-     */
-    void sendDetailsComponents(int fetchId);
-
-    /**
      * Informs the server that the column's visibility has been changed.
      * 
      * @since 7.5.0