Merge remote-tracking branch 'remotes/origin/master' into story77

# Conflicts: # racevisionGame/src/main/java/mock/app/Event.java # racevisionGame/src/main/java/visualiser/Controllers/HostController.java # racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java # racevisionGame/src/main/java/visualiser/Controllers/MainController.java # racevisionGame/src/main/resources/visualiser/scenes/main.fxml # settings/keyBindings.xml
2017-09-13 14:00:40 +12:00
parent 731c0b0e61
commit 70ccb4cf1c
44 changed files with 911 additions and 1828 deletions
@@ -15,7 +15,7 @@ import java.util.Map;
 * Class that processes user selected annotation visibility options to
 * display the requested information on the
 * {@link ResizableRaceCanvas}. These are displayed
- * via the {@link visualiser.Controllers.RaceController}. <br>
+ * via the {@link visualiser.Controllers.RaceViewController}. <br>
 * Annotation options for a {@link VisualiserBoat} include: its name,
 * abbreviation, speed, the time since it passed the last
 * {@link shared.model.Mark}, estimated time to the next marker,
@@ -18,7 +18,7 @@ import java.util.List;
 /**
 * This JavaFX Canvas is used to update and display details for a
 * {@link RaceMap} via the
- * {@link visualiser.Controllers.RaceController}.<br>
+ * {@link visualiser.Controllers.RaceViewController}.<br>
 * It fills it's parent and cannot be downsized. <br>
 * Details displayed include:
 *  {@link VisualiserBoat}s (and their
@@ -21,7 +21,7 @@ import java.util.Map;
 * placing position as they complete each {@link shared.model.Leg} by
 * passing a course {@link shared.model.Mark}. <br>
 * This sparkline is displayed using the
- * {@link visualiser.Controllers.RaceController}.
+ * {@link visualiser.Controllers.RaceViewController}.
 */
 public class Sparkline {

@@ -8,8 +8,8 @@ import shared.model.GPSCoordinate;
 * {@link VisualiserBoat Boat} has travelled in a race. <br>
 * TrackPoints are displayed on a
 * {@link ResizableRaceCanvas}, via the
- * {@link visualiser.Controllers.RaceController}. <br>
- * Track points can be made visible or hidden via the RaceController's
+ * {@link visualiser.Controllers.RaceViewController}. <br>
+ * Track points can be made visible or hidden via the RaceViewController's
 * {@link Annotations}.
 */
 public class TrackPoint {
@@ -17,7 +17,7 @@ import java.util.List;
 * This class is used to represent and store information about a boat which may
 * travel around in a race. It is displayed on the
 * {@link ResizableRaceCanvas ResizableRaceCanvas} via the
- * {@link visualiser.Controllers.RaceController RaceController}.
+ * {@link visualiser.Controllers.RaceViewController RaceViewController}.
 */
 public class VisualiserBoat extends Boat {

@@ -66,7 +66,7 @@ public class VisualiserRaceEvent {


        this.serverConnection = new ServerConnection(socket, visualiserRaceState, raceCommands, requestType);
-        this.serverConnectionThread = new Thread(serverConnection, "StartController.enterLobby()->serverConnection thread " + serverConnection);
+        this.serverConnectionThread = new Thread(serverConnection, "RaceStartController.enterLobby()->serverConnection thread " + serverConnection);
        this.serverConnectionThread.start();