From ca46824dc9cb963d18a3e00c83b6135f084545c6 Mon Sep 17 00:00:00 2001
From: Markus Kreth <markus.kreth@web.de>
Date: Thu, 22 Aug 2019 19:55:00 +0200
Subject: [PATCH] Bugfix: export property start not calling uninitialized
 supplier

---
 .../ui/commands/ExportCalendarMonthCommand.java           | 8 ++++----
 .../ui/commands/ExportCalendarYearCommand.java            | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/commands/ExportCalendarMonthCommand.java b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/commands/ExportCalendarMonthCommand.java
index 641c5d5..1980860 100644
--- a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/commands/ExportCalendarMonthCommand.java
+++ b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/commands/ExportCalendarMonthCommand.java
@@ -21,12 +21,12 @@ public class ExportCalendarMonthCommand extends AbstractExportAction {
 
 	private transient DateTimeFormatter dfMonth = DateTimeFormatter.ofPattern("MMMM uuuu");
 
-	private ZonedDateTime start;
+	private Supplier<ZonedDateTime> startTime;
 
 	public ExportCalendarMonthCommand(Supplier<ZonedDateTime> startTime, Supplier<ZonedDateTime> endTime,
 			ClubEventProvider dataProvider, BiConsumer<String, JasperPrint> printConsumer) {
 		super(startTime, endTime, dataProvider, printConsumer);
-		this.start = startTime.get();
+		this.startTime = startTime;
 	}
 
 	@Override
@@ -41,12 +41,12 @@ public class ExportCalendarMonthCommand extends AbstractExportAction {
 
 	@Override
 	protected String getTitle() {
-		return dfMonth.format(start);
+		return dfMonth.format(startTime.get());
 	}
 
 	@Override
 	protected JasperPrint createPrint(Map<LocalDate, StringBuilder> values, List<LocalDate> holidays)
 			throws JRException {
-		return CalendarCreator.createCalendar(new Date(start.toInstant().toEpochMilli()), values, holidays);
+		return CalendarCreator.createCalendar(new Date(startTime.get().toInstant().toEpochMilli()), values, holidays);
 	}
 }
diff --git a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/commands/ExportCalendarYearCommand.java b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/commands/ExportCalendarYearCommand.java
index a7d980e..8e6257b 100644
--- a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/commands/ExportCalendarYearCommand.java
+++ b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/commands/ExportCalendarYearCommand.java
@@ -17,13 +17,13 @@ import net.sf.jasperreports.engine.JasperPrint;
 
 public class ExportCalendarYearCommand extends AbstractExportAction {
 
-	private ZonedDateTime start;
+	private Supplier<ZonedDateTime> startTime;
 
 	public ExportCalendarYearCommand(Supplier<ZonedDateTime> startTime, Supplier<ZonedDateTime> endTime,
 			ClubEventProvider dataProvider, BiConsumer<String, JasperPrint> printConsumer) {
 		super(() -> startTime.get().withDayOfYear(1), () -> startTime.get().withMonth(12).withDayOfMonth(31),
 				dataProvider, printConsumer);
-		this.start = startTime.get().withDayOfYear(1);
+		this.startTime = startTime;
 	}
 
 	@Override
@@ -38,12 +38,12 @@ public class ExportCalendarYearCommand extends AbstractExportAction {
 
 	@Override
 	protected String getTitle() {
-		return "Jahr " + start.getYear();
+		return "Jahr " + startTime.get().getYear();
 	}
 
 	@Override
 	protected JasperPrint createPrint(Map<LocalDate, StringBuilder> values, List<LocalDate> holidays)
 			throws JRException {
-		return CalendarCreator.createYearCalendar(start.getYear(), values, holidays);
+		return CalendarCreator.createYearCalendar(startTime.get().getYear(), values, holidays);
 	}
 }