Merged master.

This commit is contained in:
David Wu
2017-08-17 13:55:49 +12:00
parent 5a188f0582
commit 09eaf6d968
2 changed files with 5 additions and 2 deletions
@@ -15,8 +15,6 @@ import java.util.logging.Logger;
*/ */
public class MockOutput implements RunnableWithFramePeriod { public class MockOutput implements RunnableWithFramePeriod {
/** /**
* A queue to send messages to client. * A queue to send messages to client.
*/ */
@@ -45,6 +45,11 @@ public class App extends Application {
loadStart(App.stage); loadStart(App.stage);
} }
/**
* Initiation
* @param stage
* @throws IOException
*/
public void loadStart(Stage stage) throws IOException { public void loadStart(Stage stage) throws IOException {
FXMLLoader loader = new FXMLLoader(App.class.getResource("/visualiser/scenes/main.fxml")); FXMLLoader loader = new FXMLLoader(App.class.getResource("/visualiser/scenes/main.fxml"));
Parent root = loader.load(); Parent root = loader.load();