formated CodeV

2 files changed, 13 insertions, 15 deletions

diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/OperationServiceImpl.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/OperationServiceImpl.java
index 10eef78..0e850e7 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/OperationServiceImpl.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/OperationServiceImpl.java
@@ -25,10 +25,10 @@ public class OperationServiceImpl implements OperationService {
     public long add(Operation operation) throws InvalidOperationException, ServiceException {
         List<Vehicle> vehicles = operation.vehicles();
         boolean rtw = false;
-        if (faultyInput(operation.opCode())){
+        if (faultyInput(operation.opCode())) {
             throw new InvalidOperationException("Code ist ungültig!");
         }
-        if (faultyInput(operation.destination())){
+        if (faultyInput(operation.destination())) {
             throw new InvalidOperationException("Adresse ist ungültig!");
         }
         if (operation.vehicles().size() == 0) {
@@ -36,7 +36,9 @@ public class OperationServiceImpl implements OperationService {
                     "Es muss mindestens ein Fahrzeug ausgewählt werden!");
         }
         for (Vehicle vehicle : vehicles) {
-            if (vehicle.status() == Vehicle.Status.ABGEMELDET || (vehicle.status()!=Vehicle.Status.FREI_FUNK && vehicle.status()!=Vehicle.Status.FREI_WACHE))
+            if (vehicle.status() == Vehicle.Status.ABGEMELDET
+                    || (vehicle.status() != Vehicle.Status.FREI_FUNK
+                            && vehicle.status() != Vehicle.Status.FREI_WACHE))
                 throw new InvalidOperationException(
                         "Abgemeldete Fahrzeuge dürfen nicht zu einem Einsatz geschickt werden!");
             if (vehicle.type() == VehicleType.NEF && !rtw) {
@@ -65,7 +67,9 @@ public class OperationServiceImpl implements OperationService {
         String[] codeParts = operation.opCode().split("-");
         String severity = "";
         for (int i = 0; i < codeParts[1].length(); i++) {
-            if (((int) (codeParts[1].charAt(i)) >= 65 && (int) (codeParts[1].charAt(i)) <= 79) || ((int) (codeParts[1].charAt(i)) >= 97 && (int) (codeParts[1].charAt(i))<=111)) {
+            if (((int) (codeParts[1].charAt(i)) >= 65 && (int) (codeParts[1].charAt(i)) <= 79)
+                    || ((int) (codeParts[1].charAt(i)) >= 97
+                            && (int) (codeParts[1].charAt(i)) <= 111)) {
                 severity = "" + codeParts[1].charAt(i);
                 break;
             }
@@ -92,8 +96,8 @@ public class OperationServiceImpl implements OperationService {
     }
 
     private boolean faultyInput(String name) {
-                    if (name == null) return true;
-            else if (name.isEmpty()) return true;
+        if (name == null) return true;
+        else if (name.isEmpty()) return true;
         for (int i = 0; i < name.length(); i++) {
             if (name.charAt(i) != ' ') return false;
         }
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 919e187..502324a 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
@@ -8,12 +8,9 @@ import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.Con
 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.einsatzverwaltung.service.VehicleServiceImpl;
 import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidOperationException;
 import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException;
 import java.time.Instant;
-import java.util.EnumSet;
 import java.util.LinkedList;
 import java.util.List;
 import javafx.collections.FXCollections;
@@ -78,10 +75,8 @@ public class CreateOperationController {
                         if (!remove) {
                             chosenVehicles.add(lvVehicles.getSelectionModel().getSelectedItem());
 
-                        }
-                        else {
+                        } else {
                             chosenVehicles.remove(lvVehicles.getSelectionModel().getSelectedItem());
-
                         }
                         String result = "";
                         for (int i = 0; i < chosenVehicles.size(); i++) {
@@ -91,10 +86,9 @@ public class CreateOperationController {
                                 result += chosenVehicles.get(i).name() + ", ";
                             }
                         }
-                        if (result.equals("")){
+                        if (result.equals("")) {
                             lblChosenVehicles.setText("keine ausgewählt");
-                        }
-                        else {
+                        } else {
                             lblChosenVehicles.setText(result);
                         }
                     }