Merge branch 'working'

.classpath

@@ -30,12 +30,14 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+	<classpathentry kind="src" output="target/classes" path="target/generated-resources/gwt">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="optional" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="target/generated-resources/gwt">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

.settings/com.vaadin.integration.eclipse.prefs

@@ -1,2 +1,2 @@
-com.vaadin.integration.eclipse.mavenLatestVersionsUpgrade=["8.4.5","8.5.2"]
+com.vaadin.integration.eclipse.mavenLatestVersionsUpgrade=["8.6.2"]
 eclipse.preferences.version=1

.settings/org.eclipse.core.resources.prefs

@@ -5,5 +5,4 @@ encoding//src/main/resources/jasper/calendar_month.jrxml=UTF-8
 encoding//src/main/resources/jasper/calendar_year.jrxml=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

.settings/org.eclipse.jdt.core.prefs

@@ -1,10 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.source=11

.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -3,6 +3,6 @@
   <fixed facet="wst.jsdt.web"/>
   <installed facet="jpt.jpa" version="2.1"/>
   <installed facet="wst.jsdt.web" version="1.0"/>
-  <installed facet="java" version="1.8"/>
   <installed facet="jst.web" version="4.0"/>
+  <installed facet="java" version="11"/>
 </faceted-project>

pom.xml

@@ -19,17 +19,15 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.1.0.RELEASE</version>
+		<version>2.1.1.RELEASE</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<java.version>1.8</java.version>
+		<java.version>11</java.version>
-		<maven.compiler.source>${java.version}</maven.compiler.source>
+		<vaadin.version>8.6.2</vaadin.version>
-		<maven.compiler.target>${java.version}</maven.compiler.target>
-		<vaadin.version>8.5.2</vaadin.version>
 		<google-api-version>1.23.0</google-api-version>
 		<google-api-sheets-version>v4-rev488-1.23.0</google-api-sheets-version>
 		<google-api-calendar-version>v3-rev271-1.23.0</google-api-calendar-version>
@@ -250,6 +248,13 @@
 					<gwtSdkFirstInClasspath>true</gwtSdkFirstInClasspath>
 				</configuration>
 			</plugin>
+			<plugin> 
+				<groupId>org.apache.maven.plugins</groupId> 
+				<artifactId>maven-compiler-plugin</artifactId> 
+				<configuration> 
+					<release>${java.version}</release> 
+				</configuration> 
+			</plugin> 
 
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>

src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/VaadinClubhelperApplication.java

@@ -2,13 +2,20 @@ package de.kreth.vaadin.clubhelper.vaadinclubhelper;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
 @EnableScheduling
-public class VaadinClubhelperApplication {
+public class VaadinClubhelperApplication extends SpringBootServletInitializer {
 
 	public static void main(String[] args) {
 		SpringApplication.run(VaadinClubhelperApplication.class, args);
 	}
+
+	@Override
+	protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
+		return builder.sources(VaadinClubhelperApplication.class);
+	}
 }

src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/MainUi.java

@@ -30,7 +30,7 @@ import de.kreth.vaadin.clubhelper.vaadinclubhelper.ui.components.PersonGrid;
 
 @Theme("vaadin-clubhelpertheme")
 @SpringUI
-@Push(value=PushMode.MANUAL)
+@Push(value = PushMode.MANUAL)
 public class MainUi extends UI {
 
 	private static final long serialVersionUID = 7581634188909841919L;
@@ -41,7 +41,7 @@ public class MainUi extends UI {
 
 	@Autowired
 	GroupDao groupDao;
-	
+
 	@Autowired
 	EventBusiness eventBusiness;
 
@@ -70,7 +70,7 @@ public class MainUi extends UI {
 		contentLayout = new HorizontalLayout();
 		contentLayout.setSizeFull();
 		contentLayout.addComponents(calendar);
-		
+
 		setContent(contentLayout);
 		setSizeFull();
 
@@ -84,7 +84,7 @@ public class MainUi extends UI {
 				calendar.setItems(events);
 				ui.push();
 			});
-			
+
 		});
 		exec.shutdown();
 		LOGGER.info("Loaded UI and started fetch of Events");
@@ -94,7 +94,7 @@ public class MainUi extends UI {
 		PersonEditDialog dlg = new PersonEditDialog(groupDao.listAll(), p, personDao);
 		getUI().addWindow(dlg);
 	}
