Refactoring HeadComponent

master
Markus Kreth 7 years ago
parent a3d6af41ba
commit 2bec4b11df
  1. 6
      src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/HeadView.java
  2. 5
      src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/MainView.java

@ -1,4 +1,4 @@
package de.kreth.vaadin.clubhelper.vaadinclubhelper.ui.components; package de.kreth.vaadin.clubhelper.vaadinclubhelper.ui;
import java.io.IOException; import java.io.IOException;
import java.io.PipedInputStream; import java.io.PipedInputStream;
@ -38,7 +38,7 @@ import net.sf.jasperreports.engine.JRException;
import net.sf.jasperreports.engine.JasperExportManager; import net.sf.jasperreports.engine.JasperExportManager;
import net.sf.jasperreports.engine.JasperPrint; import net.sf.jasperreports.engine.JasperPrint;
public class HeadComponent extends HorizontalLayout { public class HeadView extends HorizontalLayout {
private static final long serialVersionUID = -7915475211371903028L; private static final long serialVersionUID = -7915475211371903028L;
@ -54,7 +54,7 @@ public class HeadComponent extends HorizontalLayout {
private int monthItemId; private int monthItemId;
public HeadComponent(Supplier<ZonedDateTime> startTime, Supplier<ZonedDateTime> endTime, public HeadView(Supplier<ZonedDateTime> startTime, Supplier<ZonedDateTime> endTime,
ClubEventProvider dataProvider) { ClubEventProvider dataProvider) {
monthName = new Label(); monthName = new Label();

@ -24,7 +24,6 @@ import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.ClubEvent;
import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.Person; import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.Person;
import de.kreth.vaadin.clubhelper.vaadinclubhelper.ui.components.CalendarComponent; import de.kreth.vaadin.clubhelper.vaadinclubhelper.ui.components.CalendarComponent;
import de.kreth.vaadin.clubhelper.vaadinclubhelper.ui.components.CalendarComponent.ClubEventProvider; import de.kreth.vaadin.clubhelper.vaadinclubhelper.ui.components.CalendarComponent.ClubEventProvider;
import de.kreth.vaadin.clubhelper.vaadinclubhelper.ui.components.HeadComponent;
import de.kreth.vaadin.clubhelper.vaadinclubhelper.ui.components.PersonEditDialog; import de.kreth.vaadin.clubhelper.vaadinclubhelper.ui.components.PersonEditDialog;
import de.kreth.vaadin.clubhelper.vaadinclubhelper.ui.components.PersonGrid; 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.components.SingleEventView;
@ -46,7 +45,7 @@ public class MainView extends BorderLayout implements View {
private EventBusiness eventBusiness; private EventBusiness eventBusiness;
private Navigator navigator; private Navigator navigator;
private HeadComponent head; private HeadView head;
private SingleEventView eventView; private SingleEventView eventView;
@ -98,7 +97,7 @@ public class MainView extends BorderLayout implements View {
calendar.setId("main.calendar"); calendar.setId("main.calendar");
calendar.setHandler(this::onItemClick); calendar.setHandler(this::onItemClick);
head = new HeadComponent(() -> calendar.getStartDate(), () -> calendar.getEndDate(), dataProvider); head = new HeadView(() -> calendar.getStartDate(), () -> calendar.getEndDate(), dataProvider);
head.updateMonthText(calendar.getStartDate()); head.updateMonthText(calendar.getStartDate());
calendar.add(dateTime -> head.updateMonthText(dateTime)); calendar.add(dateTime -> head.updateMonthText(dateTime));

Loading…
Cancel
Save