diff options
| author | Teemu Suo-Anttila <tsuoanttila@users.noreply.github.com> | 2016-12-15 15:57:07 +0200 |
|---|---|---|
| committer | Pekka Hyvönen <pekka@vaadin.com> | 2016-12-15 15:57:07 +0200 |
| commit | 536139870943d684907e0d9b93bbda60582b340d (patch) | |
| tree | 9eb3d93ab16dd8b9fc39466680c2fa854ec08081 /uitest | |
| parent | 4b3b5a232589128151324221eb6fbf51eb5387ab (diff) | |
| download | vaadin-framework-536139870943d684907e0d9b93bbda60582b340d.tar.gz vaadin-framework-536139870943d684907e0d9b93bbda60582b340d.zip | |
Extract interfaces from Grid (#8005)
* Extract interfaces from Grid
Closes vaadin/framework8-issues#566
Diffstat (limited to 'uitest')
| -rw-r--r-- | uitest/src/main/java/com/vaadin/tests/components/grid/basics/GridBasics.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/basics/GridBasics.java b/uitest/src/main/java/com/vaadin/tests/components/grid/basics/GridBasics.java index e7ab23961b..63ef591246 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/basics/GridBasics.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/basics/GridBasics.java @@ -29,10 +29,6 @@ import com.vaadin.ui.Button; import com.vaadin.ui.Component; import com.vaadin.ui.Grid; import com.vaadin.ui.Grid.Column; -import com.vaadin.ui.Grid.DetailsGenerator; -import com.vaadin.ui.Grid.FooterRow; -import com.vaadin.ui.Grid.HeaderRow; -import com.vaadin.ui.Grid.MultiSelectionModel; import com.vaadin.ui.Grid.SelectionMode; import com.vaadin.ui.Label; import com.vaadin.ui.MenuBar; @@ -45,6 +41,12 @@ import com.vaadin.ui.SingleSelect; import com.vaadin.ui.StyleGenerator; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; +import com.vaadin.ui.components.grid.DetailsGenerator; +import com.vaadin.ui.components.grid.FooterCell; +import com.vaadin.ui.components.grid.FooterRow; +import com.vaadin.ui.components.grid.HeaderCell; +import com.vaadin.ui.components.grid.HeaderRow; +import com.vaadin.ui.components.grid.MultiSelectionModel; import com.vaadin.ui.components.grid.MultiSelectionModelImpl; import com.vaadin.ui.components.grid.MultiSelectionModelImpl.SelectAllCheckBoxVisibility; import com.vaadin.ui.components.grid.SingleSelectionModelImpl; @@ -628,7 +630,7 @@ public class GridBasics extends AbstractTestUIWithLog { int... columnIndexes) { HeaderRow headerRow = grid.getHeaderRow(rowIndex); List<Column<DataObject, ?>> columns = grid.getColumns(); - Set<Grid.HeaderCell> toMerge = new HashSet<>(); + Set<HeaderCell> toMerge = new HashSet<>(); for (int columnIndex : columnIndexes) { toMerge.add(headerRow.getCell(columns.get(columnIndex))); } @@ -639,7 +641,7 @@ public class GridBasics extends AbstractTestUIWithLog { int... columnIndexes) { FooterRow footerRow = grid.getFooterRow(rowIndex); List<Column<DataObject, ?>> columns = grid.getColumns(); - Set<Grid.FooterCell> toMerge = new HashSet<>(); + Set<FooterCell> toMerge = new HashSet<>(); for (int columnIndex : columnIndexes) { toMerge.add(footerRow.getCell(columns.get(columnIndex))); } |