From 8d4661f867aab6a58c257ebe49d342a4a4af56d7 Mon Sep 17 00:00:00 2001 From: Leif Åstrand Date: Thu, 15 Jan 2015 11:41:20 +0200 Subject: Make Grid send Json as Json (#16244) Change-Id: I2da481dcd3c258e48f2f77a9d3c8c46bb81048ff --- .../src/com/vaadin/client/connectors/RpcDataSourceConnector.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'client') diff --git a/client/src/com/vaadin/client/connectors/RpcDataSourceConnector.java b/client/src/com/vaadin/client/connectors/RpcDataSourceConnector.java index 74c8dfb02f..f8d6ebcb62 100644 --- a/client/src/com/vaadin/client/connectors/RpcDataSourceConnector.java +++ b/client/src/com/vaadin/client/connectors/RpcDataSourceConnector.java @@ -30,8 +30,6 @@ import com.vaadin.shared.ui.grid.Range; import elemental.json.Json; import elemental.json.JsonArray; import elemental.json.JsonObject; -import elemental.json.JsonType; -import elemental.json.JsonValue; /** * Connects a Vaadin server-side container data source to a Grid. This is @@ -50,12 +48,7 @@ public class RpcDataSourceConnector extends AbstractExtensionConnector { protected RpcDataSource() { registerRpc(DataProviderRpc.class, new DataProviderRpc() { @Override - public void setRowData(int firstRow, String rowsJson) { - JsonValue parsedJson = Json.instance().parse(rowsJson); - assert parsedJson.getType() == JsonType.ARRAY : "Was unable to parse JSON into an array: " - + parsedJson; - JsonArray rowArray = (JsonArray) parsedJson; - + public void setRowData(int firstRow, JsonArray rowArray) { ArrayList rows = new ArrayList( rowArray.length()); for (int i = 0; i < rowArray.length(); i++) { -- cgit v1.2.3