Small Changes [#24990]

3 files changed, 20 insertions, 24 deletions

diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/ArchiveOperationController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/ArchiveOperationController.java
index d3698e3..ba76d7d 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/ArchiveOperationController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/userInterface/ArchiveOperationController.java
@@ -10,6 +10,7 @@ import java.time.ZoneOffset;
 import java.util.EnumSet;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Objects;
 import javafx.scene.control.Alert;
 import javafx.scene.control.Alert.AlertType;
 import javafx.scene.control.Button;
@@ -30,21 +31,18 @@ public class ArchiveOperationController {
     public Label lblDate;
     public Label lblAddress;
     public FlowPane fpVehicles;
-    OperationService operationService;
+    private OperationService operationService;
     public FlowPane archiveOperationFlowPane;
-    public CreateOperationController createOperationController;
-    LinkedList<Operation> list = new LinkedList<>();
+    private LinkedList<Operation> list = new LinkedList<>();
 
     public ArchiveOperationController() {}
 
-    public void setServices(
-            OperationService operationService,
-            CreateOperationController createOperationController) {
+    void setServices(
+            OperationService operationService) {
         this.operationService = operationService;
-        this.createOperationController = createOperationController;
     }
 
-    public void fillList() {
+    void fillList() {
         try {
             list.addAll(operationService.list(EnumSet.of(Status.CANCELLED, Status.COMPLETED)));
         } catch (ServiceException e) {
@@ -54,19 +52,19 @@ public class ArchiveOperationController {
             alert.setContentText("Die Einsätze konnten nicht geladen werden!");
             alert.showAndWait();
         }
-        for (int i = 0; i < list.size(); i++) {
+        for (Operation operation : list) {
             Button b = new Button();
             b.setPrefHeight(200);
             b.setPrefWidth(800 / 2);
-            b.setText(list.get(i).opCode());
+            b.setText(operation.opCode());
             b.setOnAction(event -> buttonClicked(b));
             archiveOperationFlowPane.getChildren().add(b);
         }
     }
 
-    Operation detailOperation;
+    private Operation detailOperation;
 
-    public void buttonClicked(Button button) {
+    private void buttonClicked(Button button) {
         int size = archiveOperationFlowPane.getChildren().size();
         int index = 0;
         for (int i = 0; i < size; i++) {
@@ -76,7 +74,6 @@ public class ArchiveOperationController {
             }
         }
         detailOperation = list.get(index);
-
         setOperation();
         setDetailsVisible(true);
     }
@@ -86,7 +83,7 @@ public class ArchiveOperationController {
         String date = "am ";
         if (detailOperation.created() != null) {
             LocalDateTime myDateTime =
-                    LocalDateTime.ofInstant(detailOperation.created(), ZoneOffset.UTC);
+                    LocalDateTime.ofInstant(Objects.requireNonNull(detailOperation.created()), ZoneOffset.UTC);
             date +=
                     myDateTime.getDayOfMonth()
                             + "."
@@ -111,11 +108,11 @@ public class ArchiveOperationController {
         lblAddress.setText(detailOperation.destination());
 
         List<Vehicle> vehicles = detailOperation.vehicles();
-        for (int i = 0; i < vehicles.size(); i++) {
+        for (Vehicle vehicle : vehicles) {
             Button b = new Button();
             b.setPrefHeight(200);
             b.setPrefWidth(640 / 2);
-            b.setText(vehicles.get(i).name());
+            b.setText(vehicle.name());
             fpVehicles.getChildren().add(b);
         }
     }
@@ -124,7 +121,7 @@ public class ArchiveOperationController {
         archiveOperationFlowPane.setVisible(b);
     }
 
-    public void setDetailsVisible(boolean b) {
+    private void setDetailsVisible(boolean b) {
         apDetails.setVisible(b);
     }
 
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 a25085a..99b5dc5 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
@@ -245,17 +245,16 @@ public class CreateOperationController {
     }
 
     public void onArchivLinkClicked() {
-        openNewArchivWindow("ArchiveOperation.fxml");
+        openNewArchivWindow();
     }
 
-    private void openNewArchivWindow(String fxmlFileName) {
-        // TODO: TEST
+    private void openNewArchivWindow() {
         Stage stage = new Stage();
         try {
-            FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("/fxml/" + fxmlFileName));
+            FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("/fxml/ArchiveOperation.fxml"));
             Parent node = fxmlLoader.load();
             ArchiveOperationController archiveOperationController = fxmlLoader.getController();
-            archiveOperationController.setServices(operationService, this);
+            archiveOperationController.setServices(operationService);
             archiveOperationController.fillList();
             stage.setScene(new Scene(node));
         } catch (IOException e) {
diff --git a/src/main/resources/fxml/ArchiveOperation.fxml b/src/main/resources/fxml/ArchiveOperation.fxml
index d9348c1..753976b 100644
--- a/src/main/resources/fxml/ArchiveOperation.fxml
+++ b/src/main/resources/fxml/ArchiveOperation.fxml
@@ -37,12 +37,12 @@
                         <Font name="System Bold" size="18.0" />
                      </font>
                   </Label>
-                  <Label fx:id="lblAddress" layoutX="26.0" layoutY="53.0" prefHeight="22.0" prefWidth="540.0" style="-fx-effect: dropshadow;" text="Label">
+                  <Label fx:id="lblAddress" layoutX="26.0" layoutY="53.0" prefHeight="22.0" prefWidth="540.0" text="Label">
                      <font>
                         <Font size="15.0" />
                      </font>
                   </Label>
-                  <Label fx:id="lblVehicles" layoutX="58.0" layoutY="91.0" prefHeight="46.0" prefWidth="554.0" style="-fx-effect: drop;" text="Label">
+                  <Label fx:id="lblVehicles" layoutX="58.0" layoutY="91.0" prefHeight="46.0" prefWidth="554.0" text="Label">
                      <font>
                         <Font size="15.0" />
                      </font>