michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 14:28:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into issue#5_fix_pre-race_boats_on_leaderboard

Browse Source 
# Conflicts:
#	src/main/java/seng302/controllers/RaceController.java
#	src/main/java/seng302/controllers/StartScreenController.java
This commit is contained in:
Zhi You Tan
2017-05-23 11:31:18 +12:00
parent 6f9a8e5581 6f1b0b06c3
commit ffd40fef6d
34 changed files with 744 additions and 1750 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/controllers/StartScreenController.java
+9 -7
View File
@@ -22,7 +22,7 @@ import javafx.scene.layout.GridPane;
import javafx.scene.layout.Pane;
import javafx.scene.paint.Color;
import seng302.models.Yacht;
import seng302.models.parsers.StreamParser;
import seng302.models.stream.StreamParser;
public class StartScreenController implements Initializable {
@@ -56,12 +56,13 @@ public class StartScreenController implements Initializable {
contentPane.getChildren().removeAll();
contentPane.getChildren().clear();
contentPane.getStylesheets().add(getClass().getResource("/css/master.css").toString());
contentPane.getChildren()
.addAll((Pane) FXMLLoader.load(getClass().getResource(jfxUrl)));
} catch (javafx.fxml.LoadException e) {
System.err.println(e.getCause());
} catch (IOException e) {
System.err.println(e);
contentPane.getChildren().addAll((Pane) FXMLLoader.load(getClass().getResource(jfxUrl)));
}
catch(javafx.fxml.LoadException e){
e.printStackTrace();
}
catch(IOException e){
e.printStackTrace();
}
}
@@ -137,6 +138,7 @@ public class StartScreenController implements Initializable {
}
public void switchToRaceView() {
StreamParser.boatPositions.clear();
switchedToRaceView = true;
setContentPane("/views/RaceView.fxml");
}