Merge branch 'master' into bug3734

This commit is contained in:
Axel Uhl committed 2016-06-24 09:11:13 +02:00
commit e2f46c9167
2 files changed
+4 -1

No files matched your search

@@ -366,9 +366,12 @@ public class ReadonlyRaceStateImpl implements ReadonlyRaceState, RaceLogChangedL
@Override
public void eventAdded(RaceLogEvent event) {
// FIXME the start time analyzer should be used to find out about the new start time dependency situation
if (event instanceof RaceLogDependentStartTimeEvent) {
// FIXME add the listener only if the dependent start time event belongs to the current pass
setupListenersOnDependentRace(event, Collections.<SimpleRaceLogIdentifier, ReadonlyRaceState>emptyMap());
} else if (event instanceof RaceLogStartTimeEvent) {
// FIXME only remove the change listener if the RaceLogStartTimeEvent belongs to the current pass
if (raceStateToObserve != null) {
raceStateToObserve.removeChangedListener(raceStateToObserveListener);
raceStateToObserve = null;
@@ -165,7 +165,7 @@ DynamicTrackedRace, GPSTrackListener<Competitor, GPSFixMoving> {
@Override
public void onStartTimeChanged(ReadonlyRaceState state) {
final TimePoint oldStartTime = getStartOfRace();
updateStartOfRaceCacheFields();
invalidateStartTime();
if (!Util.equalsWithNull(oldStartTime, getStartOfRace())) {
onStartTimeChangedByRaceCommittee(getStartOfRace());
}