From 8148eeec7e5087f1067fe9c3e77e3da50e3945f0 Mon Sep 17 00:00:00 2001 From: Robin Date: Mon, 10 Nov 2025 12:47:58 +0100 Subject: [PATCH] changed construction sequence for the fuel station types --- .../tankstelle/LargeFuelStation.java | 10 ++++------ .../tankstelle/MediumFuelStation.java | 10 ++++------ .../tankstelle/SmallFuelStation.java | 10 ++++------ 3 files changed, 12 insertions(+), 18 deletions(-) diff --git a/src/main/java/de/diejungsvondertanke/tankstelle/LargeFuelStation.java b/src/main/java/de/diejungsvondertanke/tankstelle/LargeFuelStation.java index 43c8f94..a8b3d65 100644 --- a/src/main/java/de/diejungsvondertanke/tankstelle/LargeFuelStation.java +++ b/src/main/java/de/diejungsvondertanke/tankstelle/LargeFuelStation.java @@ -16,12 +16,11 @@ public class LargeFuelStation extends FuelStation { * @see {@link #supermarket_company} */ public LargeFuelStation(String supermarket_company) { - Fuel[] fuels = { new Fuel(FuelType.SUPER, 8000f, 0f, 16000), + super((byte) 4, Size.LARGE, new Fuel[] { new Fuel(FuelType.SUPER, 8000f, 0f, 16000), new Fuel(FuelType.SUPER_E10, 8000f, 0f, 16000), new Fuel(FuelType.DIESEL, 8000f, 0f, 16000), new Fuel(FuelType.PREMIUM_DIESEL, 8000f, 0f, 16000), - new Fuel(FuelType.AUTOGAS, 8000f, 0f, 16000) }; - super((byte) 4, Size.LARGE, fuels); + new Fuel(FuelType.AUTOGAS, 8000f, 0f, 16000) }); this.supermarket_company = supermarket_company; } @@ -34,12 +33,11 @@ public class LargeFuelStation extends FuelStation { * @see {@link FuelStation#number_of_employees} */ public LargeFuelStation(String supermarket_company, byte number_of_employees) { - Fuel[] fuels = { new Fuel(FuelType.SUPER, 8000f, 0f, 16000), + super(number_of_employees, Size.LARGE, new Fuel[] { new Fuel(FuelType.SUPER, 8000f, 0f, 16000), new Fuel(FuelType.SUPER_E10, 8000f, 0f, 16000), new Fuel(FuelType.DIESEL, 8000f, 0f, 16000), new Fuel(FuelType.PREMIUM_DIESEL, 8000f, 0f, 16000), - new Fuel(FuelType.AUTOGAS, 8000f, 0f, 16000) }; - super(number_of_employees, Size.LARGE, fuels); + new Fuel(FuelType.AUTOGAS, 8000f, 0f, 16000) }); this.supermarket_company = supermarket_company; } diff --git a/src/main/java/de/diejungsvondertanke/tankstelle/MediumFuelStation.java b/src/main/java/de/diejungsvondertanke/tankstelle/MediumFuelStation.java index 44e9c2d..9c890fa 100644 --- a/src/main/java/de/diejungsvondertanke/tankstelle/MediumFuelStation.java +++ b/src/main/java/de/diejungsvondertanke/tankstelle/MediumFuelStation.java @@ -16,11 +16,10 @@ public class MediumFuelStation extends FuelStation { * @see {@link #retail_space} */ public MediumFuelStation(float retail_space) { - Fuel[] fuels = { new Fuel(FuelType.SUPER, 6000f, 0f, 12000), + super((byte) 2, Size.MEDIUM, new Fuel[] { new Fuel(FuelType.SUPER, 6000f, 0f, 12000), new Fuel(FuelType.SUPER_E10, 6000f, 0f, 12000), new Fuel(FuelType.PREMIUM_DIESEL, 6000f, 0f, 12000), - new Fuel(FuelType.AUTOGAS, 6000f, 0f, 12000) }; - super((byte) 2, Size.MEDIUM, fuels); + new Fuel(FuelType.AUTOGAS, 6000f, 0f, 12000) }); this.retail_space = retail_space; } @@ -33,11 +32,10 @@ public class MediumFuelStation extends FuelStation { * @see {@link FuelStation#number_of_employees} */ public MediumFuelStation(float retail_space, byte number_of_employees) { - Fuel[] fuels = { new Fuel(FuelType.SUPER, 6000f, 0f, 12000), + super(number_of_employees, Size.MEDIUM, new Fuel[] { new Fuel(FuelType.SUPER, 6000f, 0f, 12000), new Fuel(FuelType.SUPER_E10, 6000f, 0f, 12000), new Fuel(FuelType.PREMIUM_DIESEL, 6000f, 0f, 12000), - new Fuel(FuelType.AUTOGAS, 6000f, 0f, 12000) }; - super(number_of_employees, Size.MEDIUM, fuels); + new Fuel(FuelType.AUTOGAS, 6000f, 0f, 12000) }); this.retail_space = retail_space; } diff --git a/src/main/java/de/diejungsvondertanke/tankstelle/SmallFuelStation.java b/src/main/java/de/diejungsvondertanke/tankstelle/SmallFuelStation.java index dca0e79..ceb96d6 100644 --- a/src/main/java/de/diejungsvondertanke/tankstelle/SmallFuelStation.java +++ b/src/main/java/de/diejungsvondertanke/tankstelle/SmallFuelStation.java @@ -16,9 +16,8 @@ public class SmallFuelStation extends FuelStation { * @see {@link #number_of_vending_machines} */ public SmallFuelStation(short number_of_vending_machines) { - Fuel[] fuels = { new Fuel(FuelType.SUPER, 4000f, 0f, 8000), - new Fuel(FuelType.DIESEL, 4000f, 0f, 8000) }; - super((byte) 1, Size.SMALL, fuels); + super((byte) 1, Size.SMALL, new Fuel[] { new Fuel(FuelType.SUPER, 4000f, 0f, 8000), + new Fuel(FuelType.DIESEL, 4000f, 0f, 8000) }); this.number_of_vending_machines = number_of_vending_machines; } @@ -31,9 +30,8 @@ public class SmallFuelStation extends FuelStation { * @see {@link FuelStation#number_of_employees} */ public SmallFuelStation(short number_of_vending_machines, byte number_of_employees) { - Fuel[] fuels = { new Fuel(FuelType.SUPER, 4000f, 0f, 8000), - new Fuel(FuelType.DIESEL, 4000f, 0f, 8000) }; - super(number_of_employees, Size.SMALL, fuels); + super(number_of_employees, Size.SMALL, new Fuel[] { new Fuel(FuelType.SUPER, 4000f, 0f, 8000), + new Fuel(FuelType.DIESEL, 4000f, 0f, 8000) }); this.number_of_vending_machines = number_of_vending_machines; } -- 2.43.0