Small Changes

2 files changed, 17 insertions, 24 deletions

diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/DBVehicleDAO.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/DBVehicleDAO.java
index e1b8c21..d966dc5 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/DBVehicleDAO.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/DBVehicleDAO.java
@@ -40,12 +40,9 @@ public class DBVehicleDAO implements VehicleDAO {
                             .prepareStatement(
                                     "Select * from VehicleVersion, "
                                             + "Vehicle where VehicleVersion.id=Vehicle.version");
-            // TODO: CORRECT?
             pstmt.executeQuery();
-
             ResultSet rs = pstmt.getResultSet();
             while (rs.next()) {
-                // TODO: Registrations
                 Vehicle vehicle =
                         Vehicle.builder()
                                 .name(rs.getString(2))
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 9f4a62d..7e6722c 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
@@ -5,14 +5,14 @@ import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation;
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation.Severity;
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation.Status;
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.ConstructionType;
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.VehicleType;
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.OperationService;
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.OperationServiceImpl;
+import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.VehicleService;
 import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidOperationException;
 import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
 import at.ac.tuwien.sepm.assignment.groupphase.util.JDBCConnectionManager;
 import java.time.Instant;
+import java.util.EnumSet;
 import java.util.LinkedList;
 import java.util.List;
 import javafx.collections.FXCollections;
@@ -41,6 +41,7 @@ public class CreateOperationController {
     // TODO: Anders?
     OperationService operationService =
             new OperationServiceImpl(new DBOperationDAO(new JDBCConnectionManager()));
+    VehicleService vehicleService;
 
     public CreateOperationController() {}
 
@@ -66,11 +67,8 @@ public class CreateOperationController {
                 event -> {
                     if (event.getClickCount() == 2) {
                         boolean remove = false;
-                        for (int i = 0; i < chosenVehicles.size(); i++) {
-                            if (lvVehicles
-                                    .getSelectionModel()
-                                    .getSelectedItem()
-                                    .equals(chosenVehicles.get(i))) {
+                        for (Vehicle vehicle : chosenVehicles) {
+                            if (lvVehicles.getSelectionModel().getSelectedItem().equals(vehicle)) {
                                 remove = true;
                                 break;
                             }
@@ -81,42 +79,40 @@ public class CreateOperationController {
                         } else {
                             chosenVehicles.remove(lvVehicles.getSelectionModel().getSelectedItem());
                         }
-                        String result = "";
+                        StringBuilder result = new StringBuilder();
                         for (int i = 0; i < chosenVehicles.size(); i++) {
                             if (i == chosenVehicles.size() - 1) {
-                                result += chosenVehicles.get(i).name();
+                                result.append(chosenVehicles.get(i).name());
                             } else {
-                                result += chosenVehicles.get(i).name() + ", ";
+                                result.append(chosenVehicles.get(i).name()).append(", ");
                             }
                         }
-                        if (result.equals("")) {
+                        if (result.toString().equals("")) {
                             lblChosenVehicles.setText("keine ausgewählt");
                         } else {
-                            lblChosenVehicles.setText(result);
+                            lblChosenVehicles.setText(result.toString());
                         }
                     }
                 });
     }
 
     public void updateList() {
-        // TODO: Zu anderem Zeitpunkt aktualisieren.
-        /*try {
+        try {
             this.lvVehicles.setItems(
-            //TODO: ALLE FREI STATI Frei FUnk Frei Wache
                     FXCollections.observableArrayList(
-                            vehicleService.list(EnumSet.of(Vehicle.Status.FREI_FUNK, Vehicle.Status.FREI_WACHE))));
+                            vehicleService.list(
+                                    EnumSet.of(
+                                            Vehicle.Status.FREI_FUNK, Vehicle.Status.FREI_WACHE))));
         } catch (ServiceException e) {
             Alert alert = new Alert(Alert.AlertType.ERROR);
             alert.setTitle("Fehler");
             alert.setHeaderText("Fehler!");
             alert.setContentText(e.getMessage());
             alert.showAndWait();
-        }*/
-
-        this.lvVehicles.setItems(FXCollections.observableArrayList(mylist()));
+        }
     }
 
-    private LinkedList<Vehicle> mylist() {
+    /*private LinkedList<Vehicle> mylist() {
         Vehicle vehicle =
                 Vehicle.builder()
                         .name("Test-KTW")
@@ -139,7 +135,7 @@ public class CreateOperationController {
         list.add(vehicle1);
         // this.lvVehicles.setItems(FXCollections.observableArrayList(list));
         return list;
-    }
+    }*/
 
     @FXML
     protected void createOperationClicked() {