-	
+
 	private void personSelectionChange(SelectionEvent<Person> ev) {
 		Set<Person> selected = ev.getAllSelectedItems();
 		LOGGER.debug("Selection changed to: {}", selected);
@@ -110,14 +110,14 @@ public class MainUi extends UI {
 		ClubEvent ev = (ClubEvent) event.getCalendarItem();
 		LOGGER.debug("Opening detail view for {}", ev);
 
-		contentLayout.removeComponent(personGrid);
+//		contentLayout.removeComponent(personGrid);
-		contentLayout.addComponent(personGrid);
+//		contentLayout.addComponent(personGrid);
 
 		eventBusiness.setSelected(null);
-		personGrid.setEnabled(false);
+//		personGrid.setEnabled(false);
-		personGrid.setEvent(ev);
+//		personGrid.setEvent(ev);
-		personGrid.setVisible(true);
+//		personGrid.setVisible(true);
-		personGrid.setEnabled(true);
+//		personGrid.setEnabled(true);
 		eventBusiness.setSelected(ev);
 	}
 

src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/CalendarComponent.java

@@ -25,7 +25,6 @@ import org.vaadin.addon.calendar.ui.CalendarComponentEvents.ForwardEvent;
 import org.vaadin.addon.calendar.ui.CalendarComponentEvents.ItemClickHandler;
 
 import com.vaadin.contextmenu.ContextMenu;
-import com.vaadin.contextmenu.MenuItem;
 import com.vaadin.server.StreamResource;
 import com.vaadin.shared.Registration;
 import com.vaadin.ui.AbstractComponent;
@@ -35,6 +34,7 @@ import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.CustomComponent;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
+import com.vaadin.ui.MenuBar.MenuItem;
 import com.vaadin.ui.Notification;
 import com.vaadin.ui.VerticalLayout;
 import com.vaadin.ui.Window;

src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/PersonGrid.java

@@ -41,23 +41,22 @@ import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.Person;
 public class PersonGrid extends CustomComponent {
 
 	private static final long serialVersionUID = -8148097982839343673L;
-	private transient final Logger log = LoggerFactory.getLogger(getClass());
+	private final transient Logger log = LoggerFactory.getLogger(getClass());
 
-	private final DateTimeFormatter birthFormat = DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM);
+	private final transient DateTimeFormatter birthFormat = DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM);
+	private final ConfigurableFilterDataProvider<Person, Void, SerializablePredicate<Person>> dataProvider;
 
 	private final Grid<Person> grid;
-
 	private final CheckBox checkIncluded;
 	private final ComboBox<GroupDef> comboGroups;
-
 	private final TextField textTitle;
 
 	private transient ClosedFunction closedFunction = null;
-	private ConfigurableFilterDataProvider<Person, Void, SerializablePredicate<Person>> dataProvider;
+	private transient Consumer<Person> onPersonEdit;
 	private Boolean selectedOnlyFilter;
+
 	private Set<GroupDef> groupMemberFilter;
 	private List<GroupDef> allGroups;
-	private Consumer<Person> onPersonEdit;
 
 	public PersonGrid(GroupDao groupDao) {
 

src/main/webapp/VAADIN/themes/vaadin-clubhelpertheme/styles.css

@@ -1091,7 +1091,7 @@
  */
 
 .v-vaadin-version:after {
-	content: "8.5.2";
+	content: "8.6.2";
 }
 
 .v-widget {
@@ -4903,6 +4903,10 @@ div.v-layout.v-horizontal.v-widget {
 	left: 0;
 }
 
+.vaadin-clubhelpertheme .v-grid-body .v-grid-header > .v-grid-row {
+	position: relative;
+}
+
 .vaadin-clubhelpertheme .v-grid-row {
 	display: block;
 }
@@ -9551,6 +9555,10 @@ div.v-layout.v-horizontal.v-widget {
 	left: 0;
 }
 
+.vaadin-clubhelpertheme .v-tree8-body .v-tree8-header > .v-tree8-row {
+	position: relative;
+}
+
 .vaadin-clubhelpertheme .v-tree8-row {
 	display: block;
 }
@@ -10629,6 +10637,10 @@ div.v-layout.v-horizontal.v-widget {
 	left: 0;
 }
 
+.vaadin-clubhelpertheme .v-treegrid-body .v-treegrid-header > .v-treegrid-row {
+	position: relative;
+}
+
 .vaadin-clubhelpertheme .v-treegrid-row {
 	display: block;
 }
@@ -13007,6 +13019,14 @@ div.v-layout.v-horizontal.v-widget {
 	text-align: right;
 }
 
+.vaadin-clubhelpertheme .v-tabsheet-right-aligned-tabs .v-tabsheet-spacertd {
+	display: inline-block !important;
+}
+
+.vaadin-clubhelpertheme .v-tabsheet-right-aligned-tabs .v-tabsheet-scroller {
+	padding-left: 9px;
+}
+
 .vaadin-clubhelpertheme .v-tabsheet-padded-tabbar  > .v-tabsheet-tabcontainer .v-tabsheet-tabs {
 	padding: 0 9px;
 }