From cb1440f1b5fbfe9ce93f3a6256af3f021aa6d484 Mon Sep 17 00:00:00 2001
From: Dominic Rogetzer <e1627756@student.tuwien.ac.at>
Date: Mon, 7 May 2018 12:32:18 +0200
Subject: Add Platform.exit() on window-close and add stop-method

---
 .../groupphase/application/MainApplication.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/application/MainApplication.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/application/MainApplication.java
index a8a6c62..01c04d3 100644
--- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/application/MainApplication.java
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/application/MainApplication.java
@@ -3,6 +3,7 @@ package at.ac.tuwien.sepm.assignment.groupphase.application;
 import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.userInterface.CreateOperationController;
 import at.ac.tuwien.sepm.assignment.groupphase.util.SpringFXMLLoader;
 import javafx.application.Application;
+import javafx.application.Platform;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
@@ -24,7 +25,7 @@ public class MainApplication extends Application {
     public void start(Stage primaryStage) throws Exception {
         primaryStage.setTitle("Einsatz erstellen");
         primaryStage.centerOnScreen();
-        // primaryStage.setOnCloseRequest( event -> );
+        primaryStage.setOnCloseRequest(event -> Platform.exit());
 
         configApplicationContext = new AnnotationConfigApplicationContext(MainApplication.class);
         final var fxmlLoader = configApplicationContext.getBean(SpringFXMLLoader.class);
@@ -36,16 +37,16 @@ public class MainApplication extends Application {
                                                 .getResourceAsStream(
                                                         "/fxml/CreateOperationController.fxml"))));
 
-        /*FXMLLoader fxmlLoader =
-                new FXMLLoader(getClass().getResource("/fxml/CreateOperationController.fxml"));
-        Parent node = fxmlLoader.load();
-        // TODO:*/
         CreateOperationController controller =
-                configApplicationContext.getBean(
-                        CreateOperationController.class); // fxmlLoader.getController();
+                configApplicationContext.getBean(CreateOperationController.class);
         controller.updateList();
-        // primaryStage.setScene(new Scene(node));
         primaryStage.show();
         primaryStage.toFront();
     }
+
+    @Override
+    public void stop() throws Exception {
+        super.stop();
+        configApplicationContext.close();
+    }
 }
-- 
cgit v1.2.3-70-g09d2