aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/at/ac/tuwien/sepm/assignment/groupphase
diff options
context:
space:
mode:
authorViktoria Pundy <viktoria.pundy@aon.at>2018-06-03 12:51:43 +0200
committerTharre <tharre3@gmail.com>2018-06-13 18:53:07 +0200
commit9ae0fabd9ea805ea7a9d112b7769d7163b7e550b (patch)
treeb10743a8f0553e92d5798dc4dcc57af4d8da52bf /src/main/java/at/ac/tuwien/sepm/assignment/groupphase
parent6fc7c0033e7e48c4e1f717d21db70552460676c1 (diff)
downloadsepm-groupproject-9ae0fabd9ea805ea7a9d112b7769d7163b7e550b.tar.gz
sepm-groupproject-9ae0fabd9ea805ea7a9d112b7769d7163b7e550b.tar.xz
sepm-groupproject-9ae0fabd9ea805ea7a9d112b7769d7163b7e550b.zip
Resolved some warnings {#27299]
Diffstat (limited to 'src/main/java/at/ac/tuwien/sepm/assignment/groupphase')
-rw-r--r--src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/DetailArchiveOperationController.java36
-rw-r--r--src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/OperationInArchiveController.java2
2 files changed, 7 insertions, 31 deletions
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/DetailArchiveOperationController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/DetailArchiveOperationController.java
index 3c50c65..0376579 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/DetailArchiveOperationController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/DetailArchiveOperationController.java
@@ -6,6 +6,7 @@ import at.ac.tuwien.sepm.assignment.groupphase.util.SpringFXMLLoader;
import at.ac.tuwien.sepm.assignment.groupphase.util.SpringFXMLLoader.FXMLWrapper;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
+import java.util.Objects;
import javafx.fxml.FXML;
import javafx.scene.Node;
import javafx.scene.control.Alert;
@@ -26,8 +27,7 @@ public class DetailArchiveOperationController {
this.fxmlLoader = fxmlLoader;
}
- public static DetailArchiveOperationController create(SpringFXMLLoader fxmlLoader)
- throws IOException {
+ static DetailArchiveOperationController create(SpringFXMLLoader fxmlLoader) throws IOException {
FXMLWrapper<Object, DetailArchiveOperationController> wrapper =
fxmlLoader.loadAndWrap(
"/fxml/DetailArchiveOperation.fxml",
@@ -47,7 +47,7 @@ public class DetailArchiveOperationController {
private Node rootElement;
public void set(Vehicle vehicle) {
- VehiclePaneController controller = null;
+ VehiclePaneController controller;
try {
controller = VehiclePaneController.createVehiclePane();
controller.setData(vehicle, false);
@@ -61,8 +61,9 @@ public class DetailArchiveOperationController {
alert.showAndWait();
}
try {
- for (int i = 0; i < vehicle.registrations().size(); i++) {
- Employee employee = vehicle.registrations().get(i).employee();
+ for (int i = 0; i < Objects.requireNonNull(vehicle.registrations()).size(); i++) {
+ Employee employee =
+ Objects.requireNonNull(vehicle.registrations()).get(i).employee();
EmployeeListItemController employeeListItemController =
EmployeeListItemController.createEmployeeListItemController(
@@ -78,29 +79,4 @@ public class DetailArchiveOperationController {
alert.showAndWait();
}
}
-
- /* public void set(Operation operation) {
- txtAddress.setText(operation.destination());
- String date = "am ";
- if (operation.created() != null) {
- LocalDateTime myDateTime =
- LocalDateTime.ofInstant(
- Objects.requireNonNull(operation.created()), ZoneOffset.UTC);
- date +=
- myDateTime.getDayOfMonth()
- + "."
- + myDateTime.getMonth().getValue()
- + "."
- + myDateTime.getYear();
- txtDate.setText(date);
- } else {
- txtDate.setText("---");
- }
- txtOpCode.setText(operation.opCode());
- Collection<String> elements =
- operation.vehicles().stream().map(Vehicle::name).collect(Collectors.toList());
- String result = String.join(", ", elements);
-
- txtVehicles.setText(result);
- }*/
}
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/OperationInArchiveController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/OperationInArchiveController.java
index 935b2fe..d1b325c 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/OperationInArchiveController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/OperationInArchiveController.java
@@ -20,7 +20,7 @@ public class OperationInArchiveController {
@FXML private Text txtDate;
@FXML private Text txtOpCode;
- public static OperationInArchiveController create() throws IOException {
+ static OperationInArchiveController create() throws IOException {
FXMLLoader fxmlLoader =
new FXMLLoader(
OperationInArchiveController.class.getResource(