Removed brands and replaced them with fuel

Author: JohannesRabauer

vaadin-breadcrumbs-demo/src/main/java/software/xdev/vaadin/view/MainLayout.java

@@ -14,9 +14,9 @@
 
 import software.xdev.vaadin.breadcrumbs.Breadcrumbs;
 import software.xdev.vaadin.view.cars.CarsView;
-import software.xdev.vaadin.view.cars.brand.AudiView;
-import software.xdev.vaadin.view.cars.brand.BMWView;
-import software.xdev.vaadin.view.cars.brand.PorscheView;
+import software.xdev.vaadin.view.cars.brand.ElectricView;
+import software.xdev.vaadin.view.cars.brand.GasolineView;
+import software.xdev.vaadin.view.cars.brand.HybridView;
 
 
 @PageTitle("Breadcrumb Demo")
@@ -38,9 +38,18 @@ public MainLayout()
 			this.getTranslation(SIDE_NAV_I18N_PREFIX + "cars"),
 			CarsView.class,
 			VaadinIcon.CAR.create());
-		carsItem.addItem(new SideNavItem("Audi", AudiView.class));
-		carsItem.addItem(new SideNavItem("BMW", BMWView.class));
-		carsItem.addItem(new SideNavItem("Porsche", PorscheView.class));
+		carsItem.addItem(new SideNavItem(
+			this.getTranslation(SIDE_NAV_I18N_PREFIX + "electric"),
+			ElectricView.class,
+			VaadinIcon.BOLT.create()));
+		carsItem.addItem(new SideNavItem(
+			this.getTranslation(SIDE_NAV_I18N_PREFIX + "hybrid"),
+			HybridView.class,
+			VaadinIcon.GLOBE.create()));
+		carsItem.addItem(new SideNavItem(
+			this.getTranslation(SIDE_NAV_I18N_PREFIX + "gasoline"),
+			GasolineView.class,
+			VaadinIcon.FIRE.create()));
 
 		sideNav.addItem(Objects.requireNonNull(carsItem));
 

vaadin-breadcrumbs-demo/src/main/java/software/xdev/vaadin/view/cars/AbstractCarView.java

