# clarified RaceState interface

This commit is contained in:
Lukas Niemeier committed 2013-12-06 02:37:34 +01:00
1 parent e50c4f7de7
commit 7b4a480de0
5 files changed
+8 -8

No files matched your search

@@ -111,7 +111,7 @@ public class RaceStateTest {
state.addChangedListener(listener);
TimePoint startTime = MillisecondsTimePoint.now().plus(60 * 60 * 1000);
state.forceStartTime(nowMock, startTime);
state.forceNewStartTime(nowMock, startTime);
assertEquals(startTime, state.getStartTime());
assertEquals(RaceLogRaceStatus.SCHEDULED, state.getStatus());
@@ -156,7 +156,7 @@ public class RaceStateTest {
public void testInvalidateAfterAdvancePass() throws InterruptedException {
state.addChangedListener(listener);
state.forceStartTime(nowMock, new MillisecondsTimePoint(1));
state.forceNewStartTime(nowMock, new MillisecondsTimePoint(1));
Thread.sleep(100);
state.setFinishedTime(new MillisecondsTimePoint(10));
state.setCourseDesign(nowMock, mock(CourseBase.class));
@@ -19,8 +19,8 @@ public interface RaceState extends ReadonlyRaceState {
<T extends RacingProcedure> T getTypedRacingProcedure(Class<T> clazz);
void setRacingProcedure(TimePoint timePoint, RacingProcedureType racingProcedureType);
void forceStartTime(TimePoint now, TimePoint startTime);
void requestStartTime(TimePoint now, TimePoint startTime, RacingProcedurePrerequisite.Resolver resolver);
void forceNewStartTime(TimePoint now, TimePoint startTime);
void requestNewStartTime(TimePoint now, TimePoint startTime, RacingProcedurePrerequisite.Resolver resolver);
void setFinishingTime(TimePoint timePoint);
void setFinishedTime(TimePoint timePoint);
void setProtestTime(TimePoint now, TimePoint timePoint);
@@ -86,7 +86,7 @@ public class RaceStateImpl extends ReadonlyRaceStateImpl implements RaceState {
}
@Override
public void requestStartTime(final TimePoint now, final TimePoint startTime, RacingProcedurePrerequisite.Resolver resolver) {
public void requestNewStartTime(final TimePoint now, final TimePoint startTime, RacingProcedurePrerequisite.Resolver resolver) {
RacingProcedurePrerequisite.FulfillmentFunction function = new RacingProcedurePrerequisite.FulfillmentFunction() {
@Override
public void execute() {
@@ -98,7 +98,7 @@ public class RaceStateImpl extends ReadonlyRaceStateImpl implements RaceState {
}
@Override
public void forceStartTime(TimePoint now, TimePoint startTime) {
public void forceNewStartTime(TimePoint now, TimePoint startTime) {
raceLog.add(factory.createStartTimeEvent(now, author, raceLog.getCurrentPassId(), startTime));
}
@@ -2054,7 +2054,7 @@ public class RacingEventServiceImpl implements RacingEventService, RegattaListen
RaceLog raceLog = getRaceLog(leaderboardName, raceColumnName, fleetName);
if (raceLog != null) {
RaceState state = RaceStateImpl.create(raceLog, new RaceLogEventAuthorImpl(authorName, authorPriority));
state.forceStartTime(logicalTimePoint, startTime);
state.forceNewStartTime(logicalTimePoint, startTime);
return state.getStartTime();
}
return null;
@@ -270,7 +270,7 @@ public class SetStartTimeRaceFragment extends RaceFragment {
}
private void setStartTime(SetStartTimeState state) {
getRaceState().requestStartTime(state.now, state.startTime, resolver);
getRaceState().requestNewStartTime(state.now, state.startTime, resolver);
}
protected void showAPModeDialog() {