diff options
| author | Teemu Suo-Anttila <teemusa@vaadin.com> | 2017-03-02 15:16:54 +0200 |
|---|---|---|
| committer | Henri Sara <henri.sara@gmail.com> | 2017-03-07 12:36:54 +0200 |
| commit | 6f8518579fd3301031800dffe046f8719f4cafd8 (patch) | |
| tree | 4d7a54839a0c0db9ac74fee5d98defa9fdcdc452 /compatibility-server | |
| parent | f5c15b9b2bcc4eeef210a5977449c76f3b952209 (diff) | |
| download | vaadin-framework-6f8518579fd3301031800dffe046f8719f4cafd8.tar.gz vaadin-framework-6f8518579fd3301031800dffe046f8719f4cafd8.zip | |
Picked all changes from 7.7
Synchronises parts of compatibility package code to match 7.7
Picks suitable patches for 8 code as well
Diffstat (limited to 'compatibility-server')
2 files changed, 3 insertions, 0 deletions
diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/MultiSelectionModelTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/MultiSelectionModelTest.java index b4ccb094d0..7840b1f246 100644 --- a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/MultiSelectionModelTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/MultiSelectionModelTest.java @@ -17,6 +17,7 @@ package com.vaadin.v7.tests.server.component.grid; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.List; import org.junit.After; @@ -32,6 +33,7 @@ import com.vaadin.v7.event.SelectionEvent.SelectionListener; import com.vaadin.v7.shared.ui.grid.selection.MultiSelectionModelServerRpc; import com.vaadin.v7.shared.ui.grid.selection.MultiSelectionModelState; import com.vaadin.v7.ui.Grid; +import com.vaadin.v7.ui.Grid.SelectionModel.HasUserSelectionAllowed; public class MultiSelectionModelTest { diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/SingleSelectionModelTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/SingleSelectionModelTest.java index ffb07b986b..91d537824c 100644 --- a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/SingleSelectionModelTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/grid/SingleSelectionModelTest.java @@ -28,6 +28,7 @@ import com.vaadin.v7.event.SelectionEvent.SelectionListener; import com.vaadin.v7.shared.ui.grid.selection.SingleSelectionModelServerRpc; import com.vaadin.v7.ui.Grid; import com.vaadin.v7.ui.Grid.SelectionMode; +import com.vaadin.v7.ui.Grid.SelectionModel.HasUserSelectionAllowed; import com.vaadin.v7.ui.Grid.SingleSelectionModel; public class SingleSelectionModelTest { |