@@ -7,9 +7,9 @@
 
 public abstract class AbstractCarView extends VerticalLayout
 {
-	protected static final String AUDI = "Audi";
-	protected static final String BMW = "BMW";
-	protected static final String PORSCHE = "Porsche";
+	protected static final String ELECTRIC = "electric";
+	protected static final String HYBRID = "hybrid";
+	protected static final String GASOLINE = "gasoline";
 
 	protected AbstractCarView()
 	{
@@ -20,29 +20,29 @@ protected AbstractCarView()
 
 	protected abstract List<Car> getCars();
 
-	protected static List<Car> getCarsByBrand(final String brand)
+	protected static List<Car> getCarsByFuel(final String fuel)
 	{
 		return getAllCars().stream()
-			.filter(c -> brand.equals(c.brand()))
+			.filter(c -> fuel.equals(c.fuel()))
 			.toList();
 	}
 
 	@SuppressWarnings("checkstyle:MagicNumber")
 	protected static List<Car> getAllCars()
 	{
 		return List.of(
-			new Car(AUDI, "A4", 190),
-			new Car(AUDI, "A3", 150),
-			new Car(AUDI, "S4", 250),
-			new Car(AUDI, "Q5", 300),
-			new Car(BMW, "318i", 190),
-			new Car(BMW, "M4", 400),
-			new Car(BMW, "420d", 200),
-			new Car(BMW, "X5", 250),
-			new Car(PORSCHE, "Cayenne", 300),
-			new Car(PORSCHE, "911", 400),
-			new Car(PORSCHE, "Carrera", 400),
-			new Car(PORSCHE, "GT3RS", 600)
+			new Car(ELECTRIC, "A4", 190),
+			new Car(ELECTRIC, "A3", 150),
+			new Car(ELECTRIC, "S4", 250),
+			new Car(ELECTRIC, "Q5", 300),
+			new Car(HYBRID, "318i", 190),
+			new Car(HYBRID, "M4", 400),
+			new Car(HYBRID, "420d", 200),
+			new Car(HYBRID, "X5", 250),
+			new Car(GASOLINE, "Cayenne", 300),
+			new Car(GASOLINE, "911", 400),
+			new Car(GASOLINE, "Carrera", 400),
+			new Car(GASOLINE, "GT3RS", 600)
 		);
 	}
 }

vaadin-breadcrumbs-demo/src/main/java/software/xdev/vaadin/view/cars/Car.java

@@ -1,5 +1,5 @@
 package software.xdev.vaadin.view.cars;
 
-public record Car(String brand, String name, int hp)
+public record Car(String fuel, String name, int hp)
 {
 }

vaadin-breadcrumbs-demo/src/main/java/software/xdev/vaadin/view/cars/CarGrid.java

@@ -12,7 +12,8 @@ public class CarGrid extends Grid<Car>
 	public CarGrid(final List<Car> cars)
 	{
 		this.setItems(cars);
-		this.addColumn(Car::brand).setHeader(this.getTranslation(I18N_PREFIX + "branch"));
+		this.addColumn((car) -> this.getTranslation(I18N_PREFIX + car.fuel()))
+			.setHeader(this.getTranslation(I18N_PREFIX + "fuel"));
 		this.addColumn(Car::name).setHeader(this.getTranslation(I18N_PREFIX + "type"));
 		this.addColumn(Car::hp).setHeader(this.getTranslation(I18N_PREFIX + "hp"));
 	}

vaadin-breadcrumbs-demo/src/main/java/software/xdev/vaadin/view/cars/brand/BMWView.java renamed to vaadin-breadcrumbs-demo/src/main/java/software/xdev/vaadin/view/cars/brand/ElectricView.java

@@ -9,13 +9,13 @@
 import software.xdev.vaadin.view.cars.Car;
 
 
-@Route(value = "cars/bmw", layout = MainLayout.class)
-public class BMWView extends AbstractCarView
+@Route(value = "cars/electric", layout = MainLayout.class)
+public class ElectricView extends AbstractCarView
 {
 	@Override
 	@SuppressWarnings("checkstyle:MagicNumber")
 	protected List<Car> getCars()
 	{
-		return getCarsByBrand(BMW);
+		return getCarsByFuel(ELECTRIC);
 	}
 }

vaadin-breadcrumbs-demo/src/main/java/software/xdev/vaadin/view/cars/brand/PorscheView.java renamed to vaadin-breadcrumbs-demo/src/main/java/software/xdev/vaadin/view/cars/brand/GasolineView.java

@@ -9,13 +9,13 @@
 import software.xdev.vaadin.view.cars.Car;
 
 
-@Route(value = "cars/porsche", layout = MainLayout.class)
-public class PorscheView extends AbstractCarView
+@Route(value = "cars/gasoline", layout = MainLayout.class)
+public class GasolineView extends AbstractCarView
 {
 	@Override
 	@SuppressWarnings("checkstyle:MagicNumber")
 	protected List<Car> getCars()
 	{
-		return getCarsByBrand(PORSCHE);
+		return getCarsByFuel(GASOLINE);
 	}
 }

vaadin-breadcrumbs-demo/src/main/java/software/xdev/vaadin/view/cars/brand/AudiView.java renamed to vaadin-breadcrumbs-demo/src/main/java/software/xdev/vaadin/view/cars/brand/HybridView.java

@@ -9,13 +9,13 @@
 import software.xdev.vaadin.view.cars.Car;
 
 
-@Route(value = "cars/audi", layout = MainLayout.class)
-public class AudiView extends AbstractCarView
+@Route(value = "cars/hybrid", layout = MainLayout.class)
+public class HybridView extends AbstractCarView
 {
 	@Override
 	@SuppressWarnings("checkstyle:MagicNumber")
 	protected List<Car> getCars()
 	{
-		return getCarsByBrand(AUDI);
+		return getCarsByFuel(HYBRID);
 	}
 }

vaadin-breadcrumbs-demo/src/main/resources/vaadin-i18n/translations_de.properties

@@ -1,12 +1,16 @@
 breadcrumb_home=Startseite
 breadcrumb_cars=Autos
-breadcrumb_porsche=Porsche
-breadcrumb_audi=Audi
-breadcrumb_bmw=BMW
-
+breadcrumb_electric=Strom
+breadcrumb_hybrid=Hybrid
+breadcrumb_gasoline=Benzin
 sidenav_cars=Autos
+sidenav_electric=Strom
+sidenav_hybrid=Hybrid
+sidenav_gasoline=Benzin 
 sidenav_home=Startseite
-
-grid_branch=Marke
+grid_fuel=Treibstoff
 grid_type=Modell
 grid_hp=PS
+grid_electric=Strom
+grid_hybrid=Hybrid
+grid_gasoline=Benzin

vaadin-breadcrumbs-demo/src/main/resources/vaadin-i18n/translations_en.properties

@@ -1,12 +1,16 @@
 breadcrumb_home=Home
 breadcrumb_cars=Cars
-breadcrumb_porsche=Porsche
-breadcrumb_audi=Audi
-breadcrumb_bmw=BMW
-
+breadcrumb_electric=Electric
+breadcrumb_hybrid=Hybrid
+breadcrumb_gasoline=Gasoline
 sidenav_cars=Cars
+sidenav_electric=Electric
+sidenav_hybrid=Hybrid
+sidenav_gasoline=Gasoline
 sidenav_home=Home
-
-grid_branch=Branch
+grid_fuel=Fuel
 grid_type=Type
 grid_hp=HP
+grid_electric=Electric
+grid_hybrid=Hybrid
+grid_gasoline=Gasoline