diff options
6 files changed, 18 insertions, 9 deletions
diff --git a/client/src/com/vaadin/client/connectors/GridConnector.java b/client/src/com/vaadin/client/connectors/GridConnector.java index c3d46a4295..450df31b36 100644 --- a/client/src/com/vaadin/client/connectors/GridConnector.java +++ b/client/src/com/vaadin/client/connectors/GridConnector.java @@ -356,7 +356,7 @@ public class GridConnector extends AbstractHasComponentsConnector implements selectedKeys.add(dataSource.getRowKey(row)); } - getRpcProxy(GridServerRpc.class).selectionChange( + getRpcProxy(GridServerRpc.class).select( new ArrayList<String>(selectedKeys)); } else { updatedFromState = false; diff --git a/server/src/com/vaadin/event/SortEvent.java b/server/src/com/vaadin/event/SortEvent.java index b331f37efa..f303e47781 100644 --- a/server/src/com/vaadin/event/SortEvent.java +++ b/server/src/com/vaadin/event/SortEvent.java @@ -105,6 +105,6 @@ public class SortEvent extends Component.Event { * @param listener * the sort order change listener to remove */ - public void removeSortistener(SortListener listener); + public void removeSortListener(SortListener listener); } } diff --git a/server/src/com/vaadin/ui/Grid.java b/server/src/com/vaadin/ui/Grid.java index fa0ec6fb8d..316f7682de 100644 --- a/server/src/com/vaadin/ui/Grid.java +++ b/server/src/com/vaadin/ui/Grid.java @@ -2619,7 +2619,7 @@ public class Grid extends AbstractComponent implements SelectionNotifier, registerRpc(new GridServerRpc() { @Override - public void selectionChange(List<String> selection) { + public void select(List<String> selection) { Collection<Object> receivedSelection = getKeyMapper() .getItemIds(selection); @@ -3763,7 +3763,7 @@ public class Grid extends AbstractComponent implements SelectionNotifier, * the sort order change listener to remove */ @Override - public void removeSortistener(SortListener listener) { + public void removeSortListener(SortListener listener) { removeListener(SortEvent.class, listener, SORT_ORDER_CHANGE_METHOD); } diff --git a/shared/src/com/vaadin/shared/ui/grid/GridServerRpc.java b/shared/src/com/vaadin/shared/ui/grid/GridServerRpc.java index 37cbb295f6..77eda7a2f6 100644 --- a/shared/src/com/vaadin/shared/ui/grid/GridServerRpc.java +++ b/shared/src/com/vaadin/shared/ui/grid/GridServerRpc.java @@ -27,10 +27,11 @@ import com.vaadin.shared.data.sort.SortDirection; * @author Vaadin Ltd */ public interface GridServerRpc extends ServerRpc { - void selectionChange(List<String> newSelection); - void sort(String[] columnIds, SortDirection[] directions, - boolean userOriginated); + void select(List<String> newSelection); void selectAll(); + + void sort(String[] columnIds, SortDirection[] directions, + boolean userOriginated); } diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/DisabledGridClientTest.java b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/DisabledGridClientTest.java index 0038d3dabe..63d031bc85 100644 --- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/DisabledGridClientTest.java +++ b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/DisabledGridClientTest.java @@ -24,9 +24,9 @@ import org.openqa.selenium.Keys; import org.openqa.selenium.interactions.Actions; import com.vaadin.testbench.elements.GridElement.GridRowElement; -import com.vaadin.tests.components.grid.basicfeatures.GridBasicFeaturesTest; +import com.vaadin.tests.components.grid.basicfeatures.GridBasicClientFeaturesTest; -public class DisabledGridClientTest extends GridBasicFeaturesTest { +public class DisabledGridClientTest extends GridBasicClientFeaturesTest { @Before public void setUp() { diff --git a/uitest/src/com/vaadin/tests/widgetset/client/grid/GridBasicClientFeaturesWidget.java b/uitest/src/com/vaadin/tests/widgetset/client/grid/GridBasicClientFeaturesWidget.java index b5b416eeb1..64fc60e488 100644 --- a/uitest/src/com/vaadin/tests/widgetset/client/grid/GridBasicClientFeaturesWidget.java +++ b/uitest/src/com/vaadin/tests/widgetset/client/grid/GridBasicClientFeaturesWidget.java @@ -606,6 +606,14 @@ public class GridBasicClientFeaturesWidget extends } }, "Component", "State", "Frozen column count"); } + + addMenuCommand("Enabled", new ScheduledCommand() { + + @Override + public void execute() { + grid.setEnabled(!grid.isEnabled()); + } + }, "Component", "State"); } private void createColumnsMenu() { |