From efc71f20036a814b845059290d8cb19192efbd2e Mon Sep 17 00:00:00 2001 From: Kusal Ekanayake Date: Wed, 27 Sep 2017 19:27:13 +1300 Subject: [PATCH] Resolved issue #69 and added dock icon for splash screen. --- src/main/java/seng302/visualiser/GameClient.java | 11 ----------- .../seng302/visualiser/controllers/ViewManager.java | 2 ++ 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/main/java/seng302/visualiser/GameClient.java b/src/main/java/seng302/visualiser/GameClient.java index c2f69455..2d167b8c 100644 --- a/src/main/java/seng302/visualiser/GameClient.java +++ b/src/main/java/seng302/visualiser/GameClient.java @@ -96,7 +96,6 @@ public class GameClient { socketThread.addDisconnectionListener((cause) -> { showConnectionError(cause); tearDownConnection(); - Platform.runLater(this::loadStartScreen); }); socketThread.addStreamObserver(this::parsePackets); @@ -159,16 +158,6 @@ public class GameClient { } } - private void loadStartScreen() { - FXMLLoader fxmlLoader = new FXMLLoader( - getClass().getResource("/views/StartScreenView.fxml")); - try { - holderPane.getChildren().clear(); - holderPane.getChildren().add(fxmlLoader.load()); - } catch (IOException e) { - showConnectionError("JavaFX crashed. Please restart the app"); - } - } private void showConnectionError (String message) { Platform.runLater(() -> { diff --git a/src/main/java/seng302/visualiser/controllers/ViewManager.java b/src/main/java/seng302/visualiser/controllers/ViewManager.java index 3c69d0b0..075310b6 100644 --- a/src/main/java/seng302/visualiser/controllers/ViewManager.java +++ b/src/main/java/seng302/visualiser/controllers/ViewManager.java @@ -64,6 +64,8 @@ public class ViewManager { this.stage = stage; Parent root = FXMLLoader.load(getClass().getResource("/views/SplashScreen.fxml")); Scene scene = new Scene(root); + stage.setTitle("Party Parrots At Sea"); + stage.getIcons().add(new Image(getClass().getResourceAsStream("/PP.png"))); stage.setScene(scene); stage.initStyle(StageStyle.UNDECORATED); stage.show();