Merge branch 'master' into bug2822_boatcolors_merged_with_eol_changes

Change-Id: Id8ebf0c05a7a269c2f98342af1f43970127532ab
This commit is contained in:
Axel Uhl
2017-12-25 12:52:32 +01:00
133 changed files with 6968 additions and 1292 deletions
@@ -57,7 +57,8 @@ public class RaceLogConnectivityParamsLoadAndStoreTest extends AbstractConnectiv
theSeries.addRaceColumn("R2", racingEventService);
theSeries.addRaceColumn("R3", racingEventService);
final RegattaLeaderboard leaderboard = racingEventService.addRegattaLeaderboard(regatta.getRegattaIdentifier(), /* leaderboardDisplayName */ null, new int[] { 5, 9 });
RaceLogTrackingAdapterFactory.INSTANCE.getAdapter(domainObjectFactory.getBaseDomainFactory()).denoteAllRacesForRaceLogTracking(racingEventService, leaderboard);
RaceLogTrackingAdapterFactory.INSTANCE.getAdapter(domainObjectFactory.getBaseDomainFactory()).denoteAllRacesForRaceLogTracking(racingEventService, leaderboard,
/* race name prefix */ null);
final RaceLogConnectivityParams rlParams = new RaceLogConnectivityParams(
racingEventService, regatta, leaderboard.getRaceColumnByName("R2"), fleet, leaderboard,
delayToLiveInMillis, domainObjectFactory.getBaseDomainFactory(), trackWind,