Skip to content

Commit 944775d

Browse files
committed
Update dependencies
1 parent 1cdef8f commit 944775d

File tree

2 files changed

+18
-5
lines changed

2 files changed

+18
-5
lines changed

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,20 +65,20 @@
6565
<dependency>
6666
<groupId>junit</groupId>
6767
<artifactId>junit</artifactId>
68-
<version>4.11</version>
68+
<version>4.13.2</version>
6969
<scope>test</scope>
7070
</dependency>
7171

7272
<dependency>
7373
<groupId>org.dhatim</groupId>
7474
<artifactId>fastexcel</artifactId>
75-
<version>0.9.3</version>
75+
<version>0.12.14</version>
7676
</dependency>
7777

7878
<dependency>
7979
<groupId>com.google.code.gson</groupId>
8080
<artifactId>gson</artifactId>
81-
<version>2.8.5</version>
81+
<version>2.9.0</version>
8282
</dependency>
8383
</dependencies>
8484
</project>

src/main/java/com/comphenix/rema1000/io/excel/CellStyle.java

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020

2121
import java.sql.Date;
2222
import java.time.Instant;
23+
import java.time.LocalDate;
24+
import java.time.LocalDateTime;
25+
import java.time.ZonedDateTime;
2326

2427
@FunctionalInterface
2528
public interface CellStyle {
@@ -40,12 +43,22 @@ public interface CellStyle {
4043
* @param style the style.
4144
*/
4245
public static void writeStyled(Worksheet worksheet, int row, int column, Object value, CellStyle style) {
43-
if (value instanceof Instant) {
46+
if (value instanceof LocalDate) {
47+
worksheet.value(row, column, (LocalDate) value);
48+
} else if (value instanceof LocalDateTime) {
49+
worksheet.value(row, column, (LocalDateTime) value);
50+
} else if (value instanceof ZonedDateTime) {
51+
worksheet.value(row, column, (ZonedDateTime) value);
52+
} else if (value instanceof Instant) {
4453
worksheet.value(row, column, Date.from((Instant) value));
54+
} else if (value instanceof Date) {
55+
worksheet.value(row, column, (Date) value);
4556
} else if (value instanceof Boolean) {
4657
worksheet.value(row, column, (Boolean)value ? "True" : "False");
58+
} else if (value instanceof Number) {
59+
worksheet.value(row, column, (Number) value);
4760
} else {
48-
worksheet.value(row, column, value);
61+
worksheet.value(row, column, value != null ? value.toString() : null);
4962
}
5063

5164
if (style != null) {

0 commit comments

Comments
 (0)