diff options
| author | Teemu Suo-Anttila <teemusa@vaadin.com> | 2016-08-24 12:55:11 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2016-08-25 06:10:15 +0000 |
| commit | 082929fbdf06374fd6208284be7cc144a75f1cd9 (patch) | |
| tree | ac8cebb499460c2c66c8f0f9d207b7baaede404b /uitest | |
| parent | 36111d94fab942264199a106bfb7e13751cb3b86 (diff) | |
| download | vaadin-framework-082929fbdf06374fd6208284be7cc144a75f1cd9.tar.gz vaadin-framework-082929fbdf06374fd6208284be7cc144a75f1cd9.zip | |
Allow multiple data change handlers in client-side data sources
This patch moves Registration to shared so it can be used in
both client and server
Change-Id: I16757f70beb474403903bbcf92c7f850aed68b88
Diffstat (limited to 'uitest')
3 files changed, 9 insertions, 3 deletions
diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractFieldTest.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractFieldTest.java index 25ee1460c0..399174b2f6 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractFieldTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractFieldTest.java @@ -9,7 +9,7 @@ import java.util.Locale; import com.vaadin.data.HasValue.ValueChange; import com.vaadin.data.HasValue.ValueChangeListener; -import com.vaadin.event.Registration; +import com.vaadin.shared.Registration; import com.vaadin.tests.components.AbstractComponentTest; import com.vaadin.ui.AbstractField; import com.vaadin.ui.MenuBar; diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridCellFocusOnResetSizeWidget.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridCellFocusOnResetSizeWidget.java index ac8088c654..d77b3210f0 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridCellFocusOnResetSizeWidget.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridCellFocusOnResetSizeWidget.java @@ -26,6 +26,7 @@ import com.vaadin.client.data.DataSource; import com.vaadin.client.renderers.HtmlRenderer; import com.vaadin.client.widgets.Grid; import com.vaadin.client.widgets.Grid.SelectionMode; +import com.vaadin.shared.Registration; public class GridCellFocusOnResetSizeWidget extends PureGWTTestApplication<Grid<String[]>> { @@ -54,8 +55,10 @@ public class GridCellFocusOnResetSizeWidget } @Override - public void setDataChangeHandler(DataChangeHandler dataChangeHandler) { + public Registration addDataChangeHandler( + DataChangeHandler dataChangeHandler) { handler = dataChangeHandler; + return null; } @Override diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridClientColumnRendererConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridClientColumnRendererConnector.java index 1315a85f8e..0259d03256 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridClientColumnRendererConnector.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/grid/GridClientColumnRendererConnector.java @@ -47,6 +47,7 @@ import com.vaadin.client.widget.grid.sort.SortEvent; import com.vaadin.client.widget.grid.sort.SortHandler; import com.vaadin.client.widget.grid.sort.SortOrder; import com.vaadin.client.widgets.Grid; +import com.vaadin.shared.Registration; import com.vaadin.shared.ui.Connect; import com.vaadin.tests.widgetset.server.grid.GridClientColumnRenderers; @@ -105,8 +106,10 @@ public class GridClientColumnRendererConnector } @Override - public void setDataChangeHandler(DataChangeHandler dataChangeHandler) { + public Registration addDataChangeHandler( + DataChangeHandler dataChangeHandler) { this.dataChangeHandler = dataChangeHandler; + return null; } @Override |