From d6cf253ba3e40f8bc130774384a7c681b0420c6a Mon Sep 17 00:00:00 2001 From: Dominic Rogetzer Date: Fri, 18 May 2018 18:09:49 +0200 Subject: Change FilterEmployeeController to use SpringFXMLLoader [#25949] --- .../controller/FilterEmployeesController.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/FilterEmployeesController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/FilterEmployeesController.java index 4129460..c8395eb 100644 --- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/FilterEmployeesController.java +++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/controller/FilterEmployeesController.java @@ -1,9 +1,10 @@ package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller; +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.util.function.Consumer; import javafx.fxml.FXML; -import javafx.fxml.FXMLLoader; import javafx.scene.Node; import javafx.scene.control.TextField; import org.springframework.stereotype.Controller; @@ -40,13 +41,13 @@ public class FilterEmployeesController { this.consumerAddEmployeeClicked = callback; } - public static FilterEmployeesController createFilterEmployeesController() throws IOException { - FXMLLoader loader = - new FXMLLoader( - FilterEmployeesController.class.getResource( - "/fxml/filterEmployeesControl.fxml")); - Node root = loader.load(); - FilterEmployeesController controller = loader.getController(); + public static FilterEmployeesController createFilterEmployeesController( + SpringFXMLLoader fxmlLoader) throws IOException { + FXMLWrapper wrapper = + fxmlLoader.loadAndWrap( + "/fxml/filterEmployeesControl.fxml", FilterEmployeesController.class); + Node root = (Node) wrapper.getLoadedObject(); + FilterEmployeesController controller = wrapper.getController(); controller.rootElement = root; return controller; } -- cgit v1.2.3-70-g09d2