1 files changed, 13 insertions, 11 deletions
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/EmployeeListItemController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/EmployeeListItemController.java
index 5246d03..5d1950f 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/EmployeeListItemController.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/EmployeeListItemController.java
@@ -1,14 +1,17 @@
 package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller;
 
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Employee;
+import at.ac.tuwien.sepm.assignment.groupphase.util.SpringFXMLLoader;
+import at.ac.tuwien.sepm.assignment.groupphase.util.SpringFXMLLoader.FXMLWrapper;
 import java.io.IOException;
 import javafx.fxml.FXML;
-import javafx.fxml.FXMLLoader;
 import javafx.scene.Node;
 import javafx.scene.control.Label;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
+import org.springframework.stereotype.Controller;
 
+@Controller
 public class EmployeeListItemController {
 
     @FXML private Label lblName;
@@ -38,20 +41,19 @@ public class EmployeeListItemController {
         imgDriver.setImage(new Image("../images/NEF.png")); // TODO: add real picture here
     }
 
-    public static EmployeeListItemController createEmployeeListItemController(Employee employee)
-            throws IOException {
-        EmployeeListItemController controller = createEmployeeListItemController();
+    public static EmployeeListItemController createEmployeeListItemController(
+            SpringFXMLLoader fxmlLoader, Employee employee) throws IOException {
+        EmployeeListItemController controller = createEmployeeListItemController(fxmlLoader);
         controller.setData(employee);
         return controller;
     }
 
-    public static EmployeeListItemController createEmployeeListItemController() throws IOException {
-        FXMLLoader loader =
-                new FXMLLoader(
-                        EmployeeListItemController.class.getResource(
-                                "/fxml/employeeListItem.fxml"));
-        Node root = loader.load();
-        EmployeeListItemController controller = loader.getController();
+    public static EmployeeListItemController createEmployeeListItemController(
+            SpringFXMLLoader loader) throws IOException {
+        FXMLWrapper<Object, EmployeeListItemController> wrapper =
+                loader.loadAndWrap("/fxml/employeeListItem.fxml", EmployeeListItemController.class);
+        Node root = (Node) wrapper.getLoadedObject();
+        EmployeeListItemController controller = wrapper.getController();
         controller.rootElement = root;
         return controller;
     }