From 16e8d50e0c320f3028d0e1324d15c9cb9ce33085 Mon Sep 17 00:00:00 2001
From: Tharre <tharre3@gmail.com>
Date: Tue, 22 May 2018 14:58:41 +0200
Subject: Fix merge conflicts caused by interface change

---
 .../groupphase/einsatzverwaltung/controller/CreateCarController.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main/java/at/ac/tuwien/sepm/assignment')

diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateCarController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateCarController.java
index f640807..e88e640 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateCarController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/CreateCarController.java
@@ -9,7 +9,7 @@ import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidVehicleException
 import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
 import java.lang.invoke.MethodHandles;
 import java.util.EnumSet;
-import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import javafx.collections.FXCollections;
@@ -162,7 +162,7 @@ public class CreateCarController {
     }
 
     private void vehicleListFP() {
-        List<Vehicle> vehicleList = null;
+        Set<Vehicle> vehicleList = null;
         fp_vehicleList.getChildren().clear();
         try {
             vehicleList = vehicleService.list(EnumSet.range(Status.ABGEMELDET, Status.FREI_FUNK));
-- 
cgit v1.2.3-70-g09d2