From 11aa82e9072eb2eaa0f551e749ab04298ed83c66 Mon Sep 17 00:00:00 2001
From: Markus Kreth <markus.kreth@web.de>
Date: Fri, 2 Nov 2018 23:00:04 +0100
Subject: [PATCH] Calendar month title update

---
 .settings/org.eclipse.core.resources.prefs    |  1 +
 pom.xml                                       | 26 ++++---------
 .../ui/components/CalendarComponent.java      | 37 +++++++++----------
 src/main/resources/simplelogger.properties    |  3 +-
 4 files changed, 27 insertions(+), 40 deletions(-)

diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
index 29abf99..19a8b35 100644
--- a/.settings/org.eclipse.core.resources.prefs
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -3,4 +3,5 @@ encoding//src/main/java=UTF-8
 encoding//src/main/resources=UTF-8
 encoding//src/test/java=UTF-8
 encoding//src/test/resources=UTF-8
+encoding//target/generated-resources/gwt=UTF-8
 encoding/<project>=UTF-8
diff --git a/pom.xml b/pom.xml
index 34e9dc2..1cc36e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -222,18 +222,6 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
-			<!-- <plugin> -->
-			<!-- <groupId>org.apache.maven.plugins</groupId> -->
-			<!-- <artifactId>maven-compiler-plugin</artifactId> -->
-			<!-- <version>3.8.0</version> -->
-			<!-- <dependencies> -->
-			<!-- <dependency> -->
-			<!-- <groupId>org.ow2.asm</groupId> -->
-			<!-- <artifactId>asm</artifactId> -->
-			<!-- <version>6.2</version> -->
-			<!-- </dependency> -->
-			<!-- </dependencies> -->
-			<!-- </plugin> -->
 			<plugin>
 				<groupId>com.vaadin</groupId>
 				<artifactId>vaadin-maven-plugin</artifactId>
@@ -257,13 +245,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<!-- <configuration> -->
-				<!-- <argLine> -->
-				<!-- -javaagent:${sonar.jacoco.jar}=destfile=${sonar.jacoco.reportPath} -->
-				<!-- </argLine> -->
-				<!-- <test>**/*.java</test> -->
-				<!-- </configuration> -->
-
 				<dependencies>
 					<dependency>
 						<groupId>org.junit.jupiter</groupId>
@@ -296,6 +277,13 @@
 							<goal>check</goal>
 						</goals>
 					</execution>
+					<execution>
+						<id>jacoco-report</id>
+						<phase>test</phase>
+						<goals>
+							<goal>report</goal>
+						</goals>
+					</execution>
 				</executions>
 			</plugin>
 		</plugins>
diff --git a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/CalendarComponent.java b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/CalendarComponent.java
index 2cc2862..99f71aa 100644
--- a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/CalendarComponent.java
+++ b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/CalendarComponent.java
@@ -19,9 +19,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.vaadin.addon.calendar.Calendar;
 import org.vaadin.addon.calendar.item.BasicItemProvider;
-import org.vaadin.addon.calendar.ui.CalendarComponentEvents.BackwardHandler;
-import org.vaadin.addon.calendar.ui.CalendarComponentEvents.DateClickHandler;
-import org.vaadin.addon.calendar.ui.CalendarComponentEvents.ForwardHandler;
+import org.vaadin.addon.calendar.ui.CalendarComponentEvents.BackwardEvent;
+import org.vaadin.addon.calendar.ui.CalendarComponentEvents.ForwardEvent;
 import org.vaadin.addon.calendar.ui.CalendarComponentEvents.ItemClickHandler;
 
 import com.vaadin.contextmenu.ContextMenu;
@@ -71,6 +70,7 @@ public class CalendarComponent extends CustomComponent {
 				.withMonth(Month.from(LocalDateTime.now()));
 		calendar.setCaption("Events");
 		calendar.setSizeFull();
+		calendar.addListener(ev -> calendarEvent(ev));
 
 		updateMonthText(calendar.getStartDate());
 
@@ -79,6 +79,17 @@ public class CalendarComponent extends CustomComponent {
 		setCompositionRoot(layout);
 	}
 
+	private void calendarEvent(Event ev) {
+		log.debug("Event on calendar: {}", ev);
+		if (ev instanceof BackwardEvent || ev instanceof ForwardEvent) {
+			updateMonthText(calendar.getStartDate());
+		}
+	}
+
+	public Registration setHandler(ItemClickHandler listener) {
+		return calendar.setHandler(listener);
+	}
+
 	private void openPopupMenu(ClickEvent ev) {
 		ContextMenu contextMenu = new ContextMenu(ev.getButton(), true);
 		contextMenu.addItem("Export", ev1 -> calendarExport(ev1));
@@ -153,23 +164,9 @@ public class CalendarComponent extends CustomComponent {
 	}
 
 	private void updateMonthText(ZonedDateTime startDate) {
-		monthName.setValue(dfMonth.format(startDate));
-	}
-
-	public Registration setHandler(ForwardHandler listener) {
-		return calendar.setHandler(listener);
-	}
-
-	public Registration setHandler(BackwardHandler listener) {
-		return calendar.setHandler(listener);
-	}
-
-	public Registration setHandler(DateClickHandler listener) {
-		return calendar.setHandler(listener);
-	}
-
-	public Registration setHandler(ItemClickHandler listener) {
-		return calendar.setHandler(listener);
+		String monthValue = dfMonth.format(startDate);
+		log.debug("Changed Month title to {}", monthValue);
+		monthName.setValue(monthValue);
 	}
 
 	public void setItems(Collection<ClubEvent> items) {
diff --git a/src/main/resources/simplelogger.properties b/src/main/resources/simplelogger.properties
index 8dd5541..7f6fa4e 100644
--- a/src/main/resources/simplelogger.properties
+++ b/src/main/resources/simplelogger.properties
@@ -1,3 +1,4 @@
 org.slf4j.simpleLogger.defaultLogLevel = trace
-log4j.logger.org.hibernate.type=info
+log4j.logger.de.kreth.vaadin.clubhelper=trace
+log4j.logger.org.hibernate.type=warn
 log4j.logger.org.jboss.logging=warn
\ No newline at end of file