Browse Source

Remove unnecessary size parameter from data reset in simple mode

Change-Id: I861cf9ed99637cd74ecb2f65705a2c7717afbd08
feature/databinding
Teemu Suo-Anttila 8 years ago
parent
commit
663fe67e98

+ 1
- 1
client/src/com/vaadin/client/connectors/data/typed/DataSourceConnector.java View File

@@ -56,7 +56,7 @@ public class DataSourceConnector extends AbstractExtensionConnector {
registerRpc(DataProviderClientRpc.class, new DataProviderClientRpc() {

@Override
public void resetSize(long size) {
public void reset() {
ds.asList().clear();
// Inform the server-side that all keys are now dropped.
Set<String> keySet = new HashSet<String>(keyToJson.keySet());

+ 0
- 5
server/src/com/vaadin/server/communication/data/typed/CollectionDataSource.java View File

@@ -61,9 +61,4 @@ public class CollectionDataSource<T> extends AbstractDataSource<T> {
public Iterator<T> iterator() {
return backend.iterator();
}

@Override
public long size() {
return backend.size();
}
}

+ 0
- 7
server/src/com/vaadin/server/communication/data/typed/DataSource.java View File

@@ -27,13 +27,6 @@ import java.io.Serializable;
*/
public interface DataSource<T> extends Iterable<T>, Serializable {

/**
* Gets the data object count from the back end.
*
* @return back end size
*/
long size();

/**
* Saves a data object to the back end. If it's a new object, it should be
* created in the back end. Existing objects with changes should be stored.

+ 4
- 2
server/src/com/vaadin/server/communication/data/typed/SimpleDataProvider.java View File

@@ -86,9 +86,11 @@ public class SimpleDataProvider<T> extends DataProvider<T> {
public void beforeClientResponse(boolean initial) {
super.beforeClientResponse(initial);

if (reset) {
getRpcProxy(DataProviderClientRpc.class).reset();
}

if (initial || reset) {
getRpcProxy(DataProviderClientRpc.class).resetSize(
dataSource.size());
pushData(0, dataSource);
} else if (!updatedData.isEmpty()) {
JsonArray dataArray = Json.createArray();

+ 2
- 5
shared/src/com/vaadin/shared/data/DataProviderClientRpc.java View File

@@ -28,12 +28,9 @@ import elemental.json.JsonObject;
public interface DataProviderClientRpc extends ClientRpc {

/**
* Sets the size of the client-side DataSource.
*
* @param size
* the new data set size
* Informs the client-side DataSource that all data has been invalidated.
*/
void resetSize(long size);
void reset();

/**
* Sets the data of the client-side DataSource to match the given data

Loading…
Cancel
Save