diff options
author | Denis Anisimov <denis@vaadin.com> | 2016-11-01 15:27:28 +0200 |
---|---|---|
committer | Denis Anisimov <denis@vaadin.com> | 2016-11-02 14:37:30 +0200 |
commit | 13747f7003625a012bfdc788a11482a346bcba4d (patch) | |
tree | bd5ee3c09c1a43ea3052fea032a80d8aaf9b5f0d /uitest | |
parent | dd20841c39b0b30eb2a5c5fddc2eb9cb1cd1e595 (diff) | |
download | vaadin-framework-13747f7003625a012bfdc788a11482a346bcba4d.tar.gz vaadin-framework-13747f7003625a012bfdc788a11482a346bcba4d.zip |
Make SelectionModel API only server side.
Client side doesn't use selection model anymore.
Fixes vaadin/framework8-issues#421
Change-Id: If3ecb1c2f3a0024df9bfdfd182eaf8cf8625ac75
Diffstat (limited to 'uitest')
6 files changed, 6 insertions, 8 deletions
diff --git a/uitest/src/main/java/com/vaadin/tests/components/AbstractListingFocusBlurTest.java b/uitest/src/main/java/com/vaadin/tests/components/AbstractListingFocusBlurTest.java index 0b94b8fecb..f953c3acac 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/AbstractListingFocusBlurTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/AbstractListingFocusBlurTest.java @@ -21,10 +21,10 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; import com.googlecode.gentyref.GenericTypeReflector; +import com.vaadin.data.SelectionModel; import com.vaadin.event.FieldEvents.BlurNotifier; import com.vaadin.event.FieldEvents.FocusNotifier; import com.vaadin.server.VaadinRequest; -import com.vaadin.shared.data.selection.SelectionModel; import com.vaadin.ui.AbstractListing; /** diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractlisting/AbstractMultiSelectTestUI.java b/uitest/src/main/java/com/vaadin/tests/components/abstractlisting/AbstractMultiSelectTestUI.java index 71fd0fd37d..ae69cbb6ff 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/abstractlisting/AbstractMultiSelectTestUI.java +++ b/uitest/src/main/java/com/vaadin/tests/components/abstractlisting/AbstractMultiSelectTestUI.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.stream.Collectors; import java.util.stream.IntStream; -import com.vaadin.shared.data.selection.SelectionModel.Multi; +import com.vaadin.data.SelectionModel.Multi; import com.vaadin.ui.AbstractMultiSelect; import com.vaadin.ui.ItemCaptionGenerator; diff --git a/uitest/src/main/java/com/vaadin/tests/components/checkboxgroup/CheckBoxGroupFocusBlur.java b/uitest/src/main/java/com/vaadin/tests/components/checkboxgroup/CheckBoxGroupFocusBlur.java index 92efed09e7..b92132d9f7 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/checkboxgroup/CheckBoxGroupFocusBlur.java +++ b/uitest/src/main/java/com/vaadin/tests/components/checkboxgroup/CheckBoxGroupFocusBlur.java @@ -15,7 +15,7 @@ */ package com.vaadin.tests.components.checkboxgroup; -import com.vaadin.shared.data.selection.SelectionModel.Multi; +import com.vaadin.data.SelectionModel.Multi; import com.vaadin.tests.components.AbstractListingFocusBlurTest; import com.vaadin.ui.CheckBoxGroup; diff --git a/uitest/src/main/java/com/vaadin/tests/components/radiobutton/RadioButtonGroupTestUI.java b/uitest/src/main/java/com/vaadin/tests/components/radiobutton/RadioButtonGroupTestUI.java index 036512a514..3d8802c5ed 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/radiobutton/RadioButtonGroupTestUI.java +++ b/uitest/src/main/java/com/vaadin/tests/components/radiobutton/RadioButtonGroupTestUI.java @@ -15,8 +15,8 @@ */ package com.vaadin.tests.components.radiobutton; +import com.vaadin.data.SelectionModel; import com.vaadin.server.FontAwesome; -import com.vaadin.shared.data.selection.SelectionModel; import com.vaadin.tests.components.abstractlisting.AbstractListingTestUI; import com.vaadin.ui.ItemCaptionGenerator; import com.vaadin.ui.RadioButtonGroup; diff --git a/uitest/src/main/java/com/vaadin/tests/data/DummyData.java b/uitest/src/main/java/com/vaadin/tests/data/DummyData.java index 917eb39bbd..d0ba74a942 100644 --- a/uitest/src/main/java/com/vaadin/tests/data/DummyData.java +++ b/uitest/src/main/java/com/vaadin/tests/data/DummyData.java @@ -8,12 +8,12 @@ import java.util.Set; import java.util.stream.Stream; import com.vaadin.annotations.Widgetset; +import com.vaadin.data.SelectionModel; import com.vaadin.server.VaadinRequest; import com.vaadin.server.data.DataCommunicator; import com.vaadin.server.data.ListDataSource; import com.vaadin.server.data.Query; import com.vaadin.shared.data.DataCommunicatorConstants; -import com.vaadin.shared.data.selection.SelectionModel; import com.vaadin.tests.components.AbstractTestUIWithLog; import com.vaadin.tests.widgetset.TestingWidgetSet; import com.vaadin.ui.AbstractListing; diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/data/DummyComponentConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/data/DummyComponentConnector.java index 228f5120e7..80ae0d972a 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/data/DummyComponentConnector.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/data/DummyComponentConnector.java @@ -4,15 +4,13 @@ import com.google.gwt.user.client.ui.FlowPanel; import com.vaadin.client.connectors.AbstractListingConnector; import com.vaadin.client.data.DataSource; import com.vaadin.client.ui.VLabel; -import com.vaadin.shared.data.selection.SelectionModel; import com.vaadin.shared.ui.Connect; import com.vaadin.tests.data.DummyData.DummyComponent; import elemental.json.JsonObject; @Connect(DummyComponent.class) -public class DummyComponentConnector extends - AbstractListingConnector<SelectionModel<?>> { +public class DummyComponentConnector extends AbstractListingConnector { @Override public FlowPanel getWidget() { |