Skip to content

Commit edc8b90

Browse files
javier-godoypaodb
authored andcommitted
refactor: remove flag argument
1 parent 0b920ec commit edc8b90

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

src/main/java/com/flowingcode/vaadin/addons/gridexporter/BaseStreamResourceWriter.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ private GridHeader<T> getGridHeader(Grid<T> grid, Column<T> column) {
103103
List<String> headerTexts = new ArrayList<>();
104104
List<HeaderRow> headerRows = grid.getHeaderRows();
105105
for (HeaderRow headerRow : headerRows) {
106-
String headerText = renderHeaderCellTextContent(grid, column, GridExporter.COLUMN_HEADER, (col) -> {
106+
String headerText = renderHeaderCellTextContent(grid, column, (col) -> {
107107
String value = headerRow.getCell(col).getText();
108108
if (Strings.isBlank(value)) {
109109
Component component = headerRow.getCell(col).getComponent();
@@ -123,14 +123,15 @@ protected List<GridFooter<T>> getGridFooters(Grid<T> grid) {
123123
.map(
124124
column ->
125125
new GridFooter<>(
126-
renderFooterCellTextContent(grid, column, GridExporter.COLUMN_FOOTER, null),column
126+
renderFooterCellTextContent(grid, column, null), column
127127
)
128128
)
129129
.collect(Collectors.toList());
130130
}
131131

132-
private String renderHeaderCellTextContent(Grid<T> grid, Column<T> column, String columnType,
132+
private String renderHeaderCellTextContent(Grid<T> grid, Column<T> column,
133133
SerializableFunction<Column<T>, String> obtainCellFunction) {
134+
String columnType = GridExporter.COLUMN_HEADER;
134135
String headerOrFooter = (String) ComponentUtil.getData(column, columnType);
135136
if (Strings.isBlank(headerOrFooter)) {
136137
SerializableFunction<Column<?>, Component> getHeaderOrFooterComponent;
@@ -164,8 +165,9 @@ private String renderHeaderCellTextContent(Grid<T> grid, Column<T> column, Strin
164165
return headerOrFooter == null ? "" : headerOrFooter;
165166
}
166167

167-
private String renderFooterCellTextContent(Grid<T> grid, Column<T> column, String columnType,
168+
private String renderFooterCellTextContent(Grid<T> grid, Column<T> column,
168169
SerializableFunction<Column<T>, String> obtainCellFunction) {
170+
String columnType = GridExporter.COLUMN_FOOTER;
169171
String headerOrFooter = (String) ComponentUtil.getData(column, columnType);
170172
if (Strings.isBlank(headerOrFooter)) {
171173
SerializableFunction<Column<?>, Component> getHeaderOrFooterComponent;

0 commit comments

Comments
 (0)