diff options
| -rw-r--r-- | client/src/com/vaadin/client/widgets/Grid.java | 4 | ||||
| -rw-r--r-- | uitest/src/com/vaadin/tests/widgetset/client/grid/GridColumnAutoWidthClientWidget.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/client/src/com/vaadin/client/widgets/Grid.java b/client/src/com/vaadin/client/widgets/Grid.java index 7668d43fe0..01decd1386 100644 --- a/client/src/com/vaadin/client/widgets/Grid.java +++ b/client/src/com/vaadin/client/widgets/Grid.java @@ -3674,7 +3674,7 @@ public class Grid<T> extends ResizeComposite implements * the column to add * @return given column */ - public Column<?, T> addColumn(Column<?, T> column) { + public <C extends Column<?, T>> C addColumn(C column) { addColumn(column, getColumnCount()); return column; } @@ -3692,7 +3692,7 @@ public class Grid<T> extends ResizeComposite implements * if Grid's current selection model renders a selection column, * and {@code index} is 0. */ - public Column<?, T> addColumn(Column<?, T> column, int index) { + public <C extends Column<?, T>> C addColumn(C column, int index) { if (column == selectionColumn) { throw new IllegalArgumentException("The selection column many " + "not be added manually"); diff --git a/uitest/src/com/vaadin/tests/widgetset/client/grid/GridColumnAutoWidthClientWidget.java b/uitest/src/com/vaadin/tests/widgetset/client/grid/GridColumnAutoWidthClientWidget.java index 6fadf95b63..caaed12e70 100644 --- a/uitest/src/com/vaadin/tests/widgetset/client/grid/GridColumnAutoWidthClientWidget.java +++ b/uitest/src/com/vaadin/tests/widgetset/client/grid/GridColumnAutoWidthClientWidget.java @@ -63,7 +63,7 @@ public class GridColumnAutoWidthClientWidget extends } private Col addColumn(String header) { - Col column = (Col) grid.addColumn(new Col(header)); + Col column = grid.addColumn(new Col(header)); grid.getHeaderRow(0).getCell(column) .setHtml("<span>" + header + "</span>"); return column; |