From 079f15cd59f9dc385596fe729d6f2822cdff2579 Mon Sep 17 00:00:00 2001 From: Seil0 Date: Sat, 17 Nov 2018 13:02:41 +0100 Subject: [PATCH] player fixes & lib updates * openjfx 11 -> 11.0.1 * sqlite-jdbc 3.23.1 -> 3.25.2 * fixed build in player not working --- pom.xml | 10 +++++----- .../HomeFlix/application/MainWindowController.java | 3 ++- src/main/java/kellerkinder/HomeFlix/player/Player.java | 3 ++- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 57509a4..34e6dd2 100644 --- a/pom.xml +++ b/pom.xml @@ -27,19 +27,19 @@ org.openjfx javafx-controls - 11 + 11.0.1 org.openjfx javafx-fxml - 11 + 11.0.1 org.openjfx javafx-media - 11 + 11.0.1 @@ -63,7 +63,7 @@ org.xerial sqlite-jdbc - 3.23.1 + 3.25.2 @@ -114,7 +114,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.2.0 + 3.2.1 Project-HomeFlix true diff --git a/src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java b/src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java index e74a696..95aea3d 100644 --- a/src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java +++ b/src/main/java/kellerkinder/HomeFlix/application/MainWindowController.java @@ -19,6 +19,7 @@ * MA 02110-1301, USA. * */ + package kellerkinder.HomeFlix.application; import java.awt.Desktop; @@ -165,7 +166,7 @@ public class MainWindowController { private boolean autoplay = false; private final String version = "0.7.0"; - private final String buildNumber = "161"; + private final String buildNumber = "163"; private final String versionName = "toothless dragon"; private String btnStyle; private String color; diff --git a/src/main/java/kellerkinder/HomeFlix/player/Player.java b/src/main/java/kellerkinder/HomeFlix/player/Player.java index 1c8d946..98da798 100644 --- a/src/main/java/kellerkinder/HomeFlix/player/Player.java +++ b/src/main/java/kellerkinder/HomeFlix/player/Player.java @@ -45,7 +45,8 @@ public class Player { */ public Player(MainWindowController mainWindowController) { try { - FXMLLoader fxmlLoader = new FXMLLoader(ClassLoader.getSystemResource("fxml/PlayerWindow.fxml")); + FXMLLoader fxmlLoader = new FXMLLoader(); + fxmlLoader.setLocation(getClass().getResource("/fxml/PlayerWindow.fxml")); pane = (AnchorPane) fxmlLoader.load(); stage = new Stage(); scene = new Scene(pane);