diff --git a/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/MongoObjectFactory.java b/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/MongoObjectFactory.java index 57791502fb8..bf162d3fc35 100755 --- a/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/MongoObjectFactory.java +++ b/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/MongoObjectFactory.java @@ -22,7 +22,7 @@ public interface MongoObjectFactory { * update received will be appended to the MongoDB and can later be retrieved. The key used to identify the race is * the {@link RaceDefinition#getName() race name} and the {@link Regatta#getName() event name}. */ - void addWindTrackDumper(TrackedRegatta trackedEvent, TrackedRace trackedRace, WindSource windSource); + void addWindTrackDumper(TrackedRegatta trackedRegatta, TrackedRace trackedRace, WindSource windSource); /** * Stores the configuration data of leaderboard in the Mongo DB associated with this diff --git a/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java b/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java index 0c5b8cc24f2..c14d86af475 100755 --- a/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java +++ b/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java @@ -73,9 +73,9 @@ public class MongoObjectFactoryImpl implements MongoObjectFactory { } @Override - public void addWindTrackDumper(TrackedRegatta trackedEvent, TrackedRace trackedRace, WindSource windSource) { + public void addWindTrackDumper(TrackedRegatta trackedRegatta, TrackedRace trackedRace, WindSource windSource) { WindTrack windTrack = trackedRace.getOrCreateWindTrack(windSource); - windTrack.addListener(new MongoWindListener(trackedEvent, trackedRace, windSource, this, database)); + windTrack.addListener(new MongoWindListener(trackedRegatta, trackedRace, windSource, this, database)); } public DBCollection getWindTrackCollection() { diff --git a/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoWindListener.java b/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoWindListener.java index 7269fa2f3f3..144022de142 100755 --- a/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoWindListener.java +++ b/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoWindListener.java @@ -10,16 +10,16 @@ import com.sap.sailing.domain.tracking.TrackedRace; import com.sap.sailing.domain.tracking.Wind; public class MongoWindListener implements com.sap.sailing.domain.tracking.WindListener { - private final TrackedRegatta trackedEvent; + private final TrackedRegatta trackedRegatta; private final TrackedRace trackedRace; private final WindSource windSource; private final MongoObjectFactoryImpl mongoObjectFactory; private final DBCollection windTracksCollection; - public MongoWindListener(TrackedRegatta trackedEvent, TrackedRace trackedRace, WindSource windSource, + public MongoWindListener(TrackedRegatta trackedRegatta, TrackedRace trackedRace, WindSource windSource, MongoObjectFactory mongoObjectFactory, DB database) { super(); - this.trackedEvent = trackedEvent; + this.trackedRegatta = trackedRegatta; this.trackedRace = trackedRace; this.windSource = windSource; this.mongoObjectFactory = (MongoObjectFactoryImpl) mongoObjectFactory; @@ -28,13 +28,13 @@ public class MongoWindListener implements com.sap.sailing.domain.tracking.WindLi @Override public void windDataReceived(Wind wind) { - DBObject windTrackEntry = mongoObjectFactory.storeWindTrackEntry(trackedEvent.getRegatta(), trackedRace.getRace(), windSource, wind); + DBObject windTrackEntry = mongoObjectFactory.storeWindTrackEntry(trackedRegatta.getRegatta(), trackedRace.getRace(), windSource, wind); windTracksCollection.insert(windTrackEntry); } @Override public void windDataRemoved(Wind wind) { - DBObject windTrackEntry = mongoObjectFactory.storeWindTrackEntry(trackedEvent.getRegatta(), trackedRace.getRace(), windSource, wind); + DBObject windTrackEntry = mongoObjectFactory.storeWindTrackEntry(trackedRegatta.getRegatta(), trackedRace.getRace(), windSource, wind); windTracksCollection.remove(windTrackEntry); } diff --git a/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoWindStoreImpl.java b/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoWindStoreImpl.java index 6e563481b29..cb67a195364 100755 --- a/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoWindStoreImpl.java +++ b/java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoWindStoreImpl.java @@ -48,26 +48,26 @@ public class MongoWindStoreImpl extends EmptyWindStore implements MongoWindStore * additions to the wind track will be written to the MongoDB. */ @Override - public WindTrack getWindTrack(TrackedRegatta trackedEvent, TrackedRace trackedRace, WindSource windSource, + public WindTrack getWindTrack(TrackedRegatta trackedRegatta, TrackedRace trackedRace, WindSource windSource, long millisecondsOverWhichToAverage, long delayForWindEstimationCacheInvalidation) { WindTrack result; if (windSource.canBeStored()) { - result = domainObjectFactory.loadWindTrack(trackedEvent.getRegatta(), trackedRace.getRace(), windSource, + result = domainObjectFactory.loadWindTrack(trackedRegatta.getRegatta(), trackedRace.getRace(), windSource, millisecondsOverWhichToAverage); - result.addListener(new MongoWindListener(trackedEvent, trackedRace, windSource, mongoObjectFactory, db)); + result.addListener(new MongoWindListener(trackedRegatta, trackedRace, windSource, mongoObjectFactory, db)); } else { - result = super.getWindTrack(trackedEvent, trackedRace, windSource, millisecondsOverWhichToAverage, delayForWindEstimationCacheInvalidation); + result = super.getWindTrack(trackedRegatta, trackedRace, windSource, millisecondsOverWhichToAverage, delayForWindEstimationCacheInvalidation); } return result; } @Override - public Map loadWindTracks(TrackedRegatta trackedEvent, + public Map loadWindTracks(TrackedRegatta trackedRegatta, TrackedRace trackedRace, long millisecondsOverWhichToAverageWind) { Map result = domainObjectFactory.loadWindTracks( - trackedEvent.getRegatta(), trackedRace.getRace(), millisecondsOverWhichToAverageWind); + trackedRegatta.getRegatta(), trackedRace.getRace(), millisecondsOverWhichToAverageWind); for (Entry e : result.entrySet()) { - e.getValue().addListener(new MongoWindListener(trackedEvent, trackedRace, e.getKey(), mongoObjectFactory, db)); + e.getValue().addListener(new MongoWindListener(trackedRegatta, trackedRace, e.getKey(), mongoObjectFactory, db)); } return result; } diff --git a/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/EndToEndListeningStoreAndFowardTest.java b/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/EndToEndListeningStoreAndFowardTest.java index 126f4d0ad2f..6bc6d9a4507 100755 --- a/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/EndToEndListeningStoreAndFowardTest.java +++ b/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/EndToEndListeningStoreAndFowardTest.java @@ -107,8 +107,8 @@ public class EndToEndListeningStoreAndFowardTest { Set allTrackedRaces = new HashSet(); Iterable allEvents = racingEventService.getAllRegattas(); for (Regatta event : allEvents) { - DynamicTrackedRegatta trackedEvent = racingEventService.getTrackedRegatta(event); - Iterable trackedRaces = trackedEvent.getTrackedRaces(); + DynamicTrackedRegatta trackedRegatta = racingEventService.getTrackedRegatta(event); + Iterable trackedRaces = trackedRegatta.getTrackedRaces(); for (TrackedRace trackedRace : trackedRaces) { allTrackedRaces.add(trackedRace); } @@ -136,8 +136,8 @@ public class EndToEndListeningStoreAndFowardTest { Set allTrackedRaces = new HashSet(); Iterable allEvents = racingEventService.getAllRegattas(); for (Regatta event : allEvents) { - DynamicTrackedRegatta trackedEvent = racingEventService.getTrackedRegatta(event); - Iterable trackedRaces = trackedEvent.getTrackedRaces(); + DynamicTrackedRegatta trackedRegatta = racingEventService.getTrackedRegatta(event); + Iterable trackedRaces = trackedRegatta.getTrackedRaces(); for (TrackedRace trackedRace : trackedRaces) { allTrackedRaces.add(trackedRace); } @@ -188,8 +188,8 @@ public class EndToEndListeningStoreAndFowardTest { Set allNewTrackedRaces = new HashSet(); Iterable allNewEvents = racingEventService.getAllRegattas(); for (Regatta event : allNewEvents) { - DynamicTrackedRegatta trackedEvent = racingEventService.getTrackedRegatta(event); - Iterable trackedRaces = trackedEvent.getTrackedRaces(); + DynamicTrackedRegatta trackedRegatta = racingEventService.getTrackedRegatta(event); + Iterable trackedRaces = trackedRegatta.getTrackedRaces(); for (TrackedRace trackedRace : trackedRaces) { allNewTrackedRaces.add(trackedRace); } @@ -238,8 +238,8 @@ public class EndToEndListeningStoreAndFowardTest { Set allTrackedRaces = new HashSet(); Iterable allEvents = racingEventService.getAllRegattas(); for (Regatta event : allEvents) { - DynamicTrackedRegatta trackedEvent = racingEventService.getTrackedRegatta(event); - Iterable trackedRaces = trackedEvent.getTrackedRaces(); + DynamicTrackedRegatta trackedRegatta = racingEventService.getTrackedRegatta(event); + Iterable trackedRaces = trackedRegatta.getTrackedRaces(); for (TrackedRace trackedRace : trackedRaces) { allTrackedRaces.add(trackedRace); } @@ -261,8 +261,8 @@ public class EndToEndListeningStoreAndFowardTest { Set allNewTrackedRaces = new HashSet(); Iterable allNewEvents = racingEventService.getAllRegattas(); for (Regatta event : allNewEvents) { - DynamicTrackedRegatta trackedEvent = racingEventService.getTrackedRegatta(event); - Iterable trackedRaces = trackedEvent.getTrackedRaces(); + DynamicTrackedRegatta trackedRegatta = racingEventService.getTrackedRegatta(event); + Iterable trackedRaces = trackedRegatta.getTrackedRaces(); for (TrackedRace trackedRace : trackedRaces) { allNewTrackedRaces.add(trackedRace); } @@ -280,8 +280,8 @@ public class EndToEndListeningStoreAndFowardTest { Set allTrackedRaces = new HashSet(); Iterable allEvents = racingEventService.getAllRegattas(); for (Regatta event : allEvents) { - DynamicTrackedRegatta trackedEvent = racingEventService.getTrackedRegatta(event); - Iterable trackedRaces = trackedEvent.getTrackedRaces(); + DynamicTrackedRegatta trackedRegatta = racingEventService.getTrackedRegatta(event); + Iterable trackedRaces = trackedRegatta.getTrackedRaces(); for (TrackedRace trackedRace : trackedRaces) { allTrackedRaces.add(trackedRace); } diff --git a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SwissTimingFactory.java b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SwissTimingFactory.java index ad66ed06a8f..81b5a8f14f5 100755 --- a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SwissTimingFactory.java +++ b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SwissTimingFactory.java @@ -49,7 +49,7 @@ public interface SwissTimingFactory { SwissTimingConfiguration createSwissTimingConfiguration(String name, String hostname, int port, boolean canSendRequests); - SwissTimingRaceTracker createRaceTracker(String raceID, String hostname, int port, boolean canSendRequests, WindStore windStore, RaceSpecificMessageLoader messageLoader, DomainFactory domainFactory, TrackedRegattaRegistry trackedEventRegistry) throws InterruptedException, UnknownHostException, IOException, ParseException; + SwissTimingRaceTracker createRaceTracker(String raceID, String hostname, int port, boolean canSendRequests, WindStore windStore, RaceSpecificMessageLoader messageLoader, DomainFactory domainFactory, TrackedRegattaRegistry trackedRegattaRegistry) throws InterruptedException, UnknownHostException, IOException, ParseException; Race createRace(String raceId, String description, TimePoint startTime); diff --git a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingFactoryImpl.java b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingFactoryImpl.java index 53f6e24762f..eb2563d8a51 100755 --- a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingFactoryImpl.java +++ b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingFactoryImpl.java @@ -77,10 +77,10 @@ public class SwissTimingFactoryImpl implements SwissTimingFactory { @Override public SwissTimingRaceTracker createRaceTracker(String raceID, String hostname, int port, boolean canSendRequests, WindStore windStore, RaceSpecificMessageLoader messageLoader, DomainFactory domainFactory, - TrackedRegattaRegistry trackedEventRegistry) throws InterruptedException, UnknownHostException, IOException, + TrackedRegattaRegistry trackedRegattaRegistry) throws InterruptedException, UnknownHostException, IOException, ParseException { return new SwissTimingRaceTrackerImpl(raceID, hostname, port, windStore, domainFactory, this, messageLoader, - trackedEventRegistry, canSendRequests); + trackedRegattaRegistry, canSendRequests); } @Override diff --git a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingRaceTrackerImpl.java b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingRaceTrackerImpl.java index 1c10b626768..3fef699eada 100644 --- a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingRaceTrackerImpl.java +++ b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingRaceTrackerImpl.java @@ -69,7 +69,7 @@ public class SwissTimingRaceTrackerImpl extends AbstractRaceTrackerImpl implemen protected SwissTimingRaceTrackerImpl(String raceID, String hostname, int port, WindStore windStore, DomainFactory domainFactory, SwissTimingFactory factory, RaceSpecificMessageLoader messageLoader, - TrackedRegattaRegistry trackedEventRegistry, boolean canSendRequests) throws InterruptedException, + TrackedRegattaRegistry trackedRegattaRegistry, boolean canSendRequests) throws InterruptedException, UnknownHostException, IOException, ParseException { super(); this.connector = factory.getOrCreateSailMasterConnector(hostname, port, messageLoader, canSendRequests); @@ -80,7 +80,7 @@ public class SwissTimingRaceTrackerImpl extends AbstractRaceTrackerImpl implemen this.id = createID(raceID, hostname, port); connector.addSailMasterListener(raceID, this); event = domainFactory.getOrCreateEvent(raceID); - setTrackedEvent(trackedEventRegistry.getOrCreateTrackedRegatta(event)); + setTrackedEvent(trackedRegattaRegistry.getOrCreateTrackedRegatta(event)); connector.trackRace(raceID); } diff --git a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingTrackingConnectivityParameters.java b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingTrackingConnectivityParameters.java index df1b4746e65..af3b9dd8500 100755 --- a/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingTrackingConnectivityParameters.java +++ b/java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingTrackingConnectivityParameters.java @@ -33,9 +33,9 @@ public class SwissTimingTrackingConnectivityParameters implements RaceTrackingCo } @Override - public RaceTracker createRaceTracker(TrackedRegattaRegistry trackedEventRegistry) throws Exception { + public RaceTracker createRaceTracker(TrackedRegattaRegistry trackedRegattaRegistry) throws Exception { return swissTimingFactory.createRaceTracker(raceID, hostname, port, canSendRequests, windStore, messageLoader, - domainFactory, trackedEventRegistry); + domainFactory, trackedRegattaRegistry); } @Override diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseUpdateTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseUpdateTest.java index aded73f46fc..9ff4378bc35 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseUpdateTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseUpdateTest.java @@ -55,7 +55,7 @@ public class CourseUpdateTest extends AbstractTracTracLiveTest { private RaceDefinition race; private Course course; private Regatta domainEvent; - private DynamicTrackedRegatta trackedEvent; + private DynamicTrackedRegatta trackedRegatta; private final RouteData[] routeData = new RouteData[1]; private DomainFactory domainFactory; @@ -68,9 +68,9 @@ public class CourseUpdateTest extends AbstractTracTracLiveTest { super.setUp(); domainFactory = new DomainFactoryImpl(new com.sap.sailing.domain.base.impl.DomainFactoryImpl()); domainEvent = domainFactory.getOrCreateEvent(getEvent()); - trackedEvent = new DynamicTrackedRegattaImpl(domainEvent); + trackedRegatta = new DynamicTrackedRegattaImpl(domainEvent); ArrayList receivers = new ArrayList(); - receivers.add(new RaceCourseReceiver(domainFactory, trackedEvent, getEvent(), /* millisecondsOverWhichToAverageWind */ + receivers.add(new RaceCourseReceiver(domainFactory, trackedRegatta, getEvent(), /* millisecondsOverWhichToAverageWind */ EmptyWindStore.INSTANCE, new DynamicRaceDefinitionSet() { @Override public void addRaceDefinition(RaceDefinition race) {} @@ -111,7 +111,7 @@ public class CourseUpdateTest extends AbstractTracTracLiveTest { private void testLegStructure(int minimalNumberOfLegsExpected) throws InterruptedException { waitForRouteData(); assertTrue(course.getLegs().size() >= minimalNumberOfLegsExpected); - TrackedRace trackedRace = trackedEvent.getTrackedRace(race); + TrackedRace trackedRace = trackedRegatta.getTrackedRace(race); assertEquals(course.getLegs().size(), Util.size(trackedRace.getTrackedLegs())); Iterator legIter = course.getLegs().iterator(); for (TrackedLeg trackedLeg : trackedRace.getTrackedLegs()) { diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/FetchTracksAndStoreLocallyTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/FetchTracksAndStoreLocallyTest.java index 4d3e01cf4a1..dcac560f9a5 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/FetchTracksAndStoreLocallyTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/FetchTracksAndStoreLocallyTest.java @@ -60,8 +60,8 @@ public class FetchTracksAndStoreLocallyTest extends OnlineTracTracBasedTest { track.addGPSFix((GPSFixMoving) fix); } }; - DynamicTrackedRegatta trackedEvent = getTrackedEvent(); - trackedEvent.addRaceListener(new RaceListener() { + DynamicTrackedRegatta trackedRegatta = getTrackedEvent(); + trackedRegatta.addRaceListener(new RaceListener() { @Override public void raceAdded(TrackedRace trackedRace) { System.out.println("Subscribing raw position listener for race "+trackedRace); diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/OnlineTracTracBasedTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/OnlineTracTracBasedTest.java index a36e4c764b4..4c0bd616f91 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/OnlineTracTracBasedTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/OnlineTracTracBasedTest.java @@ -53,7 +53,7 @@ import com.tractrac.clientmodule.Race; public abstract class OnlineTracTracBasedTest extends AbstractTracTracLiveTest { private DomainFactoryImpl domainFactory; private Regatta domainEvent; - private DynamicTrackedRegatta trackedEvent; + private DynamicTrackedRegatta trackedRegatta; private RaceDefinition race; private DynamicTrackedRace trackedRace; @@ -89,7 +89,7 @@ public abstract class OnlineTracTracBasedTest extends AbstractTracTracLiveTest { throws InterruptedException { setStoredDataLoaded(false); ArrayList receivers = new ArrayList(); - for (Receiver r : domainFactory.getUpdateReceivers(trackedEvent, getEvent(), EmptyWindStore.INSTANCE, + for (Receiver r : domainFactory.getUpdateReceivers(trackedRegatta, getEvent(), EmptyWindStore.INSTANCE, /* startOfTracking */ null, /* endOfTracking */ null, new DynamicRaceDefinitionSet() { @Override public void addRaceDefinition(RaceDefinition race) { @@ -132,7 +132,7 @@ public abstract class OnlineTracTracBasedTest extends AbstractTracTracLiveTest { domainFactory = new DomainFactoryImpl(new com.sap.sailing.domain.base.impl.DomainFactoryImpl()); } domainEvent = domainFactory.getOrCreateEvent(getEvent()); - trackedEvent = new DynamicTrackedRegattaImpl(domainEvent); + trackedRegatta = new DynamicTrackedRegattaImpl(domainEvent); } protected Competitor getCompetitorByName(String nameRegexp) { @@ -206,7 +206,7 @@ public abstract class OnlineTracTracBasedTest extends AbstractTracTracLiveTest { } protected DynamicTrackedRegatta getTrackedEvent() { - return trackedEvent; + return trackedRegatta; } protected Object getSemaphor() { diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReachingLegTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReachingLegTest.java index 6e1b9ee90e5..a72ae85f82f 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReachingLegTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReachingLegTest.java @@ -81,7 +81,7 @@ public class ReachingLegTest extends TrackBasedTest { Iterable competitors, TimePoint timePointForFixes) { BoatClassImpl boatClass = new BoatClassImpl(boatClassName, /* typicallyStartsUpwind */ true); Regatta event = new RegattaImpl(eventName, boatClass); - TrackedRegatta trackedEvent = new TrackedRegattaImpl(event); + TrackedRegatta trackedRegatta = new TrackedRegattaImpl(event); List waypoints = new ArrayList(); // create a two-lap upwind/downwind course: BuoyImpl left = new BuoyImpl("Left lee gate buoy"); @@ -95,7 +95,7 @@ public class ReachingLegTest extends TrackBasedTest { waypoints.add(new WaypointImpl(leeGate)); Course course = new CourseImpl(raceName, waypoints); RaceDefinition race = new RaceDefinitionImpl(raceName, course, boatClass, competitors); - DynamicTrackedRace trackedRace = new DynamicTrackedRaceImpl(trackedEvent, race, EmptyWindStore.INSTANCE, + DynamicTrackedRace trackedRace = new DynamicTrackedRaceImpl(trackedRegatta, race, EmptyWindStore.INSTANCE, /* millisecondsOverWhichToAverageWind */ 30000, /* millisecondsOverWhichToAverageSpeed */ 30000, /* delay for wind estimation cache invalidation */ 0); // in this simplified artificial course, the top mark is exactly north of the right leeward gate, the offset diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReceiveTrackingDataTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReceiveTrackingDataTest.java index 5749a83d34b..a0667a9cfd3 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReceiveTrackingDataTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReceiveTrackingDataTest.java @@ -66,8 +66,8 @@ public class ReceiveTrackingDataTest extends AbstractTracTracLiveTest { }; List listeners = new ArrayList(); Regatta event = domainFactory.getOrCreateEvent(getEvent()); - DynamicTrackedRegatta trackedEvent = new DynamicTrackedRegattaImpl(event); - trackedEvent.addRaceListener(new RaceListener() { + DynamicTrackedRegatta trackedRegatta = new DynamicTrackedRegattaImpl(event); + trackedRegatta.addRaceListener(new RaceListener() { @Override public void raceAdded(TrackedRace trackedRace) { System.out.println("Subscribing raw position listener for race "+trackedRace); @@ -77,7 +77,7 @@ public class ReceiveTrackingDataTest extends AbstractTracTracLiveTest { public void raceRemoved(TrackedRace trackedRace) { } }); - for (Receiver receiver : domainFactory.getUpdateReceivers(trackedEvent, getEvent(), /* start of tracking */ null, + for (Receiver receiver : domainFactory.getUpdateReceivers(trackedRegatta, getEvent(), /* start of tracking */ null, /* end of tracking */ null, EmptyWindStore.INSTANCE, new DynamicRaceDefinitionSet() { @Override public void addRaceDefinition(RaceDefinition race) { @@ -87,7 +87,7 @@ public class ReceiveTrackingDataTest extends AbstractTracTracLiveTest { listeners.add(raceListener); } } - addListenersForStoredDataAndStartController(domainFactory.getUpdateReceivers(trackedEvent, getEvent(), + addListenersForStoredDataAndStartController(domainFactory.getUpdateReceivers(trackedRegatta, getEvent(), /* start of tracking */ null, /* end of tracking */ null, EmptyWindStore.INSTANCE, new DynamicRaceDefinitionSet() { @Override public void addRaceDefinition(RaceDefinition race) { diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackBasedTest.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackBasedTest.java index d52cc3a2d23..e20544ed398 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackBasedTest.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackBasedTest.java @@ -91,7 +91,7 @@ public abstract class TrackBasedTest { Iterable competitors, TimePoint timePointForFixes) { BoatClassImpl boatClass = new BoatClassImpl(boatClassName, /* typicallyStartsUpwind */ true); Regatta event = new RegattaImpl(eventName, boatClass); - TrackedRegatta trackedEvent = new TrackedRegattaImpl(event); + TrackedRegatta trackedRegatta = new TrackedRegattaImpl(event); List waypoints = new ArrayList(); // create a two-lap upwind/downwind course: BuoyImpl left = new BuoyImpl("Left lee gate buoy"); @@ -105,7 +105,7 @@ public abstract class TrackBasedTest { waypoints.add(new WaypointImpl(leeGate)); Course course = new CourseImpl(raceName, waypoints); RaceDefinition race = new RaceDefinitionImpl(raceName, course, boatClass, competitors); - DynamicTrackedRace trackedRace = new DynamicTrackedRaceImpl(trackedEvent, race, EmptyWindStore.INSTANCE, + DynamicTrackedRace trackedRace = new DynamicTrackedRaceImpl(trackedRegatta, race, EmptyWindStore.INSTANCE, /* millisecondsOverWhichToAverageWind */ 30000, /* millisecondsOverWhichToAverageSpeed */ 30000, /* delay for wind estimation cache invalidation */ 0); // in this simplified artificial course, the top mark is exactly north of the right leeward gate diff --git a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/DomainFactory.java b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/DomainFactory.java index 4798034490f..91a13b8e219 100755 --- a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/DomainFactory.java +++ b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/DomainFactory.java @@ -118,7 +118,7 @@ public interface DomainFactory { * available but loses track of the wind, e.g., during server restarts. */ TracTracRaceTracker createRaceTracker(URL paramURL, URI liveURI, URI storedURI, TimePoint startOfTracking, - TimePoint endOfTracking, WindStore windStore, TrackedRegattaRegistry trackedEventRegistry) + TimePoint endOfTracking, WindStore windStore, TrackedRegattaRegistry trackedRegattaRegistry) throws MalformedURLException, FileNotFoundException, URISyntaxException; BoatClass getOrCreateBoatClass(CompetitorClass competitorClass); @@ -130,7 +130,7 @@ public interface DomainFactory { * add} it to the event. Other listeners of those returned will listen for raw position and aggregated * position data and update the {@link TrackedRegatta}'s content accordingly. * - * @param trackedEvent + * @param trackedRegatta * must have been created before through * {@link #getOrCreateTrackedRegatta(com.sap.sailing.domain.base.Regatta)} because otherwise the link to the * {@link Event} can't be established @@ -146,13 +146,13 @@ public interface DomainFactory { * used to update the set of{@link RaceDefinition}s received by the * {@link RaceCourseReceiver} created by this call */ - Iterable getUpdateReceivers(DynamicTrackedRegatta trackedEvent, Event tractracEvent, TimePoint startOfTracking, + Iterable getUpdateReceivers(DynamicTrackedRegatta trackedRegatta, Event tractracEvent, TimePoint startOfTracking, TimePoint endOfTracking, WindStore windStore, DynamicRaceDefinitionSet raceDefinitionSetToUpdate); /** * Creates a {@link RaceDefinition} from a TracTrac {@link Race} and a domain {@link Course} definition. The * resulting {@link RaceDefinition} is added to the {@link com.sap.sailing.domain.base.Regatta} to which - * trackedEvent belongs (see {@link TrackedRegatta#getRegatta()}). It is added to the internal race cache. + * trackedRegatta belongs (see {@link TrackedRegatta#getRegatta()}). It is added to the internal race cache. * The corresponding {@link TrackedRace} object is also created, and the notification of threads waiting on the race * cache such as a blocking {@link #getAndWaitForRaceDefinition(Race)} happens only after the tracked race * has been created and the {@link RaceDefinition} was @@ -166,7 +166,7 @@ public interface DomainFactory { * if not null, after creating the {@link TrackedRace}, the {@link RaceDefinition} is * {@link DynamicRaceDefinitionSet#addRaceDefinition(RaceDefinition) added} to that object. */ - Pair getOrCreateRaceDefinitionAndTrackedRace(TrackedRegatta trackedEvent, Race race, + Pair getOrCreateRaceDefinitionAndTrackedRace(TrackedRegatta trackedRegatta, Race race, Course course, WindStore windStore, long millisecondsOverWhichToAverageWind, DynamicRaceDefinitionSet raceDefinitionSetToUpdate); @@ -181,7 +181,7 @@ public interface DomainFactory { MarkPassing createMarkPassing(TimePoint timePoint, Waypoint passed, com.sap.sailing.domain.base.Competitor competitor); - Iterable getUpdateReceivers(DynamicTrackedRegatta trackedEvent, Event tractracEvent, WindStore windStore, + Iterable getUpdateReceivers(DynamicTrackedRegatta trackedRegatta, Event tractracEvent, WindStore windStore, TimePoint startOfTracking, TimePoint endOfTracking, DynamicRaceDefinitionSet raceDefinitionSetToUpdate, ReceiverType... types); JSONService parseJSONURL(URL jsonURL) throws IOException, ParseException, org.json.simple.parser.ParseException, URISyntaxException; @@ -227,6 +227,6 @@ public interface DomainFactory { * {@link TrackedRegatta} is removed such that {@link #getOrCreateTrackedRegatta(com.sap.sailing.domain.base.Regatta)} * will have to create a new one. */ - void removeRace(Event tractracEvent, Race tractracRace, TrackedRegattaRegistry trackedEventRegistry); + void removeRace(Event tractracEvent, Race tractracRace, TrackedRegattaRegistry trackedRegattaRegistry); } diff --git a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/AbstractReceiverWithQueue.java b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/AbstractReceiverWithQueue.java index d2b6dd986a0..1bbc41e2251 100755 --- a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/AbstractReceiverWithQueue.java +++ b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/AbstractReceiverWithQueue.java @@ -29,7 +29,7 @@ public abstract class AbstractReceiverWithQueue implements Runnable, Re private final LinkedBlockingQueue> queue; private final DomainFactory domainFactory; private final com.tractrac.clientmodule.Event tractracEvent; - private final DynamicTrackedRegatta trackedEvent; + private final DynamicTrackedRegatta trackedRegatta; private Thread thread; /** @@ -38,10 +38,10 @@ public abstract class AbstractReceiverWithQueue implements Runnable, Re */ private boolean receivedEventDuringTimeout; - public AbstractReceiverWithQueue(DomainFactory domainFactory, Event tractracEvent, DynamicTrackedRegatta trackedEvent) { + public AbstractReceiverWithQueue(DomainFactory domainFactory, Event tractracEvent, DynamicTrackedRegatta trackedRegatta) { super(); this.tractracEvent = tractracEvent; - this.trackedEvent = trackedEvent; + this.trackedRegatta = trackedRegatta; this.domainFactory = domainFactory; this.queue = new LinkedBlockingQueue>(); } @@ -60,7 +60,7 @@ public abstract class AbstractReceiverWithQueue implements Runnable, Re } protected DynamicTrackedRegatta getTrackedEvent() { - return trackedEvent; + return trackedRegatta; } public void stopPreemptively() { @@ -142,7 +142,7 @@ public abstract class AbstractReceiverWithQueue implements Runnable, Re RaceDefinition raceDefinition = getDomainFactory().getAndWaitForRaceDefinition(race); com.sap.sailing.domain.base.Regatta domainEvent = getDomainFactory().getOrCreateEvent(getTracTracEvent()); if (domainEvent.getRaceByName(raceDefinition.getName()) != null) { - result = trackedEvent.getTrackedRace(raceDefinition); + result = trackedRegatta.getTrackedRace(raceDefinition); } return result; } diff --git a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java index f1d6e0c40bb..042761c32a1 100644 --- a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java +++ b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java @@ -279,7 +279,7 @@ public class DomainFactoryImpl implements DomainFactory { } @Override - public Iterable getUpdateReceivers(DynamicTrackedRegatta trackedEvent, + public Iterable getUpdateReceivers(DynamicTrackedRegatta trackedRegatta, com.tractrac.clientmodule.Event tractracEvent, WindStore windStore, TimePoint startOfTracking, TimePoint endOfTracking, DynamicRaceDefinitionSet raceDefinitionSetToUpdate, ReceiverType... types) { Collection result = new ArrayList(); @@ -287,24 +287,24 @@ public class DomainFactoryImpl implements DomainFactory { switch (type) { case RACECOURSE: result.add(new RaceCourseReceiver( - this, trackedEvent, tractracEvent, windStore, + this, trackedRegatta, tractracEvent, windStore, raceDefinitionSetToUpdate, WindTrack.DEFAULT_MILLISECONDS_OVER_WHICH_TO_AVERAGE_WIND)); break; case MARKPOSITIONS: result.add(new MarkPositionReceiver( - trackedEvent, tractracEvent, startOfTracking, endOfTracking, this)); + trackedRegatta, tractracEvent, startOfTracking, endOfTracking, this)); break; case RAWPOSITIONS: result.add(new RawPositionReceiver( - trackedEvent, tractracEvent, this)); + trackedRegatta, tractracEvent, this)); break; case MARKPASSINGS: result.add(new MarkPassingReceiver( - trackedEvent, tractracEvent, this)); + trackedRegatta, tractracEvent, this)); break; case RACESTARTFINISH: result.add(new RaceStartedAndFinishedReceiver( - trackedEvent, tractracEvent, this)); + trackedRegatta, tractracEvent, this)); break; } } @@ -312,15 +312,15 @@ public class DomainFactoryImpl implements DomainFactory { } @Override - public Iterable getUpdateReceivers(DynamicTrackedRegatta trackedEvent, + public Iterable getUpdateReceivers(DynamicTrackedRegatta trackedRegatta, com.tractrac.clientmodule.Event tractracEvent, TimePoint startOfTracking, TimePoint endOfTracking, WindStore windStore, DynamicRaceDefinitionSet raceDefinitionSetToUpdate) { - return getUpdateReceivers(trackedEvent, tractracEvent, windStore, startOfTracking, endOfTracking, + return getUpdateReceivers(trackedRegatta, tractracEvent, windStore, startOfTracking, endOfTracking, raceDefinitionSetToUpdate, ReceiverType.RACECOURSE, ReceiverType.MARKPASSINGS, ReceiverType.MARKPOSITIONS, ReceiverType.RACESTARTFINISH, ReceiverType.RAWPOSITIONS); } @Override - public void removeRace(com.tractrac.clientmodule.Event tractracEvent, Race tractracRace, TrackedRegattaRegistry trackedEventRegistry) { + public void removeRace(com.tractrac.clientmodule.Event tractracEvent, Race tractracRace, TrackedRegattaRegistry trackedRegattaRegistry) { RaceDefinition raceDefinition; synchronized (raceCache) { raceDefinition = getExistingRaceDefinitionForRace(tractracRace); @@ -349,13 +349,13 @@ public class DomainFactoryImpl implements DomainFactory { eventCache.remove(key); weakEventCache.remove(tractracEvent); } - TrackedRegatta trackedEvent = trackedEventRegistry.getTrackedRegatta(event); - if (trackedEvent != null) { + TrackedRegatta trackedRegatta = trackedRegattaRegistry.getTrackedRegatta(event); + if (trackedRegatta != null) { // see above; only remove tracked event if it *became* empty because of the tracked race removal here - int oldSizeOfTrackedRaces = Util.size(trackedEvent.getTrackedRaces()); - trackedEvent.removeTrackedRace(raceDefinition); - if (oldSizeOfTrackedRaces > 0 && Util.size(trackedEvent.getTrackedRaces()) == 0) { - trackedEventRegistry.removeTrackedRegatta(event); + int oldSizeOfTrackedRaces = Util.size(trackedRegatta.getTrackedRaces()); + trackedRegatta.removeTrackedRace(raceDefinition); + if (oldSizeOfTrackedRaces > 0 && Util.size(trackedRegatta.getTrackedRaces()) == 0) { + trackedRegattaRegistry.removeTrackedRegatta(event); } } } @@ -364,7 +364,7 @@ public class DomainFactoryImpl implements DomainFactory { } @Override - public Pair getOrCreateRaceDefinitionAndTrackedRace(TrackedRegatta trackedEvent, + public Pair getOrCreateRaceDefinitionAndTrackedRace(TrackedRegatta trackedRegatta, Race race, Course course, WindStore windStore, long millisecondsOverWhichToAverageWind, DynamicRaceDefinitionSet raceDefinitionSetToUpdate) { synchronized (raceCache) { @@ -374,14 +374,14 @@ public class DomainFactoryImpl implements DomainFactory { raceDefinition = new RaceDefinitionImpl(race.getName(), course, competitorsAndDominantBoatClass.getB(), competitorsAndDominantBoatClass.getA()); // add to domain Event only if boat class matches - if (raceDefinition.getBoatClass() == trackedEvent.getRegatta().getBoatClass()) { - trackedEvent.getRegatta().addRace(raceDefinition); + if (raceDefinition.getBoatClass() == trackedRegatta.getRegatta().getBoatClass()) { + trackedRegatta.getRegatta().addRace(raceDefinition); } else { - logger.warning("Not adding race "+raceDefinition+" to event "+trackedEvent.getRegatta()+ + logger.warning("Not adding race "+raceDefinition+" to event "+trackedRegatta.getRegatta()+ " because boat class "+raceDefinition.getBoatClass()+" doesn't match event's boat class "+ - trackedEvent.getRegatta().getBoatClass()); + trackedRegatta.getRegatta().getBoatClass()); } - TrackedRace trackedRace = createTrackedRace(trackedEvent, raceDefinition, windStore, + TrackedRace trackedRace = createTrackedRace(trackedRegatta, raceDefinition, windStore, millisecondsOverWhichToAverageWind, raceDefinitionSetToUpdate); synchronized (raceCache) { raceCache.put(race, raceDefinition); @@ -394,9 +394,9 @@ public class DomainFactoryImpl implements DomainFactory { } } - private TrackedRace createTrackedRace(TrackedRegatta trackedEvent, RaceDefinition race, WindStore windStore, + private TrackedRace createTrackedRace(TrackedRegatta trackedRegatta, RaceDefinition race, WindStore windStore, long millisecondsOverWhichToAverageWind, DynamicRaceDefinitionSet raceDefinitionSetToUpdate) { - return trackedEvent.createTrackedRace(race, + return trackedRegatta.createTrackedRace(race, windStore, millisecondsOverWhichToAverageWind, /* time over which to average speed: */ race.getBoatClass().getApproximateManeuverDurationInMilliseconds(), raceDefinitionSetToUpdate); @@ -463,10 +463,10 @@ public class DomainFactoryImpl implements DomainFactory { @Override public TracTracRaceTracker createRaceTracker(URL paramURL, URI liveURI, URI storedURI, TimePoint startOfTracking, - TimePoint endOfTracking, WindStore windStore, TrackedRegattaRegistry trackedEventRegistry) + TimePoint endOfTracking, WindStore windStore, TrackedRegattaRegistry trackedRegattaRegistry) throws MalformedURLException, FileNotFoundException, URISyntaxException { return new TracTracRaceTrackerImpl(this, paramURL, liveURI, storedURI, startOfTracking, endOfTracking, - windStore, trackedEventRegistry); + windStore, trackedRegattaRegistry); } @Override diff --git a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/MarkPassingReceiver.java b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/MarkPassingReceiver.java index b23dd164cdb..15b243192f2 100755 --- a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/MarkPassingReceiver.java +++ b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/MarkPassingReceiver.java @@ -29,9 +29,9 @@ import com.tractrac.clientmodule.data.MarkPassingsData; public class MarkPassingReceiver extends AbstractReceiverWithQueue { private static final Logger logger = Logger.getLogger(MarkPassingReceiver.class.getName()); - public MarkPassingReceiver(DynamicTrackedRegatta trackedEvent, com.tractrac.clientmodule.Event tractracEvent, + public MarkPassingReceiver(DynamicTrackedRegatta trackedRegatta, com.tractrac.clientmodule.Event tractracEvent, DomainFactory domainFactory) { - super(domainFactory, tractracEvent, trackedEvent); + super(domainFactory, tractracEvent, trackedRegatta); } /** diff --git a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/MarkPositionReceiver.java b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/MarkPositionReceiver.java index 2f217455d5d..88e6149cba5 100755 --- a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/MarkPositionReceiver.java +++ b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/MarkPositionReceiver.java @@ -66,9 +66,9 @@ public class MarkPositionReceiver extends AbstractReceiverWithQueue { private static final Logger logger = Logger.getLogger(RaceStartedAndFinishedReceiver.class.getName()); - public RaceStartedAndFinishedReceiver(DynamicTrackedRegatta trackedEvent, com.tractrac.clientmodule.Event tractracEvent, DomainFactory domainFactory) { - super(domainFactory, tractracEvent, trackedEvent); + public RaceStartedAndFinishedReceiver(DynamicTrackedRegatta trackedRegatta, com.tractrac.clientmodule.Event tractracEvent, DomainFactory domainFactory) { + super(domainFactory, tractracEvent, trackedRegatta); } /** diff --git a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceTrackingConnectivityParametersImpl.java b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceTrackingConnectivityParametersImpl.java index cf1d287da02..bbd80a65e9e 100755 --- a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceTrackingConnectivityParametersImpl.java +++ b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceTrackingConnectivityParametersImpl.java @@ -36,10 +36,10 @@ public class RaceTrackingConnectivityParametersImpl implements RaceTrackingConne } @Override - public RaceTracker createRaceTracker(TrackedRegattaRegistry trackedEventRegistry) throws MalformedURLException, + public RaceTracker createRaceTracker(TrackedRegattaRegistry trackedRegattaRegistry) throws MalformedURLException, FileNotFoundException, URISyntaxException { RaceTracker tracker = domainFactory.createRaceTracker(paramURL, liveURI, storedURI, startOfTracking, - endOfTracking, windStore, trackedEventRegistry); + endOfTracking, windStore, trackedRegattaRegistry); return tracker; } diff --git a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RawPositionReceiver.java b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RawPositionReceiver.java index 8ca525cca59..24c55c28852 100755 --- a/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RawPositionReceiver.java +++ b/java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RawPositionReceiver.java @@ -21,8 +21,8 @@ public class RawPositionReceiver extends AbstractReceiverWithQueue(); Set typeControllers = new HashSet(); for (Receiver receiver : domainFactory.getUpdateReceivers(getTrackedRegatta(), tractracEvent, startOfTracking, diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/AbstractRaceTrackerImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/AbstractRaceTrackerImpl.java index e799f2985dc..206867f9af9 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/AbstractRaceTrackerImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/AbstractRaceTrackerImpl.java @@ -20,17 +20,17 @@ public abstract class AbstractRaceTrackerImpl implements RaceTracker { return result; } - private DynamicTrackedRegatta trackedEvent; + private DynamicTrackedRegatta trackedRegatta; public AbstractRaceTrackerImpl() { } @Override public DynamicTrackedRegatta getTrackedRegatta() { - return trackedEvent; + return trackedRegatta; } - protected void setTrackedEvent(DynamicTrackedRegatta trackedEvent) { - this.trackedEvent = trackedEvent; + protected void setTrackedEvent(DynamicTrackedRegatta trackedRegatta) { + this.trackedRegatta = trackedRegatta; } } diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/RaceTrackingConnectivityParameters.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/RaceTrackingConnectivityParameters.java index ee3c0b34803..6743ada976b 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/RaceTrackingConnectivityParameters.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/RaceTrackingConnectivityParameters.java @@ -16,7 +16,7 @@ public interface RaceTrackingConnectivityParameters { /** * Starts a {@link RaceTracker} using the connectivity parameters provided by this object. */ - RaceTracker createRaceTracker(TrackedRegattaRegistry trackedEventRegistry) throws Exception; + RaceTracker createRaceTracker(TrackedRegattaRegistry trackedRegattaRegistry) throws Exception; /** * Deliver an ID object equal to that of the {@link RaceTracker#getID()} delivered by the {@link RaceTracker} diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/WindStore.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/WindStore.java index 6b29682afbf..256942e8b56 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/WindStore.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/WindStore.java @@ -14,7 +14,7 @@ import com.sap.sailing.domain.common.WindSource; * */ public interface WindStore { - WindTrack getWindTrack(TrackedRegatta trackedEvent, TrackedRace trackedRace, WindSource windSource, + WindTrack getWindTrack(TrackedRegatta trackedRegatta, TrackedRace trackedRace, WindSource windSource, long millisecondsOverWhichToAverage, long delayForWindEstimationCacheInvalidation); /** @@ -22,6 +22,6 @@ public interface WindStore { * * @return a map that is never null but may be empty */ - Map loadWindTracks(TrackedRegatta trackedEvent, + Map loadWindTracks(TrackedRegatta trackedRegatta, TrackedRace trackedRace, long millisecondsOverWhichToAverageWind); } diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/WindTrackerFactory.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/WindTrackerFactory.java index 862b8fac8f6..238f2296a01 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/WindTrackerFactory.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/WindTrackerFactory.java @@ -11,7 +11,7 @@ import com.sap.sailing.domain.base.RaceDefinition; * */ public interface WindTrackerFactory { - WindTracker createWindTracker(DynamicTrackedRegatta trackedEvent, RaceDefinition race, boolean correctByDeclination) + WindTracker createWindTracker(DynamicTrackedRegatta trackedRegatta, RaceDefinition race, boolean correctByDeclination) throws SocketException; /** diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java index 2a47cead944..1cd28a550f9 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java @@ -47,10 +47,10 @@ public class DynamicTrackedRaceImpl extends TrackedRaceImpl implements private boolean raceIsKnownToStartUpwind; - public DynamicTrackedRaceImpl(TrackedRegatta trackedEvent, RaceDefinition race, + public DynamicTrackedRaceImpl(TrackedRegatta trackedRegatta, RaceDefinition race, WindStore windStore, long millisecondsOverWhichToAverageWind, long millisecondsOverWhichToAverageSpeed, long delayForCacheInvalidationOfWindEstimation) { - super(trackedEvent, race, windStore, millisecondsOverWhichToAverageWind, millisecondsOverWhichToAverageSpeed, + super(trackedRegatta, race, windStore, millisecondsOverWhichToAverageWind, millisecondsOverWhichToAverageSpeed, delayForCacheInvalidationOfWindEstimation); this.raceIsKnownToStartUpwind = race.getBoatClass().typicallyStartsUpwind(); for (Competitor competitor : getRace().getCompetitors()) { @@ -83,10 +83,10 @@ public class DynamicTrackedRaceImpl extends TrackedRaceImpl implements * using {@link #setRaceIsKnownToStartUpwind(boolean)}. Uses millisecondsOverWhichToAverageWind/2 for the * delayForCacheInvalidationOfWindEstimation argument of the constructor. */ - public DynamicTrackedRaceImpl(TrackedRegatta trackedEvent, RaceDefinition race, + public DynamicTrackedRaceImpl(TrackedRegatta trackedRegatta, RaceDefinition race, WindStore windStore, long millisecondsOverWhichToAverageWind, long millisecondsOverWhichToAverageSpeed) { - this(trackedEvent, race, windStore, millisecondsOverWhichToAverageWind, millisecondsOverWhichToAverageSpeed, + this(trackedRegatta, race, windStore, millisecondsOverWhichToAverageWind, millisecondsOverWhichToAverageSpeed, millisecondsOverWhichToAverageWind/2); } diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/EmptyWindStore.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/EmptyWindStore.java index 2bd5f63b255..ee3e1a644d6 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/EmptyWindStore.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/EmptyWindStore.java @@ -14,7 +14,7 @@ public class EmptyWindStore implements WindStore { public static EmptyWindStore INSTANCE = new EmptyWindStore(); @Override - public WindTrack getWindTrack(TrackedRegatta trackedEvent, TrackedRace trackedRace, WindSource windSource, + public WindTrack getWindTrack(TrackedRegatta trackedRegatta, TrackedRace trackedRace, WindSource windSource, long millisecondsOverWhichToAverage, long delayForWindEstimationCacheInvalidation) { switch (windSource.getType()) { case COURSE_BASED: @@ -28,7 +28,7 @@ public class EmptyWindStore implements WindStore { } @Override - public Map loadWindTracks(TrackedRegatta trackedEvent, + public Map loadWindTracks(TrackedRegatta trackedRegatta, TrackedRace trackedRace, long millisecondsOverWhichToAverageWind) { return Collections.emptyMap(); } diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java index b565fb084d2..3b8d1e9b44d 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java @@ -87,7 +87,7 @@ public abstract class TrackedRaceImpl implements TrackedRace, CourseListener { private final RaceDefinition race; - private final TrackedRegatta trackedEvent; + private final TrackedRegatta trackedRegatta; /** * By default, all wind sources are used, none are excluded. However, e.g., for performance reasons, particular wind @@ -189,13 +189,13 @@ public abstract class TrackedRaceImpl implements TrackedRace, CourseListener { private transient CombinedWindTrackImpl combinedWindTrack; - public TrackedRaceImpl(TrackedRegatta trackedEvent, RaceDefinition race, WindStore windStore, + public TrackedRaceImpl(TrackedRegatta trackedRegatta, RaceDefinition race, WindStore windStore, long millisecondsOverWhichToAverageWind, long millisecondsOverWhichToAverageSpeed) { - this(trackedEvent, race, windStore, millisecondsOverWhichToAverageWind, millisecondsOverWhichToAverageSpeed, + this(trackedRegatta, race, windStore, millisecondsOverWhichToAverageWind, millisecondsOverWhichToAverageSpeed, /* delay for wind estimation cache invalidation */millisecondsOverWhichToAverageWind / 2); } - public TrackedRaceImpl(TrackedRegatta trackedEvent, RaceDefinition race, WindStore windStore, + public TrackedRaceImpl(TrackedRegatta trackedRegatta, RaceDefinition race, WindStore windStore, long millisecondsOverWhichToAverageWind, long millisecondsOverWhichToAverageSpeed, long delayForWindEstimationCacheInvalidation) { super(); @@ -243,7 +243,7 @@ public abstract class TrackedRaceImpl implements TrackedRace, CourseListener { } markPassingsTimes = new ArrayList>>(); windTracks = new HashMap(); - windTracks.putAll(windStore.loadWindTracks(trackedEvent, this, millisecondsOverWhichToAverageWind)); + windTracks.putAll(windStore.loadWindTracks(trackedRegatta, this, millisecondsOverWhichToAverageWind)); // by default, a tracked race offers one course-based wind estimation, one track-based wind estimation track and // one "WEB" track for manual or REST-based wind reception; other wind tracks may be added as fixes are received // for them. @@ -251,7 +251,7 @@ public abstract class TrackedRaceImpl implements TrackedRace, CourseListener { windTracks.put(courseBasedWindSource, getOrCreateWindTrack(courseBasedWindSource, delayForWindEstimationCacheInvalidation)); WindSource trackBasedWindSource = new WindSourceImpl(WindSourceType.TRACK_BASED_ESTIMATION); windTracks.put(trackBasedWindSource, getOrCreateWindTrack(trackBasedWindSource, delayForWindEstimationCacheInvalidation)); - this.trackedEvent = trackedEvent; + this.trackedRegatta = trackedRegatta; competitorRankings = new HashMap>(); } @@ -817,7 +817,7 @@ public abstract class TrackedRaceImpl implements TrackedRace, CourseListener { * no other wind source exists yet. */ protected WindTrack createWindTrack(WindSource windSource, long delayForWindEstimationCacheInvalidation) { - WindTrack result = windStore.getWindTrack(trackedEvent, this, windSource, millisecondsOverWhichToAverageWind, + WindTrack result = windStore.getWindTrack(trackedRegatta, this, windSource, millisecondsOverWhichToAverageWind, delayForWindEstimationCacheInvalidation); return result; } @@ -1118,7 +1118,7 @@ public abstract class TrackedRaceImpl implements TrackedRace, CourseListener { @Override public TrackedRegatta getTrackedEvent() { - return trackedEvent; + return trackedRegatta; } @Override diff --git a/java/com.sap.sailing.expeditionconnector/src/com/sap/sailing/expeditionconnector/ExpeditionWindTrackerFactory.java b/java/com.sap.sailing.expeditionconnector/src/com/sap/sailing/expeditionconnector/ExpeditionWindTrackerFactory.java index 2b9f78cde23..fd77e04d560 100755 --- a/java/com.sap.sailing.expeditionconnector/src/com/sap/sailing/expeditionconnector/ExpeditionWindTrackerFactory.java +++ b/java/com.sap.sailing.expeditionconnector/src/com/sap/sailing/expeditionconnector/ExpeditionWindTrackerFactory.java @@ -43,11 +43,11 @@ public class ExpeditionWindTrackerFactory implements WindTrackerFactory { } @Override - public WindTracker createWindTracker(DynamicTrackedRegatta trackedEvent, RaceDefinition race, + public WindTracker createWindTracker(DynamicTrackedRegatta trackedRegatta, RaceDefinition race, boolean correctByDeclination) throws SocketException { WindTracker result = windTrackers.get(race); if (result == null) { - DynamicTrackedRace trackedRace = trackedEvent.getTrackedRace(race); + DynamicTrackedRace trackedRace = trackedRegatta.getTrackedRace(race); UDPExpeditionReceiver receiver = getOrCreateWindReceiverOnDefaultPort(); result = new ExpeditionWindTracker(trackedRace, correctByDeclination ? DeclinationService.INSTANCE : null, receiver, this); diff --git a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindTracksTest.java b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindTracksTest.java index 0089b57694c..deb067b1911 100755 --- a/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindTracksTest.java +++ b/java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindTracksTest.java @@ -71,8 +71,8 @@ public class TestStoringAndRetrievingWindTracksTest extends AbstractTracTracLive public void testStoreAFewWindEntries() throws UnknownHostException, MongoException, InterruptedException { DomainFactory domainFactory = DomainFactory.INSTANCE; Regatta domainEvent = domainFactory.getOrCreateEvent(getEvent()); - DynamicTrackedRegatta trackedEvent = new RacingEventServiceImpl().getOrCreateTrackedRegatta(domainEvent); - Iterable typeControllers = domainFactory.getUpdateReceivers(trackedEvent, getEvent(), + DynamicTrackedRegatta trackedRegatta = new RacingEventServiceImpl().getOrCreateTrackedRegatta(domainEvent); + Iterable typeControllers = domainFactory.getUpdateReceivers(trackedRegatta, getEvent(), EmptyWindStore.INSTANCE, /* startOfTracking */ null, /* endOfTracking */ null, new DynamicRaceDefinitionSet() { @Override public void addRaceDefinition(RaceDefinition race) { @@ -80,7 +80,7 @@ public class TestStoringAndRetrievingWindTracksTest extends AbstractTracTracLive }, ReceiverType.RACECOURSE); addListenersForStoredDataAndStartController(typeControllers); RaceDefinition race = domainFactory.getAndWaitForRaceDefinition(getEvent().getRaceList().iterator().next()); - DynamicTrackedRace trackedRace = trackedEvent.createTrackedRace(race, /* millisecondsOverWhichToAverageWind */ + DynamicTrackedRace trackedRace = trackedRegatta.createTrackedRace(race, /* millisecondsOverWhichToAverageWind */ EmptyWindStore.INSTANCE, /* millisecondsOverWhichToAverageSpeed */ 30000, 10000, new DynamicRaceDefinitionSet() { @Override @@ -90,7 +90,7 @@ public class TestStoringAndRetrievingWindTracksTest extends AbstractTracTracLive WindSource windSource = new WindSourceImpl(WindSourceType.WEB); Mongo myFirstMongo = newMongo(); DB firstDatabase = myFirstMongo.getDB(dbConfiguration.getDatabaseName()); - new MongoObjectFactoryImpl(firstDatabase).addWindTrackDumper(trackedEvent, trackedRace, windSource); + new MongoObjectFactoryImpl(firstDatabase).addWindTrackDumper(trackedRegatta, trackedRace, windSource); WindTrack windTrack = trackedRace.getOrCreateWindTrack(windSource); Position pos = new DegreePosition(54, 9); TimePoint timePoint = MillisecondsTimePoint.now(); diff --git a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceContentsReplicationTest.java b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceContentsReplicationTest.java index 78276c73cd3..bf75a1062b5 100755 --- a/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceContentsReplicationTest.java +++ b/java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceContentsReplicationTest.java @@ -58,7 +58,7 @@ public class TrackedRaceContentsReplicationTest extends AbstractServerReplicatio private Competitor competitor; private DynamicTrackedRace trackedRace; private RegattaNameAndRaceName raceIdentifier; - private DynamicTrackedRegatta trackedEvent; + private DynamicTrackedRegatta trackedRegatta; @Before public void setUp() throws Exception { @@ -85,7 +85,7 @@ public class TrackedRaceContentsReplicationTest extends AbstractServerReplicatio masterCourse.addWaypoint(2, masterDomainFactory.createWaypoint(masterDomainFactory.getOrCreateBuoy("Buoy3"))); masterCourse.removeWaypoint(1); raceIdentifier = new RegattaNameAndRaceName(event.getName(), raceName); - trackedEvent = master.apply(new TrackRegatta(raceIdentifier)); + trackedRegatta = master.apply(new TrackRegatta(raceIdentifier)); trackedRace = (DynamicTrackedRace) master.apply(new CreateTrackedRace(raceIdentifier, MongoWindStoreFactory.INSTANCE.getMongoWindStore(MongoFactory.INSTANCE.getDefaultMongoObjectFactory(), MongoFactory.INSTANCE.getDefaultDomainObjectFactory()), @@ -159,7 +159,7 @@ public class TrackedRaceContentsReplicationTest extends AbstractServerReplicatio MongoWindStore windStore = MongoWindStoreFactory.INSTANCE.getMongoWindStore(MongoFactory.INSTANCE.getDefaultMongoObjectFactory(), MongoFactory.INSTANCE.getDefaultDomainObjectFactory()); WindSource webWindSource = new WindSourceImpl(WindSourceType.WEB); - WindTrack windTrack = windStore.getWindTrack(trackedEvent, trackedRace, webWindSource, /* millisecondsOverWhichToAverage */ 10000, + WindTrack windTrack = windStore.getWindTrack(trackedRegatta, trackedRace, webWindSource, /* millisecondsOverWhichToAverage */ 10000, /* delayForWindEstimationCacheInvalidation */ 10000); final Wind wind = new WindImpl(new DegreePosition(2, 3), new MillisecondsTimePoint(3456), new KnotSpeedWithBearingImpl(13, new DegreeBearingImpl(234))); diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerStartStopTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerStartStopTest.java index 7d873bd195a..bce0a014fae 100644 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerStartStopTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerStartStopTest.java @@ -59,20 +59,20 @@ public class RaceTrackerStartStopTest { boatClass = new BoatClassImpl(BOATCLASSNAME, /* typicallyStartsUpwind */ true); event = new RegattaImpl(EVENTNAME, boatClass); racingEventService.getEventsByName().put(EVENTNAME, event); - TrackedRegatta trackedEvent1 = racingEventService.getOrCreateTrackedRegatta(event); + TrackedRegatta trackedRegatta1 = racingEventService.getOrCreateTrackedRegatta(event); racingEventService.getEventsByNameMap().put(EVENTNAME, event); raceTrackerSet = new HashSet(); raceDef1 = new RaceDefinitionImpl(RACENAME1, new CourseImpl("Course1", new ArrayList()), boatClass, new ArrayList()); raceDef2 = new RaceDefinitionImpl(RACENAME2, new CourseImpl("Course2", new ArrayList()), boatClass, new ArrayList()); raceDef3 = new RaceDefinitionImpl(RACENAME3, new CourseImpl("Course3", new ArrayList()), boatClass, new ArrayList()); event.addRace(raceDef1); - trackedEvent1.createTrackedRace(raceDef1, /* windStore */ EmptyWindStore.INSTANCE, /* millisecondsOverWhichToAverageWind */ 0l, + trackedRegatta1.createTrackedRace(raceDef1, /* windStore */ EmptyWindStore.INSTANCE, /* millisecondsOverWhichToAverageWind */ 0l, /* millisecondsOverWhichToAverageSpeed */ 0l, /* raceDefinitionSetToUpdate */ null); event.addRace(raceDef2); - trackedEvent1.createTrackedRace(raceDef2, /* windStore */ EmptyWindStore.INSTANCE, /* millisecondsOverWhichToAverageWind */ 0l, + trackedRegatta1.createTrackedRace(raceDef2, /* windStore */ EmptyWindStore.INSTANCE, /* millisecondsOverWhichToAverageWind */ 0l, /* millisecondsOverWhichToAverageSpeed */ 0l, /* raceDefinitionSetToUpdate */ null); event.addRace(raceDef3); - trackedEvent1.createTrackedRace(raceDef3, /* windStore */ EmptyWindStore.INSTANCE, /* millisecondsOverWhichToAverageWind */ 0l, + trackedRegatta1.createTrackedRace(raceDef3, /* windStore */ EmptyWindStore.INSTANCE, /* millisecondsOverWhichToAverageWind */ 0l, /* millisecondsOverWhichToAverageSpeed */ 0l, /* raceDefinitionSetToUpdate */ null); Set raceDefinitionSetRace1 = new HashSet(); raceDefinitionSetRace1.add(raceDef1); @@ -104,15 +104,15 @@ public class RaceTrackerStartStopTest { @Test public void testStopTrackingRace() throws MalformedURLException, IOException, InterruptedException { Regatta event = racingEventService.getRegattaByName(EVENTNAME); - TrackedRegatta trackedEvent = racingEventService.getTrackedRegatta(event); + TrackedRegatta trackedRegatta = racingEventService.getTrackedRegatta(event); assertNotNull(event.getRaceByName(RACENAME2)); - assertNotNull(trackedEvent.getExistingTrackedRace(event.getRaceByName(RACENAME2))); + assertNotNull(trackedRegatta.getExistingTrackedRace(event.getRaceByName(RACENAME2))); racingEventService.stopTracking(event, raceDef2); // the raceDef2 should still be part of the event, and the corresponding tracked race should still be part // of the tracked event assertNotNull(event.getRaceByName(RACENAME2)); boolean foundTrackedRaceForRaceDef2 = false; - for (TrackedRace trackedRace : trackedEvent.getTrackedRaces()) { + for (TrackedRace trackedRace : trackedRegatta.getTrackedRaces()) { if (trackedRace.getRace().getName().equals(RACENAME2)) { foundTrackedRaceForRaceDef2 = true; } @@ -141,15 +141,15 @@ public class RaceTrackerStartStopTest { @Test public void testRemoveRace() throws MalformedURLException, IOException, InterruptedException { Regatta event = racingEventService.getRegattaByName(EVENTNAME); - TrackedRegatta trackedEvent = racingEventService.getTrackedRegatta(event); + TrackedRegatta trackedRegatta = racingEventService.getTrackedRegatta(event); assertNotNull(event.getRaceByName(RACENAME2)); - assertNotNull(trackedEvent.getExistingTrackedRace(event.getRaceByName(RACENAME2))); + assertNotNull(trackedRegatta.getExistingTrackedRace(event.getRaceByName(RACENAME2))); racingEventService.removeRace(event, raceDef2); // the raceDef2 should be removed from the event, and the corresponding tracked race should be removed // from the tracked event assertNull(event.getRaceByName(RACENAME2)); boolean foundTrackedRaceForRaceDef2 = false; - for (TrackedRace trackedRace : trackedEvent.getTrackedRaces()) { + for (TrackedRace trackedRace : trackedRegatta.getTrackedRaces()) { if (trackedRace.getRace().getName().equals(RACENAME2)) { foundTrackedRaceForRaceDef2 = true; } diff --git a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerTest.java b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerTest.java index 75a665a46ed..d46a585f67b 100755 --- a/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerTest.java +++ b/java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerTest.java @@ -64,9 +64,9 @@ public class RaceTrackerTest { service.stopTracking(raceHandle.getRegatta()); } - private TrackedRace getTrackedRace(TrackedRegatta trackedEvent) throws InterruptedException { + private TrackedRace getTrackedRace(TrackedRegatta trackedRegatta) throws InterruptedException { final TrackedRace[] trackedRaces = new TrackedRace[1]; - trackedEvent.addRaceListener(new RaceListener() { + trackedRegatta.addRaceListener(new RaceListener() { @Override public void raceAdded(TrackedRace trackedRace) { synchronized (trackedRaces) { diff --git a/java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/Action.java b/java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/Action.java index 45bd8b47549..a79cedcf27c 100644 --- a/java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/Action.java +++ b/java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/Action.java @@ -140,8 +140,8 @@ public class Action { } public TrackedRace getTrackedRace(Regatta event, RaceDefinition race) throws IOException { - DynamicTrackedRegatta trackedEvent = getService().getOrCreateTrackedRegatta(event); - TrackedRace trackedRace = trackedEvent == null ? null : trackedEvent.getExistingTrackedRace(race); + DynamicTrackedRegatta trackedRegatta = getService().getOrCreateTrackedRegatta(event); + TrackedRace trackedRace = trackedRegatta == null ? null : trackedRegatta.getExistingTrackedRace(race); return trackedRace; }