From 0bf7f3a0396860acbb8435b2c8e23c162ac2c7df Mon Sep 17 00:00:00 2001 From: Markus Kreth Date: Wed, 30 Jan 2019 17:03:29 +0100 Subject: [PATCH] Refactoring: moved Event View into components packaage --- .../kreth/vaadin/clubhelper/vaadinclubhelper/ui/MainUi.java | 1 + .../vaadin/clubhelper/vaadinclubhelper/ui/MainView.java | 1 + .../vaadinclubhelper/ui/{ => components}/EventDetails.java | 6 ++---- 3 files changed, 4 insertions(+), 4 deletions(-) rename src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/{ => components}/EventDetails.java (91%) 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 dd1b2be..cfd1575 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 @@ -19,6 +19,7 @@ import de.kreth.vaadin.clubhelper.vaadinclubhelper.dao.GroupDao; import de.kreth.vaadin.clubhelper.vaadinclubhelper.dao.PersonDao; import de.kreth.vaadin.clubhelper.vaadinclubhelper.dao.PflichtenDao; import de.kreth.vaadin.clubhelper.vaadinclubhelper.security.SecurityVerifier; +import de.kreth.vaadin.clubhelper.vaadinclubhelper.ui.components.EventDetails; @Theme("vaadin-clubhelpertheme") @SpringUI diff --git a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/MainView.java b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/MainView.java index 65407f0..4bf0b7d 100644 --- a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/MainView.java +++ b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/MainView.java @@ -25,6 +25,7 @@ import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.ClubEvent; import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.Person; import de.kreth.vaadin.clubhelper.vaadinclubhelper.security.SecurityVerifier; import de.kreth.vaadin.clubhelper.vaadinclubhelper.ui.components.CalendarComponent; +import de.kreth.vaadin.clubhelper.vaadinclubhelper.ui.components.EventDetails; import de.kreth.vaadin.clubhelper.vaadinclubhelper.ui.components.CalendarComponent.ClubEventProvider; import de.kreth.vaadin.clubhelper.vaadinclubhelper.ui.components.PersonGrid; import de.kreth.vaadin.clubhelper.vaadinclubhelper.ui.components.SingleEventView; diff --git a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/EventDetails.java b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/EventDetails.java similarity index 91% rename from src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/EventDetails.java rename to src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/EventDetails.java index ba9ec4f..dcdce7c 100644 --- a/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/EventDetails.java +++ b/src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/components/EventDetails.java @@ -1,4 +1,4 @@ -package de.kreth.vaadin.clubhelper.vaadinclubhelper.ui; +package de.kreth.vaadin.clubhelper.vaadinclubhelper.ui.components; import com.vaadin.navigator.Navigator; import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent; @@ -17,9 +17,7 @@ import de.kreth.vaadin.clubhelper.vaadinclubhelper.dao.GroupDao; import de.kreth.vaadin.clubhelper.vaadinclubhelper.dao.PersonDao; import de.kreth.vaadin.clubhelper.vaadinclubhelper.dao.PflichtenDao; import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.ClubEvent; -import de.kreth.vaadin.clubhelper.vaadinclubhelper.ui.components.EventAltersgruppen; -import de.kreth.vaadin.clubhelper.vaadinclubhelper.ui.components.PersonGrid; -import de.kreth.vaadin.clubhelper.vaadinclubhelper.ui.components.SingleEventView; +import de.kreth.vaadin.clubhelper.vaadinclubhelper.ui.NamedView; public class EventDetails extends GridLayout implements NamedView {