From 668e96f07d5f1a74ca847cd7aaf8fcc60c3ee6e6 Mon Sep 17 00:00:00 2001 From: Looly Date: Sat, 26 Sep 2020 02:31:31 +0800 Subject: [PATCH] fix comment --- .../java/cn/hutool/poi/excel/ExcelExtractorUtil.java | 3 ++- .../hutool/poi/excel/reader/AbstractSheetReader.java | 2 +- .../cn/hutool/poi/excel/reader/ListSheetReader.java | 6 ++++-- .../hutool/poi/excel/sax/handler/BeanRowHandler.java | 11 ++++++----- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelExtractorUtil.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelExtractorUtil.java index db7022dff..1b5214469 100644 --- a/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelExtractorUtil.java +++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/ExcelExtractorUtil.java @@ -16,6 +16,7 @@ public class ExcelExtractorUtil { /** * 获取 {@link ExcelExtractor} 对象 * + * @param wb {@link Workbook} * @return {@link ExcelExtractor} */ public static ExcelExtractor getExtractor(Workbook wb) { @@ -32,7 +33,7 @@ public class ExcelExtractorUtil { * 读取为文本格式
* 使用{@link ExcelExtractor} 提取Excel内容 * - * @param wb {@link Workbook} + * @param wb {@link Workbook} * @param withSheetName 是否附带sheet名 * @return Excel文本 * @since 4.1.0 diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/reader/AbstractSheetReader.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/reader/AbstractSheetReader.java index 88f177c14..aa15e80cf 100644 --- a/hutool-poi/src/main/java/cn/hutool/poi/excel/reader/AbstractSheetReader.java +++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/reader/AbstractSheetReader.java @@ -130,9 +130,9 @@ public abstract class AbstractSheetReader implements SheetReader { /** * 读取某一行数据 * + * @param sheet {@link Sheet} * @param rowIndex 行号,从0开始 * @return 一行数据 - * @since 4.0.3 */ protected List readRow(Sheet sheet, int rowIndex) { return RowUtil.readRow(sheet.getRow(rowIndex), this.cellEditor); diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/reader/ListSheetReader.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/reader/ListSheetReader.java index df15aaff8..098398639 100644 --- a/hutool-poi/src/main/java/cn/hutool/poi/excel/reader/ListSheetReader.java +++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/reader/ListSheetReader.java @@ -15,13 +15,15 @@ import java.util.List; */ public class ListSheetReader extends AbstractSheetReader>> { + /** 是否首行作为标题行转换别名 */ private final boolean aliasFirstLine; /** * 构造 * - * @param startRowIndex 起始行(包含,从0开始计数) - * @param endRowIndex 结束行(包含,从0开始计数) + * @param startRowIndex 起始行(包含,从0开始计数) + * @param endRowIndex 结束行(包含,从0开始计数) + * @param aliasFirstLine 是否首行作为标题行转换别名 */ public ListSheetReader(int startRowIndex, int endRowIndex, boolean aliasFirstLine) { super(startRowIndex, endRowIndex); diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/handler/BeanRowHandler.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/handler/BeanRowHandler.java index ab618e565..bcfdcb91e 100644 --- a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/handler/BeanRowHandler.java +++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/handler/BeanRowHandler.java @@ -15,7 +15,7 @@ import java.util.List; * @author looly * @since 5.4.4 */ -public abstract class BeanRowHandler extends AbstractRowHandler{ +public abstract class BeanRowHandler extends AbstractRowHandler { /** * 标题所在行(从0开始计数) @@ -30,14 +30,15 @@ public abstract class BeanRowHandler extends AbstractRowHandler{ * 构造 * * @param headerRowIndex 标题所在行(从0开始计数) - * @param startRowIndex 读取起始行(包含,从0开始计数) - * @param endRowIndex 读取结束行(包含,从0开始计数) + * @param startRowIndex 读取起始行(包含,从0开始计数) + * @param endRowIndex 读取结束行(包含,从0开始计数) + * @param clazz Bean类型 */ - public BeanRowHandler(int headerRowIndex, int startRowIndex, int endRowIndex, Class clazz){ + public BeanRowHandler(int headerRowIndex, int startRowIndex, int endRowIndex, Class clazz) { super(startRowIndex, endRowIndex); Assert.isTrue(headerRowIndex <= startRowIndex, "Header row must before the start row!"); this.headerRowIndex = headerRowIndex; - this.convertFunc = (rowList)-> BeanUtil.toBean(IterUtil.toMap(headerList, rowList), clazz); + this.convertFunc = (rowList) -> BeanUtil.toBean(IterUtil.toMap(headerList, rowList), clazz); } @Override