changed return types and parameter types form FuelStation[] to ArrayList<FuelStation>

diff --git a/src/main/java/de/diejungsvondertanke/tankstelle/FuelStation.java b/src/main/java/de/diejungsvondertanke/tankstelle/FuelStation.java
index c2c5fe389fca9bfaea2a7bfb60fab324d2f047b2..71809e1e2f6a4cfbe7001ae0c3953152c8188017 100644 (file)
--- a/src/main/java/de/diejungsvondertanke/tankstelle/FuelStation.java
+++ b/src/main/java/de/diejungsvondertanke/tankstelle/FuelStation.java
@@ -170,12 +170,12 @@ abstract class FuelStation {
     /**
      * Sort the fuel stations by size in a descending order (largest stations first)
      * 
-     * @param stations Array of {@link FuelStation}s
+     * @param stations ArrayList of {@link FuelStation}s
      * @return an ordered array of {@link FuelStation}s
      * 
      * @author Robin Cheney
      */
-    public static FuelStation[] sortDescending(FuelStation[] stations) {
+    public static ArrayList<FuelStation> sortDescending(ArrayList<FuelStation> stations) {
         ArrayList<FuelStation> result = new ArrayList<>();
         ArrayList<FuelStation> large = new ArrayList<>();
         ArrayList<FuelStation> medium = new ArrayList<>();
@@ -201,18 +201,19 @@ abstract class FuelStation {
         result.addAll(large);
         result.addAll(medium);
         result.addAll(small);
-        return result.toArray(new FuelStation[0]);
+        return result;
+        // return result.toArray(new FuelStation[0]);
     }
 
     /**
      * Sort the fuel stations by size in a ascending order (smallest stations first)
      * 
-     * @param stations Array of {@link FuelStation}s
+     * @param stations ArrayList of {@link FuelStation}s
      * @return an ordered array of {@link FuelStation}s
      * 
      * @author Robin Cheney
      */
-    public static FuelStation[] sortAscending(FuelStation[] stations) {
+    public static ArrayList<FuelStation> sortAscending(ArrayList<FuelStation> stations) {
         ArrayList<FuelStation> result = new ArrayList<>();
         ArrayList<FuelStation> large = new ArrayList<>();
         ArrayList<FuelStation> medium = new ArrayList<>();
@@ -238,7 +239,7 @@ abstract class FuelStation {
         result.addAll(large);
         result.addAll(medium);
         result.addAll(small);
-        return result.toArray(new FuelStation[0]);
+        return result;
     }
 
     /**

diff --git a/src/main/java/de/diejungsvondertanke/tankstelle/Main.java b/src/main/java/de/diejungsvondertanke/tankstelle/Main.java
index f7edc40a68c9fabc5d1be7fe3bdacbcc1f05564f..944e219a122a8d6883b9da074e6da9bcfc27d31a 100644 (file)
--- a/src/main/java/de/diejungsvondertanke/tankstelle/Main.java
+++ b/src/main/java/de/diejungsvondertanke/tankstelle/Main.java
@@ -49,14 +49,14 @@ public class Main {
      * 
      * @author Robin Cheney
      */
-    public static FuelStation[] getFuelStations(short number_of_vending_machines) {
+    public static ArrayList<FuelStation> getFuelStations(short number_of_vending_machines) {
         ArrayList<FuelStation> result = new ArrayList<FuelStation>();
         for (FuelStation fuelStation : fuelStations) {
             if (fuelStation instanceof SmallFuelStation
                     && ((SmallFuelStation) fuelStation).getNumber_of_vending_machines() == number_of_vending_machines)
                 result.add(fuelStation);
         }
-        return result.toArray(new FuelStation[0]); // Change to SmallFuelStation if required
+        return result; // Change to SmallFuelStation if required
     }
 
     /**
@@ -69,14 +69,14 @@ public class Main {
      * 
      * @author Robin Cheney
      */
-    public static FuelStation[] getFuelStations(float retail_space) {
+    public static ArrayList<FuelStation> getFuelStations(float retail_space) {
         ArrayList<FuelStation> result = new ArrayList<FuelStation>();
         for (FuelStation fuelStation : fuelStations) {
             if (fuelStation instanceof MediumFuelStation
                     && ((MediumFuelStation) fuelStation).getRetail_space() == retail_space)
                 result.add(fuelStation);
         }
-        return result.toArray(new FuelStation[0]); // Change to MediumFuelStation if required
+        return result; // Change to MediumFuelStation if required
     }
 
     /**
@@ -89,14 +89,14 @@ public class Main {
      * 
      * @author Robin Cheney
      */
-    public static FuelStation[] getFuelStations(String supermarket_company) {
+    public static ArrayList<FuelStation> getFuelStations(String supermarket_company) {
         ArrayList<FuelStation> result = new ArrayList<FuelStation>();
         for (FuelStation fuelStation : fuelStations) {
             if (fuelStation instanceof LargeFuelStation
                     && ((LargeFuelStation) fuelStation).getSupermarket_company().equals(supermarket_company))
                 result.add(fuelStation);
         }
-        return result.toArray(new FuelStation[0]); // Change to LargeFuelStation if required
+        return result; // Change to LargeFuelStation if required
     }
 
     /**
@@ -226,16 +226,16 @@ public class Main {
      * 
      * @author Robin Cheney
      */
-    public static FuelStation[] getFuelStationListWhenUnderstaffed(short available_employees) {
+    public static ArrayList<FuelStation> getFuelStationListWhenUnderstaffed(short available_employees) {
         ArrayList<FuelStation> result = new ArrayList<>();
-        FuelStation[] fuelStationsLocalCopy = FuelStation.sortDescending(fuelStations.toArray(new FuelStation[0]));
+        ArrayList<FuelStation> fuelStationsLocalCopy = FuelStation.sortDescending(fuelStations);
         for (FuelStation station : fuelStationsLocalCopy) {
             if (Math.floorDiv(available_employees, station.getNumber_of_employees()) >= 1) {
                 available_employees -= station.getNumber_of_employees();
                 result.add(station);
             }
         }
-        return result.toArray(new FuelStation[0]);
+        return result;
     }
 
     /**
@@ -309,7 +309,7 @@ public class Main {
      * 
      * @author Leander Schnurrer
      */
-    public static float getTotalStockLevelOfFuel(FuelType fuelType, FuelStation[] fuelStations) {
+    public static float getTotalStockLevelOfFuel(FuelType fuelType, ArrayList<FuelStation> fuelStations) {
         float sum = 0f;
         for (FuelStation fuelStation : fuelStations) {
             for (Fuel fuel : fuelStation.fuels) {