From c6ca28750d317ae29a7592143f829d6263e16ede Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Fri, 22 Jan 2016 16:24:47 +0100 Subject: [PATCH] removed method from DynamicTrackedRace contract that was only used by Impl class Change-Id: I29b462c77de1b13932c31a39e43449b82d651d5c --- .../sailing/domain/test/mock/MockedTrackedRace.java | 5 ----- .../sailing/domain/tracking/DynamicTrackedRace.java | 12 ------------ .../domain/tracking/impl/DynamicTrackedRaceImpl.java | 12 ++++++++++-- .../sap/sailing/gwt/ui/test/MockedTrackedRace.java | 5 ----- 4 files changed, 10 insertions(+), 24 deletions(-) diff --git a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java index 3ef95290686..ecf28a13037 100755 --- a/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java +++ b/java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java @@ -7,7 +7,6 @@ import java.util.NavigableSet; import java.util.Set; import java.util.TreeSet; -import com.sap.sailing.domain.abstractlog.race.CompetitorResults; import com.sap.sailing.domain.abstractlog.race.RaceLog; import com.sap.sailing.domain.abstractlog.race.analyzing.impl.RaceLogResolver; import com.sap.sailing.domain.abstractlog.regatta.RegattaLog; @@ -1027,10 +1026,6 @@ public class MockedTrackedRace implements DynamicTrackedRace { return this; } - @Override - public void updateFinishingTimesFromRaceLog(CompetitorResults event) { - } - @Override public void updateMarkPassingsAfterRaceLogChanges() { } diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/DynamicTrackedRace.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/DynamicTrackedRace.java index 3b093a2eb58..f2f1c07b13c 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/DynamicTrackedRace.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/DynamicTrackedRace.java @@ -1,7 +1,6 @@ package com.sap.sailing.domain.tracking; import com.sap.sailing.domain.abstractlog.race.CompetitorResult; -import com.sap.sailing.domain.abstractlog.race.CompetitorResults; import com.sap.sailing.domain.abstractlog.race.RaceLog; import com.sap.sailing.domain.abstractlog.race.RaceLogFinishPositioningConfirmedEvent; import com.sap.sailing.domain.base.Competitor; @@ -53,17 +52,6 @@ public interface DynamicTrackedRace extends TrackedRace { */ void updateMarkPassings(Competitor competitor, Iterable markPassings); - /** - * The {@link CompetitorResults} from the race log may optionally set a finishing time for competitors. Also, - * depending on how the race log has been modified (e.g., a new pass could have been started or a - * {@link RaceLogFinishPositioningConfirmedEvent} could have been revoked) it may be possible that a finishing - * time previously set from the race log now has to be reset to its original state as coming from the tracking - * provider. This can either mean resetting the mark passing to its {@link MarkPassing#getOriginal() original} - * version or removing it in case the {@link MarkPassing#getOriginal()} method delivers {@code null}, meaning - * that this mark passing was solely based on the race log information which now would have disappeared. - */ - void updateFinishingTimesFromRaceLog(CompetitorResults result); - /** * When there is a significant change in the race logs attached to this race, such as adding another race log or * removing a race log or switching to another pass in one of the race logs attached, the effects on the 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 4cfd493f92d..9a3eceb6bc5 100755 --- 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 @@ -731,8 +731,16 @@ DynamicTrackedRace, GPSTrackListener { } } - @Override - public void updateFinishingTimesFromRaceLog(CompetitorResults results) { + /** + * The {@link CompetitorResults} from the race log may optionally set a finishing time for competitors. Also, + * depending on how the race log has been modified (e.g., a new pass could have been started or a + * {@link RaceLogFinishPositioningConfirmedEvent} could have been revoked) it may be possible that a finishing + * time previously set from the race log now has to be reset to its original state as coming from the tracking + * provider. This can either mean resetting the mark passing to its {@link MarkPassing#getOriginal() original} + * version or removing it in case the {@link MarkPassing#getOriginal()} method delivers {@code null}, meaning + * that this mark passing was solely based on the race log information which now would have disappeared. + */ + private void updateFinishingTimesFromRaceLog(CompetitorResults results) { final Waypoint finish = getRace().getCourse().getLastWaypoint(); if (finish != null) { // can't do anything for an empty course final Map resultMap = new HashMap<>(); diff --git a/java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java b/java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java index 50cd77aa6ab..2367fbbc243 100755 --- a/java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java +++ b/java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java @@ -8,7 +8,6 @@ import java.util.List; import java.util.NavigableSet; import java.util.Set; -import com.sap.sailing.domain.abstractlog.race.CompetitorResults; import com.sap.sailing.domain.abstractlog.race.RaceLog; import com.sap.sailing.domain.abstractlog.race.analyzing.impl.RaceLogResolver; import com.sap.sailing.domain.abstractlog.regatta.RegattaLog; @@ -788,10 +787,6 @@ public class MockedTrackedRace implements DynamicTrackedRace { return this; } - @Override - public void updateFinishingTimesFromRaceLog(CompetitorResults event) { - } - @Override public void updateMarkPassingsAfterRaceLogChanges() { }