Fix rebase errors

3 files changed, 10 insertions, 4 deletions

diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/OperationDAO.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/OperationDAO.java
index 7f28005..dd1a189 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/OperationDAO.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/OperationDAO.java
@@ -45,4 +45,6 @@ public interface OperationDAO {
      * @throws PersistenceException if loading the stored operations failed
      */
     List<Operation> list(EnumSet<Status> statuses) throws PersistenceException;
+
+    int connectVehicleToOperation(long vehicleID, long operationID) throws PersistenceException;
 }
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/VehicleAdd.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/VehicleServiceImpl.java
index e78c6b2..4a11298 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/VehicleAdd.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/VehicleServiceImpl.java
@@ -12,10 +12,10 @@ import java.util.List;
 import org.springframework.stereotype.Service;
 
 @Service
-public class VehicleAdd implements VehicleService {
+public class VehicleServiceImpl implements VehicleService {
     private VehicleDAO vehicleDAO;
 
-    public VehicleAdd(VehicleDAO vehicleDAO) {
+    public VehicleServiceImpl(VehicleDAO vehicleDAO) {
         this.vehicleDAO = vehicleDAO;
     }
 
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/CreateOperationController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/CreateOperationController.java
index 5fefa10..38f6849 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/CreateOperationController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/CreateOperationController.java
@@ -25,7 +25,9 @@ import javafx.scene.control.ListCell;
 import javafx.scene.control.ListView;
 import javafx.scene.control.TextField;
 import javafx.scene.layout.AnchorPane;
+import org.springframework.stereotype.Controller;
 
+@Controller
 public class CreateOperationController {
 
     public AnchorPane apCreateOperation;
@@ -41,9 +43,11 @@ public class CreateOperationController {
     // TODO: Anders?
     OperationService operationService =
             new OperationServiceImpl(new DBOperationDAO(new JDBCConnectionManager()));
-    VehicleService vehicleService = new VehicleServiceImpl();
+    private final VehicleService vehicleService;
 
-    public CreateOperationController() {}
+    public CreateOperationController(VehicleService vehicleService) {
+        this.vehicleService = vehicleService;
+    }
 
     @FXML
     public void initialize() {