Skip to content

Commit f1ebd4a

Browse files
authored
Merge pull request #5 from spacious-team/develop
Релиз 2022.2
2 parents e61c090 + be4c4bd commit f1ebd4a

File tree

9 files changed

+24
-14
lines changed

9 files changed

+24
-14
lines changed

.idea/copyright/GNU_AGPLv3.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
~ Table Wrapper Excel Impl
4-
~ Copyright (C) 2020 Vitalii Ananev <an-vitek@ya.ru>
4+
~ Copyright (C) 2020 Vitalii Ananev <spacious-team@ya.ru>
55
~
66
~ This program is free software: you can redistribute it and/or modify
77
~ it under the terms of the GNU Affero General Public License as
@@ -24,13 +24,13 @@
2424

2525
<groupId>org.spacious-team</groupId>
2626
<artifactId>table-wrapper-excel-impl</artifactId>
27-
<version>2021.4</version>
27+
<version>2022.2</version>
2828
<packaging>jar</packaging>
2929

3030
<name>Table Wrapper API Excel Implementation</name>
3131
<description>
3232
Implements unified Table Wrapper API for excel format and helps to
33-
easily search and access to rows, columns, and cell values.
33+
easily search and access to row, column, and cell value.
3434
</description>
3535
<url>https://github.com/spacious-team/table-wrapper-excel-impl</url>
3636

@@ -71,7 +71,7 @@
7171
<dependency>
7272
<groupId>com.github.spacious-team</groupId>
7373
<artifactId>table-wrapper-api</artifactId>
74-
<version>2021.4</version>
74+
<version>2022.2</version>
7575
</dependency>
7676
<dependency>
7777
<groupId>org.apache.poi</groupId>
@@ -86,7 +86,7 @@
8686
<dependency>
8787
<groupId>org.projectlombok</groupId>
8888
<artifactId>lombok</artifactId>
89-
<version>1.18.12</version>
89+
<version>1.18.22</version>
9090
<scope>provided</scope>
9191
<optional>true</optional>
9292
</dependency>

src/main/java/org/spacious_team/table_wrapper/excel/ExcelCellDataAccessObject.java

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Table Wrapper Excel Impl
3-
* Copyright (C) 2021 Vitalii Ananev <an-vitek@ya.ru>
3+
* Copyright (C) 2021 Vitalii Ananev <spacious-team@ya.ru>
44
*
55
* This program is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU Affero General Public License as
@@ -47,6 +47,16 @@ public Object getValue(Cell cell) {
4747
};
4848
}
4949

50+
@Override
51+
public String getStringValue(Cell cell) {
52+
Object value = getValue(cell);
53+
String strValue = value.toString();
54+
if ((value instanceof Number) && strValue.endsWith(".0")) {
55+
return strValue.substring(0, strValue.length() - 2);
56+
}
57+
return strValue;
58+
}
59+
5060
@Override
5161
public Instant getInstantValue(Cell cell) {
5262
return cell.getDateCellValue().toInstant();

src/main/java/org/spacious_team/table_wrapper/excel/ExcelSheet.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Table Wrapper Excel Impl
3-
* Copyright (C) 2020 Vitalii Ananev <an-vitek@ya.ru>
3+
* Copyright (C) 2020 Vitalii Ananev <spacious-team@ya.ru>
44
*
55
* This program is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU Affero General Public License as

src/main/java/org/spacious_team/table_wrapper/excel/ExcelTable.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Table Wrapper Excel Impl
3-
* Copyright (C) 2020 Vitalii Ananev <an-vitek@ya.ru>
3+
* Copyright (C) 2020 Vitalii Ananev <spacious-team@ya.ru>
44
*
55
* This program is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU Affero General Public License as

src/main/java/org/spacious_team/table_wrapper/excel/ExcelTableCell.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Table Wrapper Excel Impl
3-
* Copyright (C) 2020 Vitalii Ananev <an-vitek@ya.ru>
3+
* Copyright (C) 2020 Vitalii Ananev <spacious-team@ya.ru>
44
*
55
* This program is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU Affero General Public License as

src/main/java/org/spacious_team/table_wrapper/excel/ExcelTableFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Table Wrapper Excel Impl
3-
* Copyright (C) 2020 Vitalii Ananev <an-vitek@ya.ru>
3+
* Copyright (C) 2020 Vitalii Ananev <spacious-team@ya.ru>
44
*
55
* This program is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU Affero General Public License as

src/main/java/org/spacious_team/table_wrapper/excel/ExcelTableHelper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Table Wrapper Excel Impl
3-
* Copyright (C) 2020 Vitalii Ananev <an-vitek@ya.ru>
3+
* Copyright (C) 2020 Vitalii Ananev <spacious-team@ya.ru>
44
*
55
* This program is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU Affero General Public License as
@@ -38,7 +38,7 @@ class ExcelTableHelper {
3838
* @param endRow search rows excluding this, can handle values greater than real rows count
3939
* @param startColumn search columns start from this
4040
* @param endColumn search columns excluding this, can handle values greater than real columns count
41-
* @return table table cell address or {@link TableCellAddress#NOT_FOUND}
41+
* @return table cell address or {@link TableCellAddress#NOT_FOUND}
4242
*/
4343
static TableCellAddress find(Sheet sheet, Object value, int startRow, int endRow,
4444
int startColumn, int endColumn,

src/main/java/org/spacious_team/table_wrapper/excel/ExcelTableRow.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Table Wrapper Excel Impl
3-
* Copyright (C) 2020 Vitalii Ananev <an-vitek@ya.ru>
3+
* Copyright (C) 2020 Vitalii Ananev <spacious-team@ya.ru>
44
*
55
* This program is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU Affero General Public License as

0 commit comments

Comments
 (0)