summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorViktoria Pundy <viktoria.pundy@aon.at>2018-05-23 12:31:19 +0200
committerViktoria Pundy <viktoria.pundy@aon.at>2018-05-23 12:31:19 +0200
commit37f18628822e9c2281c4627e71981b2131f8c33c (patch)
tree5856db0cee29ecd93b7363037c4f122c781c7121
parentd13cee465d399895668a88edc34a30a4d0a380c5 (diff)
downloadsepm-groupproject-37f18628822e9c2281c4627e71981b2131f8c33c.tar.gz
sepm-groupproject-37f18628822e9c2281c4627e71981b2131f8c33c.tar.xz
sepm-groupproject-37f18628822e9c2281c4627e71981b2131f8c33c.zip
Fixed an error which would duplicate vehicles [#24981]
-rw-r--r--src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/OperationDetailsController.java27
1 files changed, 0 insertions, 27 deletions
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/OperationDetailsController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/OperationDetailsController.java
index 3809760..b844117 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/OperationDetailsController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/OperationDetailsController.java
@@ -6,7 +6,6 @@ import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle;
import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.OperationService;
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.InvalidVehicleException;
import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
import java.util.Collection;
import java.util.EnumSet;
@@ -129,19 +128,6 @@ public class OperationDetailsController {
alert.showAndWait();
return;
}
- for (Vehicle v : operation.vehicles()) {
- v = v.toBuilder().status(Vehicle.Status.FREI_FUNK).build();
- try {
- vehicleService.update(v);
- } catch (InvalidVehicleException | ServiceException e) {
- Alert alert = new Alert(AlertType.ERROR);
- alert.setTitle("Fehler");
- alert.setHeaderText("Fehler!");
- alert.setContentText(e.getMessage());
- alert.showAndWait();
- return;
- }
- }
Alert alert = new Alert(AlertType.CONFIRMATION);
alert.setTitle("Erfolg");
alert.setHeaderText("Erfolgreich aktualisiert");
@@ -162,19 +148,6 @@ public class OperationDetailsController {
alert.showAndWait();
return;
}
- for (Vehicle v : operation.vehicles()) {
- v = v.toBuilder().status(Vehicle.Status.FREI_FUNK).build();
- try {
- vehicleService.update(v);
- } catch (InvalidVehicleException | ServiceException e) {
- Alert alert = new Alert(AlertType.ERROR);
- alert.setTitle("Fehler");
- alert.setHeaderText("Fehler!");
- alert.setContentText(e.getMessage());
- alert.showAndWait();
- return;
- }
- }
Alert alert = new Alert(AlertType.CONFIRMATION);
alert.setTitle("Erfolg");
alert.setHeaderText("Erfolgreich aktualisiert");