diff options
author | Viktoria Pundy <viktoria.pundy@aon.at> | 2018-05-05 20:02:12 +0200 |
---|---|---|
committer | Viktoria Pundy <viktoria.pundy@aon.at> | 2018-05-06 18:12:31 +0200 |
commit | 28e547e56ad3376bc1168711f1973d8f3f54019f (patch) | |
tree | 30a713c0cdbc225b83b18fff82c7f6826f0e7c26 /src | |
parent | 9949b592dfa39684d6a6fac380522a949321e4f7 (diff) | |
download | sepm-groupproject-28e547e56ad3376bc1168711f1973d8f3f54019f.tar.gz sepm-groupproject-28e547e56ad3376bc1168711f1973d8f3f54019f.tar.xz sepm-groupproject-28e547e56ad3376bc1168711f1973d8f3f54019f.zip |
Small Changes
Diffstat (limited to 'src')
-rw-r--r-- | src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/service/OperationServiceImpl.java | 6 | ||||
-rw-r--r-- | src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/CreateOperationController.java | 7 | ||||
-rw-r--r-- | src/test/at/ac/tuwien/sepm/assignment/groupphase/operation/OperationServiceUnitTest.java (renamed from src/test/at/ac/tuwien/sepm/assignment/groupphase/operation/OperationServiceTest.java) | 2 |
3 files changed, 7 insertions, 8 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 854f2e7..74cb7a7 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 @@ -1,6 +1,5 @@ package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service; -import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.DBOperationDAO; import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dao.OperationDAO; import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation; import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Operation.Severity; @@ -10,7 +9,6 @@ import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidOperationExcepti import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidVehicleException; import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException; import at.ac.tuwien.sepm.assignment.groupphase.exception.ServiceException; -import at.ac.tuwien.sepm.assignment.groupphase.util.JDBCConnectionManager; import java.util.EnumSet; import java.util.List; import javafx.collections.transformation.SortedList; @@ -20,7 +18,7 @@ public class OperationServiceImpl implements OperationService { // TODO: anders? private OperationDAO operationDAO; - public OperationServiceImpl(OperationDAO dao){ + public OperationServiceImpl(OperationDAO dao) { this.operationDAO = dao; } @@ -55,7 +53,7 @@ public class OperationServiceImpl implements OperationService { throw new InvalidOperationException( "Zu einem Fahrzeug des Typs NEF muss auch ein Fahrzeug des Typs RTW mit NEF-Halterung geschickt werden!"); }*/ - /* if (vehicle.type() == VehicleType.NAH && !rtw) { + /* if (vehicle.type() == VehicleType.NAH && !rtw) { for (Vehicle vehicleA : vehicles) { if (vehicleA.type() == VehicleType.RTW) { rtw = true; 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 af4b205..9f4a62d 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 @@ -39,7 +39,8 @@ public class CreateOperationController { public LinkedList<Vehicle> chosenVehicles = new LinkedList<>(); // TODO: Anders? - OperationService operationService = new OperationServiceImpl(new DBOperationDAO(new JDBCConnectionManager())); + OperationService operationService = + new OperationServiceImpl(new DBOperationDAO(new JDBCConnectionManager())); public CreateOperationController() {} @@ -97,7 +98,7 @@ public class CreateOperationController { }); } - public void fillList() { + public void updateList() { // TODO: Zu anderem Zeitpunkt aktualisieren. /*try { this.lvVehicles.setItems( @@ -171,6 +172,6 @@ public class CreateOperationController { alert.setHeaderText("Erfolgreich gespeichert"); alert.setContentText("Der Einsatz wurde erfolgreich gespeichert."); alert.showAndWait(); - fillList(); + updateList(); } } diff --git a/src/test/at/ac/tuwien/sepm/assignment/groupphase/operation/OperationServiceTest.java b/src/test/at/ac/tuwien/sepm/assignment/groupphase/operation/OperationServiceUnitTest.java index aa89a85..866f759 100644 --- a/src/test/at/ac/tuwien/sepm/assignment/groupphase/operation/OperationServiceTest.java +++ b/src/test/at/ac/tuwien/sepm/assignment/groupphase/operation/OperationServiceUnitTest.java @@ -23,7 +23,7 @@ import java.util.List; import org.junit.Assert; import org.junit.Test; -public class OperationServiceTest { +public class OperationServiceUnitTest { private final OperationDAO operationDAO = mock(OperationDAO.class); private final OperationService operationService = new OperationServiceImpl(operationDAO); |