From fb28652b033bc500c114c65d84f418b6249befa4 Mon Sep 17 00:00:00 2001 From: Sauli Tähkäpää Date: Fri, 28 Aug 2015 13:36:01 +0300 Subject: Support caption fetching for HTML and Widget headers. (#18528) Change-Id: Idad2cbbb6b138258ff6428e7ecc3d922ef99c675 --- server/src/com/vaadin/ui/Grid.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'server/src/com/vaadin') diff --git a/server/src/com/vaadin/ui/Grid.java b/server/src/com/vaadin/ui/Grid.java index e80f703c16..5dfb8e83ed 100644 --- a/server/src/com/vaadin/ui/Grid.java +++ b/server/src/com/vaadin/ui/Grid.java @@ -3224,19 +3224,15 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, * Returns the caption of the header. By default the header caption is * the property id of the column. * - * @return the text in the default row of header, null if no default row + * @return the text in the default row of header. * * @throws IllegalStateException * if the column no longer is attached to the grid */ public String getHeaderCaption() throws IllegalStateException { checkColumnIsAttached(); - HeaderRow row = grid.getHeader().getDefaultRow(); - if (row != null) { - return row.getCell(grid.getPropertyIdByColumnId(state.id)) - .getText(); - } - return null; + + return state.headerCaption; } /** -- cgit v1.2.3