diff --git a/.classpath b/.classpath index 2323c6f..9305bd2 100644 --- a/.classpath +++ b/.classpath @@ -30,12 +30,14 @@ - + + + - + diff --git a/.settings/com.vaadin.integration.eclipse.prefs b/.settings/com.vaadin.integration.eclipse.prefs index 9834749..6070504 100644 --- a/.settings/com.vaadin.integration.eclipse.prefs +++ b/.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 diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs index 6d88dab..f004f42 100644 --- a/.settings/org.eclipse.core.resources.prefs +++ b/.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/=UTF-8 diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index f6255c7..bdb8c1a 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.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.compliance=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +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.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml index 2d1f631..bd563f8 100644 --- a/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -3,6 +3,6 @@ - + diff --git a/pom.xml b/pom.xml index b7f4575..c15da27 100644 --- a/pom.xml +++ b/pom.xml @@ -19,17 +19,15 @@ org.springframework.boot spring-boot-starter-parent - 2.1.0.RELEASE + 2.1.1.RELEASE UTF-8 UTF-8 - 1.8 - ${java.version} - ${java.version} - 8.5.2 + 11 + 8.6.2 1.23.0 v4-rev488-1.23.0 v3-rev271-1.23.0 @@ -250,6 +248,13 @@ true + + org.apache.maven.plugins + maven-compiler-plugin + + ${java.version} + + org.apache.maven.plugins diff --git a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/VaadinClubhelperApplication.java b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/VaadinClubhelperApplication.java index b70578a..c7f010e 100644 --- a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/VaadinClubhelperApplication.java +++ b/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); + } } diff --git a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/MainUi.java b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/MainUi.java index f7fc60d..5123848 100644 --- a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/MainUi.java +++ b/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 ev) { Set 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.addComponent(personGrid); +// contentLayout.removeComponent(personGrid); +// contentLayout.addComponent(personGrid); eventBusiness.setSelected(null); - personGrid.setEnabled(false); - personGrid.setEvent(ev); - personGrid.setVisible(true); - personGrid.setEnabled(true); +// personGrid.setEnabled(false); +// personGrid.setEvent(ev); +// personGrid.setVisible(true); +// personGrid.setEnabled(true); eventBusiness.setSelected(ev); } 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 944e491..bbabeda 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 @@ -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; diff --git a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/PersonGrid.java b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/PersonGrid.java index bd3dd70..959b67b 100644 --- a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/PersonGrid.java +++ b/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> dataProvider; private final Grid grid; - private final CheckBox checkIncluded; private final ComboBox comboGroups; - private final TextField textTitle; private transient ClosedFunction closedFunction = null; - private ConfigurableFilterDataProvider> dataProvider; + private transient Consumer onPersonEdit; private Boolean selectedOnlyFilter; + private Set groupMemberFilter; private List allGroups; - private Consumer onPersonEdit; public PersonGrid(GroupDao groupDao) { diff --git a/src/main/webapp/VAADIN/themes/vaadin-clubhelpertheme/styles.css b/src/main/webapp/VAADIN/themes/vaadin-clubhelpertheme/styles.css index f78b290..70d217b 100644 --- a/src/main/webapp/VAADIN/themes/vaadin-clubhelpertheme/styles.css +++ b/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; }