From cd26b9b32a782b85392a72fdab8eed43731a28d6 Mon Sep 17 00:00:00 2001 From: Artur Date: Tue, 7 Mar 2017 10:50:13 +0200 Subject: Add missing Grid.removeAllColumns (#8750) Fixes #8704 --- server/src/main/java/com/vaadin/ui/Grid.java | 9 +++++++++ .../com/vaadin/tests/server/component/grid/GridTest.java | 14 ++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/server/src/main/java/com/vaadin/ui/Grid.java b/server/src/main/java/com/vaadin/ui/Grid.java index d5d0a30bd1..a9f7f743e3 100644 --- a/server/src/main/java/com/vaadin/ui/Grid.java +++ b/server/src/main/java/com/vaadin/ui/Grid.java @@ -2323,6 +2323,15 @@ public class Grid extends AbstractListing implements HasComponents, removeColumn(getColumnOrThrow(columnId)); } + /** + * Removes all columns from this Grid. + */ + public void removeAllColumns() { + for (Column column : getColumns()) { + removeColumn(column); + } + } + /** * Sets the details component generator. * diff --git a/server/src/test/java/com/vaadin/tests/server/component/grid/GridTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/GridTest.java index 40c753943e..c85cf5ee73 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/grid/GridTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/grid/GridTest.java @@ -403,6 +403,20 @@ public class GridTest { grid.getColumns()); } + @Test + public void removeAllColumns() { + grid.removeAllColumns(); + + Assert.assertEquals(Collections.emptyList(), grid.getColumns()); + } + + @Test + public void removeAllColumnsInGridWithoutColumns() { + grid.removeAllColumns(); + grid.removeAllColumns(); + Assert.assertEquals(Collections.emptyList(), grid.getColumns()); + } + @Test public void setColumns_reorder() { // Will remove other columns -- cgit v1.2.3