Merge branch 'CommandFactory' into Development

# Conflicts: # racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java
2017-08-08 02:52:29 +12:00
parent 2920b6cf23 0bf2c6106b
commit 53c9192130
10 changed files with 645 additions and 21 deletions
@@ -241,7 +241,7 @@ public abstract class Race {
     * @param windBearing New wind bearing.
     * @param windSpeedKnots New wind speed, in knots.
     */
-    protected void setWind(Bearing windBearing, double windSpeedKnots) {
+    public void setWind(Bearing windBearing, double windSpeedKnots) {
        Wind wind = new Wind(windBearing, windSpeedKnots);
        setWind(wind);
    }
@@ -250,7 +250,7 @@ public abstract class Race {
     * Updates the race to have a specified wind (bearing and speed).
     * @param wind New wind.
     */
-    protected void setWind(Wind wind) {
+    public void setWind(Wind wind) {
        this.raceWind.setValue(wind);
    }