All commands with icons

src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/data/BaseEntity.java

@@ -60,7 +60,8 @@ public abstract class BaseEntity implements EntityAccessor {
 		this.deleted = new Date(deleted.getTime());
 	}
 
-	public int getId() {
+	@Override
+	public Integer getId() {
 		return id;
 	}
 

src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/data/ClubEvent.java

@@ -150,6 +150,7 @@ public class ClubEvent extends BasicItem implements EntityAccessor {
 		// noCreateDateStored
 	}
 
+	@Override
 	public String getId() {
 		return id;
 	}

src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/data/EntityAccessor.java

@@ -4,6 +4,8 @@ import java.util.Date;
 
 public interface EntityAccessor {
 
+	Object getId();
+
 	boolean hasValidId();
 
 	void setChanged(Date changed);

src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/commands/AddPersonCommand.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.function.Consumer;
 
+import com.vaadin.icons.VaadinIcons;
 import com.vaadin.server.Resource;
 
 import de.kreth.vaadin.clubhelper.vaadinclubhelper.data.GroupDef;
@@ -28,7 +29,7 @@ public class AddPersonCommand implements ClubCommand {
 
 	@Override
 	public Resource getIcon() {
-		return null;
+		return VaadinIcons.USER_STAR;
 	}
 
 	@Override

src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/commands/CreateMeldungCommand.java

@@ -4,6 +4,7 @@ import java.util.function.Consumer;
 
 import org.springframework.context.ApplicationContext;
 
+import com.vaadin.icons.VaadinIcons;
 import com.vaadin.server.Resource;
 
 import de.kreth.vaadin.clubhelper.vaadinclubhelper.business.EventBusiness;
@@ -27,7 +28,7 @@ public class CreateMeldungCommand implements ClubCommand {
 
 	@Override
 	public Resource getIcon() {
-		return null;
+		return VaadinIcons.NEWSPAPER;
 	}
 
 	@Override

src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/commands/LoginCommand.java

@@ -27,7 +27,7 @@ public class LoginCommand implements ClubCommand {
 
 	@Override
 	public Resource getIcon() {
-		return VaadinIcons.USER;
+		return VaadinIcons.SIGN_IN;
 	}
 
 }

src/main/java/de/kreth/vaadin/clubhelper/vaadinclubhelper/ui/commands/LogoutCommand.java

@@ -26,7 +26,7 @@ public class LogoutCommand implements ClubCommand {
 
 	@Override
 	public Resource getIcon() {
-		return VaadinIcons.USER;
+		return VaadinIcons.SIGN_OUT;
 	}
 
 	@Override

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

@@ -35,4 +35,7 @@ public class CommandWrapper implements Command, ClubCommand {
 		command.execute();
 	}
 
+	MenuItem addTo(MenuItem parent) {
+		return parent.addItem(getLabel(), getIcon(), this);
+	}
 }

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

@@ -54,16 +54,18 @@ class LoggedOffState implements MenuItemState {
 
 		CommandWrapper exportCalendarMonthCommand = new CommandWrapper(
 				new ExportCalendarMonthCommand(startProvider, endProvider, dataProvider, printConsumer));
-		fileMenu.addItem(exportCalendarMonthCommand.getLabel(), exportCalendarMonthCommand);
+		exportCalendarMonthCommand.addTo(fileMenu);
+
 		ClubCommand exportCalendarYearCommand = new ExportCalendarYearCommand(startProvider, endProvider, dataProvider,
 				printConsumer);
-		fileMenu.addItem(exportCalendarYearCommand.getLabel(), new CommandWrapper(exportCalendarYearCommand));
+		new CommandWrapper(exportCalendarYearCommand).addTo(fileMenu);
-		ClubCommand exportCsvCommand = new ExportCsvCommand(menuBar, context);
+
-		fileMenu.addItem(exportCsvCommand.getLabel(), ev -> exportCsvCommand.execute());
+		CommandWrapper exportCsvCommand = new CommandWrapper(new ExportCsvCommand(menuBar, context));
+		exportCsvCommand.addTo(fileMenu);
 
 		fileMenu.addSeparator();
-		ClubCommand loginCommand = loginOutCommand();
+		CommandWrapper loginCommand = new CommandWrapper(loginOutCommand());
-		fileMenu.addItem(loginCommand.getLabel(), new CommandWrapper(loginCommand));
+		loginCommand.addTo(fileMenu);
 
 	}
 

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

@@ -44,7 +44,7 @@ class LoggedinEditPersonViewMenuitemState extends LoggedinMenuitemState {
 
 		GroupDef defaultGroup = groupDao.get(1);
 		editMenu.addSeparator();
-		AddPersonCommand addPersonCommand = new AddPersonCommand(newPersonConsumer, defaultGroup);
+		CommandWrapper addPersonCommand = new CommandWrapper(new AddPersonCommand(newPersonConsumer, defaultGroup));
-		editMenu.addItem(addPersonCommand.getLabel(), new CommandWrapper(addPersonCommand));
+		addPersonCommand.addTo(editMenu);
 	}
 }

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

@@ -101,17 +101,17 @@ class LoggedinMenuitemState extends LoggedOffState {
 
 		CommandWrapper calendarView = new CommandWrapper(
 				new SwitchViewCommand(context, "Hauptansicht", VaadinIcons.CALENDAR, ClubhelperViews.MainView));
-		calendarMenuItem = viewMenu.addItem(calendarView.getLabel(), calendarView);
+		calendarMenuItem = calendarView.addTo(viewMenu);
 		calendarMenuItem.setCheckable(true);
 
 		CommandWrapper openPersonEditor = new CommandWrapper(
 				new SwitchViewCommand(context, "Personen verwalten", VaadinIcons.EDIT, ClubhelperViews.PersonEditView));
-		openPersonMenuItem = viewMenu.addItem(openPersonEditor.getLabel(), openPersonEditor);
+		openPersonMenuItem = openPersonEditor.addTo(viewMenu);
 		openPersonMenuItem.setCheckable(true);
 
 		CommandWrapper detailViewCommand = new CommandWrapper(
 				new SwitchViewCommand(context, "Veranstaltung Detail", null, ClubhelperViews.EventDetails));
-		eventDetailItem = viewMenu.addItem(detailViewCommand.getLabel(), detailViewCommand);
+		eventDetailItem = detailViewCommand.addTo(viewMenu);
 		eventDetailItem.setCheckable(true);
 	}
 
@@ -119,12 +119,11 @@ class LoggedinMenuitemState extends LoggedOffState {
 		MenuItem editMenu = menuBar.getEditMenuItem();
 		editMenu.setVisible(true);
 
-		CreateMeldungCommand createMeldungCommand = new CreateMeldungCommand(context, this::show);
+		CommandWrapper createMeldungCommand = new CommandWrapper(new CreateMeldungCommand(context, this::show));
-		createMeldungMenuItem = editMenu.addItem(createMeldungCommand.getLabel(),
+		createMeldungMenuItem = createMeldungCommand.addTo(editMenu);
-				new CommandWrapper(createMeldungCommand));
 
 		CommandWrapper deleeteEvent = new CommandWrapper(new DeleteEventCommand(this::deleteEvent));
-		deleteMenuItem = editMenu.addItem(deleeteEvent.getLabel(), deleeteEvent);
+		deleteMenuItem = deleeteEvent.addTo(editMenu);
 
 	}