refactoring of RRS26 and SWC racing procedure to share common functions through a shared LineStart racing procedure

This commit is contained in:
fmittag committed 2016-11-14 11:32:03 +01:00
1 parent 26c21d9915
commit d9a95b8a31
30 files changed
+165 -268

No files matched your search

@@ -26,8 +26,10 @@ Export-Package: com.sap.sailing.domain.abstractlog,
com.sap.sailing.domain.abstractlog.race.state.racingprocedure.gate,
com.sap.sailing.domain.abstractlog.race.state.racingprocedure.gate.impl,
com.sap.sailing.domain.abstractlog.race.state.racingprocedure.impl,
com.sap.sailing.domain.abstractlog.race.state.racingprocedure.rrs26,
com.sap.sailing.domain.abstractlog.race.state.racingprocedure.rrs26.impl,
com.sap.sailing.domain.abstractlog.race.state.racingprocedure.league,
com.sap.sailing.domain.abstractlog.race.state.racingprocedure.league.impl,
com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line,
com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line.impl,
com.sap.sailing.domain.abstractlog.race.tracking,
com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl,
com.sap.sailing.domain.abstractlog.race.tracking.impl,
@@ -2,8 +2,7 @@ package com.sap.sailing.domain.abstractlog.race.state.racingprocedure;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.gate.impl.GateLaunchTimePrerequisite;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.gate.impl.PathfinderPrerequisite;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.rrs26.impl.RRS26StartmodePrerequisite;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.swc.impl.SWCStartmodePrerequisite;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line.impl.StartModePrerequisite;
/**
* Something that has to be fulfilled before the race can start (e.g. decide which start mode flag is shown).
@@ -25,9 +24,7 @@ public interface RacingProcedurePrerequisite {
void fulfill(GateLaunchTimePrerequisite prerequisite);
void fulfill(RRS26StartmodePrerequisite prerequisite);
void fulfill(SWCStartmodePrerequisite prerequisite);
void fulfill(StartModePrerequisite prerequisite);
}
/**
@@ -4,8 +4,7 @@ import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.RacingProce
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.RacingProcedurePrerequisite.Resolver;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.gate.impl.GateLaunchTimePrerequisite;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.gate.impl.PathfinderPrerequisite;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.rrs26.impl.RRS26StartmodePrerequisite;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.swc.impl.SWCStartmodePrerequisite;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line.impl.StartModePrerequisite;
/**
* Always calls {@link RacingProcedurePrerequisite#fulfillWithDefault()}.
@@ -23,18 +22,11 @@ public class RacingProcedurePrerequisiteAutoResolver implements Resolver {
}
@Override
public void fulfill(RRS26StartmodePrerequisite prerequisite) {
prerequisite.fulfillWithDefault();
}
@Override
public void fulfill(SWCStartmodePrerequisite prerequisite) {
public void fulfill(StartModePrerequisite prerequisite) {
prerequisite.fulfillWithDefault();
}
@Override
public void onFulfilled() {
}
}
@@ -12,8 +12,8 @@ import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.basic.impl.
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.ess.impl.ESSRacingProcedureImpl;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.gate.impl.GateStartRacingProcedureImpl;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.league.impl.LeagueRacingProcedureImpl;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.rrs26.impl.RRS26RacingProcedureImpl;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.swc.impl.SWCRacingProcedureImpl;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line.impl.RRS26RacingProcedureImpl;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line.impl.SWCRacingProcedureImpl;
import com.sap.sailing.domain.base.configuration.ConfigurationLoader;
import com.sap.sailing.domain.base.configuration.RegattaConfiguration;
import com.sap.sailing.domain.common.racelog.RacingProcedureType;
@@ -1,9 +1,9 @@
package com.sap.sailing.domain.abstractlog.race.state.racingprocedure.swc;
package com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.RacingProcedureChangedListener;
public interface SWCChangedListener extends RacingProcedureChangedListener {
public interface LineStartChangedListener extends RacingProcedureChangedListener {
void onStartmodeChanged(ReadonlySWCRacingProcedure racingProcedure);
void onStartModeChanged(LineStartRacingProcedure racingProcedure);
}
@@ -0,0 +1,25 @@
package com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.RacingProcedure;
import com.sap.sailing.domain.base.configuration.procedures.LineStartConfiguration;
import com.sap.sailing.domain.common.racelog.Flags;
import com.sap.sse.common.TimePoint;
/**
* A racing procedure for the typical line start as described in the 'Racing Rules of Sailing' (RRS)
* published by the World Sailing association.
* @author Frank
*
*/
public interface LineStartRacingProcedure extends RacingProcedure {
void addChangedListener(LineStartChangedListener listener);
LineStartConfiguration getConfiguration();
Flags getStartModeFlag();
Flags getDefaultStartMode();
void setStartModeFlag(TimePoint timePoint, Flags startMode);
}
@@ -1,17 +1,10 @@
package com.sap.sailing.domain.abstractlog.race.state.racingprocedure.rrs26;
package com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.ReadonlyRacingProcedure;
import com.sap.sailing.domain.base.configuration.procedures.RRS26Configuration;
import com.sap.sailing.domain.common.racelog.Flags;
public interface ReadonlyRRS26RacingProcedure extends ReadonlyRacingProcedure {
public interface RRS26RacingProcedure extends LineStartRacingProcedure {
public final static Flags DefaultStartMode = Flags.PAPA;
void addChangedListener(RRS26ChangedListener listener);
RRS26Configuration getConfiguration();
Flags getStartModeFlag();
}
@@ -1,17 +1,11 @@
package com.sap.sailing.domain.abstractlog.race.state.racingprocedure.swc;
package com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.ReadonlyRacingProcedure;
import com.sap.sailing.domain.base.configuration.procedures.SWCConfiguration;
import com.sap.sailing.domain.common.racelog.Flags;
public interface ReadonlySWCRacingProcedure extends ReadonlyRacingProcedure {
public interface SWCRacingProcedure extends LineStartRacingProcedure {
public final static Flags DefaultStartMode = Flags.UNIFORM;
void addChangedListener(SWCChangedListener listener);
SWCConfiguration getConfiguration();
Flags getStartModeFlag();
}
@@ -0,0 +1,16 @@
package com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line.impl;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.impl.RacingProcedureChangedListeners;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line.LineStartChangedListener;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line.LineStartRacingProcedure;
public class LineStartChangedListeners extends RacingProcedureChangedListeners<LineStartChangedListener> implements
LineStartChangedListener {
@Override
public void onStartModeChanged(LineStartRacingProcedure racingProcedure) {
for (LineStartChangedListener listener : getListeners()) {
listener.onStartModeChanged(racingProcedure);
}
}
}
@@ -0,0 +1,40 @@
package com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line.impl;
import com.sap.sailing.domain.abstractlog.AbstractLogEventAuthor;
import com.sap.sailing.domain.abstractlog.race.RaceLog;
import com.sap.sailing.domain.abstractlog.race.analyzing.impl.RaceLogResolver;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.RacingProcedureChangedListener;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.impl.BaseRacingProcedure;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.impl.RacingProcedureChangedListeners;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line.LineStartChangedListener;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line.LineStartRacingProcedure;
import com.sap.sailing.domain.base.configuration.RacingProcedureConfiguration;
import com.sap.sailing.domain.base.configuration.procedures.LineStartConfiguration;
public abstract class LineStartRacingProcedureImpl extends BaseRacingProcedure implements LineStartRacingProcedure {
public LineStartRacingProcedureImpl(RaceLog raceLog, AbstractLogEventAuthor author,
RacingProcedureConfiguration configuration, RaceLogResolver raceLogResolver) {
super(raceLog, author, configuration, raceLogResolver);
}
@Override
protected RacingProcedureChangedListeners<? extends RacingProcedureChangedListener> createChangedListenerContainer() {
return new LineStartChangedListeners();
}
@Override
protected LineStartChangedListeners getChangedListeners() {
return (LineStartChangedListeners) super.getChangedListeners();
}
@Override
public void addChangedListener(LineStartChangedListener listener) {
getChangedListeners().add(listener);
}
@Override
public LineStartConfiguration getConfiguration() {
return (LineStartConfiguration) super.getConfiguration();
}
}
@@ -1,4 +1,4 @@
package com.sap.sailing.domain.abstractlog.race.state.racingprocedure.rrs26.impl;
package com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line.impl;
import java.util.Arrays;
import java.util.Collection;
@@ -14,21 +14,17 @@ import com.sap.sailing.domain.abstractlog.race.state.RaceStateEvent;
import com.sap.sailing.domain.abstractlog.race.state.impl.RaceStateEventImpl;
import com.sap.sailing.domain.abstractlog.race.state.impl.RaceStateEvents;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.FlagPoleState;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.RacingProcedureChangedListener;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.RacingProcedurePrerequisite;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.RacingProcedurePrerequisite.FulfillmentFunction;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.impl.BaseRacingProcedure;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.impl.NoMorePrerequisite;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.impl.RacingProcedureChangedListeners;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.rrs26.RRS26ChangedListener;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.rrs26.RRS26RacingProcedure;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line.RRS26RacingProcedure;
import com.sap.sailing.domain.base.configuration.procedures.RRS26Configuration;
import com.sap.sailing.domain.common.racelog.FlagPole;
import com.sap.sailing.domain.common.racelog.Flags;
import com.sap.sailing.domain.common.racelog.RacingProcedureType;
import com.sap.sse.common.TimePoint;
public class RRS26RacingProcedureImpl extends BaseRacingProcedure implements RRS26RacingProcedure {
public class RRS26RacingProcedureImpl extends LineStartRacingProcedureImpl implements RRS26RacingProcedure {
private final static long startPhaseClassUpInterval = 5 * 60 * 1000; // minutes * seconds * milliseconds
private final static long startPhaseStartModeUpInterval = 4 * 60 * 1000; // minutes * seconds * milliseconds
@@ -87,7 +83,7 @@ public class RRS26RacingProcedureImpl extends BaseRacingProcedure implements RRS
public RacingProcedurePrerequisite checkPrerequisitesForStart(TimePoint now, TimePoint startTime,
FulfillmentFunction function) {
if (startTime.minus(startPhaseStartModeUpInterval).before(now) && !startmodeFlagHasBeenSet) {
return new RRS26StartmodePrerequisite(function, this, now, startTime);
return new StartModePrerequisite(function, this, now, startTime);
}
return new NoMorePrerequisite(function);
}
@@ -177,21 +173,6 @@ public class RRS26RacingProcedureImpl extends BaseRacingProcedure implements RRS
}
}
@Override
protected RacingProcedureChangedListeners<? extends RacingProcedureChangedListener> createChangedListenerContainer() {
return new RRS26ChangedListeners();
}
@Override
protected RRS26ChangedListeners getChangedListeners() {
return (RRS26ChangedListeners) super.getChangedListeners();
}
@Override
public void addChangedListener(RRS26ChangedListener listener) {
getChangedListeners().add(listener);
}
@Override
public void setStartModeFlag(TimePoint timePoint, Flags startMode) {
raceLog.add(new RaceLogFlagEventImpl(timePoint, author, raceLog.getCurrentPassId(), startMode, Flags.NONE, true));
@@ -201,7 +182,12 @@ public class RRS26RacingProcedureImpl extends BaseRacingProcedure implements RRS
public Flags getStartModeFlag() {
return cachedStartmodeFlag;
}
@Override
public Flags getDefaultStartMode() {
return RRS26RacingProcedure.DefaultStartMode;
}
public boolean startmodeFlagHasBeenSet() {
return startmodeFlagHasBeenSet;
}
@@ -212,7 +198,7 @@ public class RRS26RacingProcedureImpl extends BaseRacingProcedure implements RRS
if (startmodeFlag != null && (!startmodeFlag.equals(cachedStartmodeFlag) || !startmodeFlagHasBeenSet)) {
cachedStartmodeFlag = startmodeFlag;
startmodeFlagHasBeenSet = true;
getChangedListeners().onStartmodeChanged(this);
getChangedListeners().onStartModeChanged(this);
}
super.update();
}
@@ -1,4 +1,4 @@
package com.sap.sailing.domain.abstractlog.race.state.racingprocedure.swc.impl;
package com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line.impl;
import java.util.Arrays;
import java.util.Collection;
@@ -14,21 +14,17 @@ import com.sap.sailing.domain.abstractlog.race.state.RaceStateEvent;
import com.sap.sailing.domain.abstractlog.race.state.impl.RaceStateEventImpl;
import com.sap.sailing.domain.abstractlog.race.state.impl.RaceStateEvents;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.FlagPoleState;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.RacingProcedureChangedListener;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.RacingProcedurePrerequisite;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.RacingProcedurePrerequisite.FulfillmentFunction;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.impl.BaseRacingProcedure;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.impl.NoMorePrerequisite;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.impl.RacingProcedureChangedListeners;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.swc.SWCChangedListener;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.swc.SWCRacingProcedure;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line.SWCRacingProcedure;
import com.sap.sailing.domain.base.configuration.procedures.SWCConfiguration;
import com.sap.sailing.domain.common.racelog.FlagPole;
import com.sap.sailing.domain.common.racelog.Flags;
import com.sap.sailing.domain.common.racelog.RacingProcedureType;
import com.sap.sse.common.TimePoint;
public class SWCRacingProcedureImpl extends BaseRacingProcedure implements SWCRacingProcedure {
public class SWCRacingProcedureImpl extends LineStartRacingProcedureImpl implements SWCRacingProcedure {
private final static long CLASS_OVER_OSCAR_AND_STARTMODE_UP_INTERVAL = 6 * 60 * 1000; // 6 minutes before start
private final static long CLASS_OVER_OSCAR_AND_STARTMODE_DOWN_INTERVAL = 1 * 60 * 1000; // 1 minute after start
@@ -160,21 +156,6 @@ public class SWCRacingProcedureImpl extends BaseRacingProcedure implements SWCRa
}
}
@Override
protected RacingProcedureChangedListeners<? extends RacingProcedureChangedListener> createChangedListenerContainer() {
return new SWCChangedListeners();
}
@Override
protected SWCChangedListeners getChangedListeners() {
return (SWCChangedListeners) super.getChangedListeners();
}
@Override
public void addChangedListener(SWCChangedListener listener) {
getChangedListeners().add(listener);
}
@Override
public void setStartModeFlag(TimePoint timePoint, Flags startMode) {
raceLog.add(new RaceLogFlagEventImpl(timePoint, author, raceLog.getCurrentPassId(), startMode, Flags.NONE, true));
@@ -184,7 +165,12 @@ public class SWCRacingProcedureImpl extends BaseRacingProcedure implements SWCRa
public Flags getStartModeFlag() {
return cachedStartmodeFlag;
}
@Override
public Flags getDefaultStartMode() {
return SWCRacingProcedure.DefaultStartMode;
}
public boolean startmodeFlagHasBeenSet() {
return startmodeFlagHasBeenSet;
}
@@ -195,7 +181,7 @@ public class SWCRacingProcedureImpl extends BaseRacingProcedure implements SWCRa
if (startmodeFlag != null && (!startmodeFlag.equals(cachedStartmodeFlag) || !startmodeFlagHasBeenSet)) {
cachedStartmodeFlag = startmodeFlag;
startmodeFlagHasBeenSet = true;
getChangedListeners().onStartmodeChanged(this);
getChangedListeners().onStartModeChanged(this);
}
super.update();
}
@@ -1,14 +1,15 @@
package com.sap.sailing.domain.abstractlog.race.state.racingprocedure.swc.impl;
package com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line.impl;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.RacingProcedurePrerequisite;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.swc.SWCRacingProcedure;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.impl.BaseRacingProcedurePrerequisite;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line.LineStartRacingProcedure;
import com.sap.sailing.domain.common.racelog.Flags;
import com.sap.sse.common.TimePoint;
public class SWCStartmodePrerequisite extends BaseSWCPrerequisite implements RacingProcedurePrerequisite {
public class StartModePrerequisite extends BaseRacingProcedurePrerequisite implements RacingProcedurePrerequisite {
public SWCStartmodePrerequisite(FulfillmentFunction function, SWCRacingProcedure procedure, TimePoint originalNow,
TimePoint originalStartTime) {
public StartModePrerequisite(FulfillmentFunction function, LineStartRacingProcedure procedure,
TimePoint originalNow, TimePoint originalStartTime) {
super(function, procedure, originalNow, originalStartTime);
}
@@ -24,7 +25,10 @@ public class SWCStartmodePrerequisite extends BaseSWCPrerequisite implements Rac
@Override
public void fulfillWithDefault() {
fulfill(SWCRacingProcedure.DefaultStartMode);
fulfill(getProcedure().getDefaultStartMode());
}
protected LineStartRacingProcedure getProcedure() {
return (LineStartRacingProcedure) procedure;
}
}
@@ -1,9 +0,0 @@
package com.sap.sailing.domain.abstractlog.race.state.racingprocedure.rrs26;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.RacingProcedureChangedListener;
public interface RRS26ChangedListener extends RacingProcedureChangedListener {
void onStartmodeChanged(ReadonlyRRS26RacingProcedure racingProcedure);
}
@@ -1,10 +0,0 @@
package com.sap.sailing.domain.abstractlog.race.state.racingprocedure.rrs26;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.RacingProcedure;
import com.sap.sailing.domain.common.racelog.Flags;
import com.sap.sse.common.TimePoint;
public interface RRS26RacingProcedure extends ReadonlyRRS26RacingProcedure, RacingProcedure {
void setStartModeFlag(TimePoint timePoint, Flags startMode);
}
@@ -1,22 +0,0 @@
package com.sap.sailing.domain.abstractlog.race.state.racingprocedure.rrs26.impl;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.RacingProcedurePrerequisite;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.impl.BaseRacingProcedurePrerequisite;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.rrs26.RRS26RacingProcedure;
import com.sap.sse.common.TimePoint;
/**
* Easy access to the {@link RRS26RacingProcedure}.
*/
public abstract class BaseRRS26Prerequisite extends BaseRacingProcedurePrerequisite implements RacingProcedurePrerequisite {
public BaseRRS26Prerequisite(FulfillmentFunction function, RRS26RacingProcedure procedure, TimePoint originalNow,
TimePoint originalStartTime) {
super(function, procedure, originalNow, originalStartTime);
}
protected RRS26RacingProcedure getProcedure() {
return (RRS26RacingProcedure) procedure;
}
}
@@ -1,17 +0,0 @@
package com.sap.sailing.domain.abstractlog.race.state.racingprocedure.rrs26.impl;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.impl.RacingProcedureChangedListeners;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.rrs26.RRS26ChangedListener;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.rrs26.ReadonlyRRS26RacingProcedure;
public class RRS26ChangedListeners extends RacingProcedureChangedListeners<RRS26ChangedListener> implements
RRS26ChangedListener {
@Override
public void onStartmodeChanged(ReadonlyRRS26RacingProcedure racingProcedure) {
for (RRS26ChangedListener listener : getListeners()) {
listener.onStartmodeChanged(racingProcedure);
}
}
}
@@ -1,30 +0,0 @@
package com.sap.sailing.domain.abstractlog.race.state.racingprocedure.rrs26.impl;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.RacingProcedurePrerequisite;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.rrs26.RRS26RacingProcedure;
import com.sap.sailing.domain.common.racelog.Flags;
import com.sap.sse.common.TimePoint;
public class RRS26StartmodePrerequisite extends BaseRRS26Prerequisite implements RacingProcedurePrerequisite {
public RRS26StartmodePrerequisite(FulfillmentFunction function, RRS26RacingProcedure procedure, TimePoint originalNow,
TimePoint originalStartTime) {
super(function, procedure, originalNow, originalStartTime);
}
@Override
protected void resolveOn(Resolver resolver) {
resolver.fulfill(this);
}
public void fulfill(Flags startmodeFlag) {
getProcedure().setStartModeFlag(originalNow, startmodeFlag);
super.fulfilled();
}
@Override
public void fulfillWithDefault() {
fulfill(RRS26RacingProcedure.DefaultStartMode);
}
}
@@ -1,10 +0,0 @@
package com.sap.sailing.domain.abstractlog.race.state.racingprocedure.swc;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.RacingProcedure;
import com.sap.sailing.domain.common.racelog.Flags;
import com.sap.sse.common.TimePoint;
public interface SWCRacingProcedure extends ReadonlySWCRacingProcedure, RacingProcedure {
void setStartModeFlag(TimePoint timePoint, Flags startMode);
}
@@ -1,22 +0,0 @@
package com.sap.sailing.domain.abstractlog.race.state.racingprocedure.swc.impl;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.RacingProcedurePrerequisite;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.impl.BaseRacingProcedurePrerequisite;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.swc.SWCRacingProcedure;
import com.sap.sse.common.TimePoint;
/**
* Easy access to the {@link SWCRacingProcedure}.
*/
public abstract class BaseSWCPrerequisite extends BaseRacingProcedurePrerequisite implements RacingProcedurePrerequisite {
public BaseSWCPrerequisite(FulfillmentFunction function, SWCRacingProcedure procedure, TimePoint originalNow,
TimePoint originalStartTime) {
super(function, procedure, originalNow, originalStartTime);
}
protected SWCRacingProcedure getProcedure() {
return (SWCRacingProcedure) procedure;
}
}
@@ -1,17 +0,0 @@
package com.sap.sailing.domain.abstractlog.race.state.racingprocedure.swc.impl;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.impl.RacingProcedureChangedListeners;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.swc.ReadonlySWCRacingProcedure;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.swc.SWCChangedListener;
public class SWCChangedListeners extends RacingProcedureChangedListeners<SWCChangedListener> implements
SWCChangedListener {
@Override
public void onStartmodeChanged(ReadonlySWCRacingProcedure racingProcedure) {
for (SWCChangedListener listener : getListeners()) {
listener.onStartmodeChanged(racingProcedure);
}
}
}
@@ -0,0 +1,12 @@
package com.sap.sailing.domain.base.configuration.procedures;
import java.util.List;
import com.sap.sailing.domain.base.configuration.RacingProcedureConfiguration;
import com.sap.sailing.domain.common.racelog.Flags;
public interface LineStartConfiguration extends RacingProcedureConfiguration {
List<Flags> getStartModeFlags();
}
@@ -1,12 +1,4 @@
package com.sap.sailing.domain.base.configuration.procedures;
import java.util.List;
import com.sap.sailing.domain.base.configuration.RacingProcedureConfiguration;
import com.sap.sailing.domain.common.racelog.Flags;
public interface RRS26Configuration extends RacingProcedureConfiguration {
List<Flags> getStartModeFlags();
}
package com.sap.sailing.domain.base.configuration.procedures;
public interface RRS26Configuration extends LineStartConfiguration {
}
@@ -1,17 +1,10 @@
package com.sap.sailing.domain.base.configuration.procedures;
import java.util.List;
import com.sap.sailing.domain.base.configuration.RacingProcedureConfiguration;
import com.sap.sailing.domain.common.racelog.Flags;
/**
* Start procedure for the Sailing World Cup
* @author Frank
*
*/
public interface SWCConfiguration extends RacingProcedureConfiguration {
List<Flags> getStartModeFlags();
public interface SWCConfiguration extends LineStartConfiguration {
}
@@ -16,7 +16,7 @@ import com.google.gwt.user.client.ui.SimplePanel;
import com.google.gwt.user.client.ui.VerticalPanel;
import com.sap.sailing.gwt.ui.client.StringMessages;
import com.sap.sailing.gwt.ui.shared.RaceInfoDTO.GateStartInfoDTO;
import com.sap.sailing.gwt.ui.shared.RaceInfoDTO.RRS26InfoDTO;
import com.sap.sailing.gwt.ui.shared.RaceInfoDTO.LineStartInfoDTO;
import com.sap.sailing.gwt.ui.shared.RegattaOverviewEntryDTO;
public class RaceDetailPanel extends SimplePanel {
@@ -209,7 +209,8 @@ public class RaceDetailPanel extends SimplePanel {
if (data.raceInfo.startProcedureDTO != null) {
switch (data.raceInfo.startProcedure) {
case RRS26:
RRS26InfoDTO rrsInfo = (RRS26InfoDTO) data.raceInfo.startProcedureDTO;
case SWC:
LineStartInfoDTO rrsInfo = (LineStartInfoDTO) data.raceInfo.startProcedureDTO;
if (rrsInfo != null) {
if (rrsInfo.startModeFlag != null) {
showProcedureInfo("Start mode", rrsInfo.startModeFlag.toString());
@@ -77,7 +77,7 @@ import com.sap.sailing.domain.abstractlog.race.state.ReadonlyRaceState;
import com.sap.sailing.domain.abstractlog.race.state.impl.ReadonlyRaceStateImpl;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.FlagPoleState;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.gate.ReadonlyGateStartRacingProcedure;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.rrs26.ReadonlyRRS26RacingProcedure;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line.LineStartRacingProcedure;
import com.sap.sailing.domain.abstractlog.race.tracking.analyzing.impl.RaceLogTrackingStateAnalyzer;
import com.sap.sailing.domain.abstractlog.regatta.RegattaLog;
import com.sap.sailing.domain.abstractlog.regatta.RegattaLogEvent;
@@ -332,7 +332,7 @@ import com.sap.sailing.gwt.ui.shared.RaceGroupDTO;
import com.sap.sailing.gwt.ui.shared.RaceGroupSeriesDTO;
import com.sap.sailing.gwt.ui.shared.RaceInfoDTO;
import com.sap.sailing.gwt.ui.shared.RaceInfoDTO.GateStartInfoDTO;
import com.sap.sailing.gwt.ui.shared.RaceInfoDTO.RRS26InfoDTO;
import com.sap.sailing.gwt.ui.shared.RaceInfoDTO.LineStartInfoDTO;
import com.sap.sailing.gwt.ui.shared.RaceInfoDTO.RaceInfoExtensionDTO;
import com.sap.sailing.gwt.ui.shared.RaceLogDTO;
import com.sap.sailing.gwt.ui.shared.RaceLogEventDTO;
@@ -978,8 +978,9 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S
info = new GateStartInfoDTO(gateStart.getPathfinder(), gateStart.getGateLaunchStopTime());
break;
case RRS26:
ReadonlyRRS26RacingProcedure rrs26 = state.getTypedReadonlyRacingProcedure();
info = new RRS26InfoDTO(rrs26.getStartModeFlag());
case SWC:
LineStartRacingProcedure linestart = state.getTypedReadonlyRacingProcedure();
info = new LineStartInfoDTO(linestart.getStartModeFlag());
case UNKNOWN:
default:
break;
@@ -26,13 +26,13 @@ public class RaceInfoDTO implements IsSerializable {
}
}
public static class RRS26InfoDTO implements RaceInfoExtensionDTO {
public static class LineStartInfoDTO implements RaceInfoExtensionDTO {
public Flags startModeFlag;
// for GWT serialization
public RRS26InfoDTO() { }
public LineStartInfoDTO() { }
public RRS26InfoDTO(Flags startMode) {
public LineStartInfoDTO(Flags startMode) {
this.startModeFlag = startMode;
}
}
@@ -21,8 +21,8 @@ import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.ReadonlyRac
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.ess.ESSRacingProcedure;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.gate.GateStartRacingProcedure;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.impl.BaseRacingProcedureChangedListener;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.rrs26.RRS26RacingProcedure;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.swc.SWCRacingProcedure;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line.RRS26RacingProcedure;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line.SWCRacingProcedure;
import com.sap.sailing.domain.common.Wind;
import com.sap.sailing.racecommittee.app.AppConstants;
import com.sap.sailing.racecommittee.app.R;
@@ -21,8 +21,8 @@ import com.sap.sailing.domain.abstractlog.race.state.ReadonlyRaceState;
import com.sap.sailing.domain.abstractlog.race.state.impl.BaseRaceStateChangedListener;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.ess.ESSRacingProcedure;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.gate.GateStartRacingProcedure;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.rrs26.RRS26RacingProcedure;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.swc.SWCRacingProcedure;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line.RRS26RacingProcedure;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line.SWCRacingProcedure;
import com.sap.sailing.domain.common.Wind;
import com.sap.sailing.domain.common.racelog.Flags;
import com.sap.sailing.domain.common.racelog.RacingProcedureType;
@@ -14,8 +14,8 @@ import android.widget.AdapterView;
import android.widget.ListView;
import com.sap.sailing.android.shared.util.AppUtils;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.rrs26.RRS26RacingProcedure;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.swc.SWCRacingProcedure;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line.RRS26RacingProcedure;
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line.SWCRacingProcedure;
import com.sap.sailing.domain.common.racelog.Flags;
import com.sap.sailing.domain.common.racelog.RacingProcedureType;
import com.sap.sailing.racecommittee.app.AppConstants;