Merge branch 'develop'HEADv3.0master

2 files changed, 29 insertions, 2 deletions

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 d8365a7..a6c0566 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
@@ -1,6 +1,7 @@
 package at.ac.tuwien.sepm.assignment.groupphase.application;
 
-import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.controller.CreateOperationController;
+import at.ac.tuwien.sepm.assignment.groupphase.missioncontrol.controller.CreateOperationController;
+import at.ac.tuwien.sepm.assignment.groupphase.util.JDBCConnectionManager;
 import at.ac.tuwien.sepm.assignment.groupphase.util.SpringFXMLLoader;
 import javafx.application.Application;
 import javafx.application.Platform;
@@ -25,7 +26,13 @@ public class MainApplication extends Application {
     public void start(Stage primaryStage) throws Exception {
         primaryStage.setTitle("Einsatz erstellen");
         primaryStage.centerOnScreen();
-        primaryStage.setOnCloseRequest(event -> Platform.exit());
+        primaryStage.setOnCloseRequest(
+                event -> {
+                    final var jdbcConnectionManager =
+                            configApplicationContext.getBean(JDBCConnectionManager.class);
+                    jdbcConnectionManager.closeConnection();
+                    Platform.exit();
+                });
 
         configApplicationContext = new AnnotationConfigApplicationContext(MainApplication.class);
         final var fxmlLoader = configApplicationContext.getBean(SpringFXMLLoader.class);
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/application/PopulateDB.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/application/PopulateDB.java
new file mode 100644
index 0000000..4ff1f78
--- /dev/null
+++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/application/PopulateDB.java
@@ -0,0 +1,20 @@
+package at.ac.tuwien.sepm.assignment.groupphase.application;
+
+import at.ac.tuwien.sepm.assignment.groupphase.util.JDBCConnectionManager;
+import java.io.InputStreamReader;
+import java.sql.SQLException;
+import org.h2.tools.RunScript;
+import org.springframework.core.io.ClassPathResource;
+
+public class PopulateDB {
+    public static void main(String[] args) throws SQLException {
+        JDBCConnectionManager jdbcConnectionManager = new JDBCConnectionManager();
+
+        RunScript.execute(
+                jdbcConnectionManager.getConnection(),
+                new InputStreamReader(
+                        ClassPathResource.class.getResourceAsStream("/sql/testdata.sql")));
+
+        jdbcConnectionManager.closeConnection();
+    }
+}