changed construction sequence for the fuel station types

diff --git a/src/main/java/de/diejungsvondertanke/tankstelle/LargeFuelStation.java b/src/main/java/de/diejungsvondertanke/tankstelle/LargeFuelStation.java
index 43c8f94cc0e676bcd4bd3fd72ea6c11a10aa4386..a8b3d65653b6233abec0a13ee929d1ffd1b1e038 100644 (file)
--- 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 44e9c2d8f9273dead610c4e0c3c74d33f54529d4..9c890fa0e56e4bbf0e3df4eee2ee632e7121f089 100644 (file)
--- 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 dca0e79c9b15e3970a214f12ea1c3c3610b9cc64..ceb96d6312909f0dfa92d6d701354182d32f0930 100644 (file)
--- 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;
     }