@@ -131,45 +131,45 @@ protected List<GridFooter<T>> getGridFooters(Grid<T> grid) {
131131
132132 private String renderHeaderCellTextContent (Grid <T > grid , Column <T > column ,
133133 SerializableFunction <Column <T >, String > obtainCellFunction ) {
134- String headerOrFooter = (String ) ComponentUtil .getData (column , GridExporter .COLUMN_HEADER );
135- if (Strings .isBlank (headerOrFooter )) {
136- headerOrFooter = column .getHeaderText ();
134+ String header = (String ) ComponentUtil .getData (column , GridExporter .COLUMN_HEADER );
135+ if (Strings .isBlank (header )) {
136+ header = column .getHeaderText ();
137137
138- if (Strings .isBlank (headerOrFooter )) {
138+ if (Strings .isBlank (header )) {
139139 try {
140- headerOrFooter = obtainCellFunction .apply (column );
140+ header = obtainCellFunction .apply (column );
141141 } catch (RuntimeException e ) {
142142 throw new IllegalStateException (
143- "Problem when trying to render header or footer cell text content" , e );
143+ "Problem when trying to render header cell text content" , e );
144144 }
145145 }
146146 }
147147
148- return headerOrFooter == null ? "" : headerOrFooter ;
148+ return header == null ? "" : header ;
149149 }
150150
151151 private String renderFooterCellTextContent (Grid <T > grid , Column <T > column ) {
152- String headerOrFooter = (String ) ComponentUtil .getData (column , GridExporter .COLUMN_FOOTER );
153- if (Strings .isBlank (headerOrFooter )) {
154- SerializableFunction <Column <?>, Component > getHeaderOrFooterComponent ;
155- getHeaderOrFooterComponent = Column ::getFooterComponent ;
156- headerOrFooter = column .getFooterText ();
152+ String footer = (String ) ComponentUtil .getData (column , GridExporter .COLUMN_FOOTER );
153+ if (Strings .isBlank (footer )) {
154+ SerializableFunction <Column <?>, Component > footerComponent ;
155+ footerComponent = Column ::getFooterComponent ;
156+ footer = column .getFooterText ();
157157
158- if (Strings .isBlank (headerOrFooter )) {
158+ if (Strings .isBlank (footer )) {
159159 try {
160160 Component component ;
161- component = getHeaderOrFooterComponent .apply (column );
161+ component = footerComponent .apply (column );
162162 if (component != null ) {
163- headerOrFooter = component .getElement ().getTextRecursively ();
163+ footer = component .getElement ().getTextRecursively ();
164164 }
165165 } catch (RuntimeException e ) {
166166 throw new IllegalStateException (
167- "Problem when trying to render header or footer cell text content" , e );
167+ "Problem when trying to render footer cell text content" , e );
168168 }
169169 }
170170 }
171171
172- return headerOrFooter ==null ?"" :headerOrFooter ;
172+ return footer ==null ?"" :footer ;
173173 }
174174
175175 protected Stream <T > obtainDataStream (DataProvider <T , ?> dataProvider ) {
0 commit comments