mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-10-23 12:33:53 +00:00
renamed LineStartRacingProcedure and related types to ConfigurableStartModeFlagRacingProcedure
Change-Id: I5cef86cbb768c837db7fe5b5712f12d76c9d0b59
This commit is contained in:
1 parent
7dd5755df8
commit
ea2c6c67e7
17 files changed
+40
-40
No files matched your search
+3
-3
@@ -1,7 +1,7 @@
|
||||
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.base.configuration.procedures.ConfigurableStartModeFlagRacingProcedureConfiguration;
|
||||
import com.sap.sailing.domain.common.racelog.Flags;
|
||||
import com.sap.sse.common.TimePoint;
|
||||
|
||||
@@ -11,11 +11,11 @@ import com.sap.sse.common.TimePoint;
|
||||
* @author Frank
|
||||
*
|
||||
*/
|
||||
public interface LineStartRacingProcedure extends RacingProcedure {
|
||||
public interface ConfigurableStartModeFlagRacingProcedure extends RacingProcedure {
|
||||
|
||||
void addChangedListener(LineStartChangedListener listener);
|
||||
|
||||
LineStartConfiguration getConfiguration();
|
||||
ConfigurableStartModeFlagRacingProcedureConfiguration getConfiguration();
|
||||
|
||||
Flags getStartModeFlag();
|
||||
|
||||
+1
-1
@@ -4,6 +4,6 @@ import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.RacingProce
|
||||
|
||||
public interface LineStartChangedListener extends RacingProcedureChangedListener {
|
||||
|
||||
void onStartModeChanged(LineStartRacingProcedure racingProcedure);
|
||||
void onStartModeChanged(ConfigurableStartModeFlagRacingProcedure racingProcedure);
|
||||
|
||||
}
|
||||
+1
-1
@@ -3,7 +3,7 @@ package com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line;
|
||||
import com.sap.sailing.domain.base.configuration.procedures.RRS26Configuration;
|
||||
import com.sap.sailing.domain.common.racelog.Flags;
|
||||
|
||||
public interface RRS26RacingProcedure extends LineStartRacingProcedure {
|
||||
public interface RRS26RacingProcedure extends ConfigurableStartModeFlagRacingProcedure {
|
||||
public final static Flags DefaultStartMode = Flags.PAPA;
|
||||
|
||||
RRS26Configuration getConfiguration();
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@ package com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line;
|
||||
import com.sap.sailing.domain.base.configuration.procedures.SWCConfiguration;
|
||||
import com.sap.sailing.domain.common.racelog.Flags;
|
||||
|
||||
public interface SWCRacingProcedure extends LineStartRacingProcedure {
|
||||
public interface SWCRacingProcedure extends ConfigurableStartModeFlagRacingProcedure {
|
||||
|
||||
public final static Flags DefaultStartMode = Flags.UNIFORM;
|
||||
|
||||
|
||||
+6
-6
@@ -7,13 +7,13 @@ import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.RacingProce
|
||||
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.abstractlog.race.state.racingprocedure.line.ConfigurableStartModeFlagRacingProcedure;
|
||||
import com.sap.sailing.domain.base.configuration.RacingProcedureConfiguration;
|
||||
import com.sap.sailing.domain.base.configuration.procedures.LineStartConfiguration;
|
||||
import com.sap.sailing.domain.base.configuration.procedures.ConfigurableStartModeFlagRacingProcedureConfiguration;
|
||||
|
||||
public abstract class LineStartRacingProcedureImpl extends BaseRacingProcedure implements LineStartRacingProcedure {
|
||||
public abstract class ConfigurableStartModeFlagRacingProcedureImpl extends BaseRacingProcedure implements ConfigurableStartModeFlagRacingProcedure {
|
||||
|
||||
public LineStartRacingProcedureImpl(RaceLog raceLog, AbstractLogEventAuthor author,
|
||||
public ConfigurableStartModeFlagRacingProcedureImpl(RaceLog raceLog, AbstractLogEventAuthor author,
|
||||
RacingProcedureConfiguration configuration, RaceLogResolver raceLogResolver) {
|
||||
super(raceLog, author, configuration, raceLogResolver);
|
||||
}
|
||||
@@ -34,7 +34,7 @@ public abstract class LineStartRacingProcedureImpl extends BaseRacingProcedure i
|
||||
}
|
||||
|
||||
@Override
|
||||
public LineStartConfiguration getConfiguration() {
|
||||
return (LineStartConfiguration) super.getConfiguration();
|
||||
public ConfigurableStartModeFlagRacingProcedureConfiguration getConfiguration() {
|
||||
return (ConfigurableStartModeFlagRacingProcedureConfiguration) super.getConfiguration();
|
||||
}
|
||||
}
|
||||
+2
-2
@@ -2,13 +2,13 @@ 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;
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line.ConfigurableStartModeFlagRacingProcedure;
|
||||
|
||||
public class LineStartChangedListeners extends RacingProcedureChangedListeners<LineStartChangedListener> implements
|
||||
LineStartChangedListener {
|
||||
|
||||
@Override
|
||||
public void onStartModeChanged(LineStartRacingProcedure racingProcedure) {
|
||||
public void onStartModeChanged(ConfigurableStartModeFlagRacingProcedure racingProcedure) {
|
||||
for (LineStartChangedListener listener : getListeners()) {
|
||||
listener.onStartModeChanged(racingProcedure);
|
||||
}
|
||||
|
||||
+1
-1
@@ -24,7 +24,7 @@ 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 LineStartRacingProcedureImpl implements RRS26RacingProcedure {
|
||||
public class RRS26RacingProcedureImpl extends ConfigurableStartModeFlagRacingProcedureImpl implements RRS26RacingProcedure {
|
||||
|
||||
private final static long startPhaseClassUpInterval = 5 * 60 * 1000; // minutes * seconds * milliseconds
|
||||
private final static long startPhaseStartModeUpInterval = 4 * 60 * 1000; // minutes * seconds * milliseconds
|
||||
|
||||
+1
-1
@@ -24,7 +24,7 @@ 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 LineStartRacingProcedureImpl implements SWCRacingProcedure {
|
||||
public class SWCRacingProcedureImpl extends ConfigurableStartModeFlagRacingProcedureImpl 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
|
||||
|
||||
+4
-4
@@ -2,13 +2,13 @@ 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.impl.BaseRacingProcedurePrerequisite;
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line.LineStartRacingProcedure;
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line.ConfigurableStartModeFlagRacingProcedure;
|
||||
import com.sap.sailing.domain.common.racelog.Flags;
|
||||
import com.sap.sse.common.TimePoint;
|
||||
|
||||
public class StartModePrerequisite extends BaseRacingProcedurePrerequisite implements RacingProcedurePrerequisite {
|
||||
|
||||
public StartModePrerequisite(FulfillmentFunction function, LineStartRacingProcedure procedure,
|
||||
public StartModePrerequisite(FulfillmentFunction function, ConfigurableStartModeFlagRacingProcedure procedure,
|
||||
TimePoint originalNow, TimePoint originalStartTime) {
|
||||
super(function, procedure, originalNow, originalStartTime);
|
||||
}
|
||||
@@ -28,7 +28,7 @@ public class StartModePrerequisite extends BaseRacingProcedurePrerequisite imple
|
||||
fulfill(getProcedure().getDefaultStartMode());
|
||||
}
|
||||
|
||||
protected LineStartRacingProcedure getProcedure() {
|
||||
return (LineStartRacingProcedure) procedure;
|
||||
protected ConfigurableStartModeFlagRacingProcedure getProcedure() {
|
||||
return (ConfigurableStartModeFlagRacingProcedure) procedure;
|
||||
}
|
||||
}
|
||||
+3
-3
@@ -3,11 +3,11 @@ package com.sap.sailing.domain.base.configuration.impl;
|
||||
import java.util.List;
|
||||
|
||||
import com.sap.sailing.domain.base.configuration.RacingProcedureConfiguration;
|
||||
import com.sap.sailing.domain.base.configuration.procedures.LineStartConfiguration;
|
||||
import com.sap.sailing.domain.base.configuration.procedures.ConfigurableStartModeFlagRacingProcedureConfiguration;
|
||||
import com.sap.sailing.domain.base.configuration.procedures.SWCConfiguration;
|
||||
import com.sap.sailing.domain.common.racelog.Flags;
|
||||
|
||||
public abstract class RacingProcedureWithConfigurableStartModeFlagConfigurationImpl extends RacingProcedureConfigurationImpl implements LineStartConfiguration {
|
||||
public abstract class RacingProcedureWithConfigurableStartModeFlagConfigurationImpl extends RacingProcedureConfigurationImpl implements ConfigurableStartModeFlagRacingProcedureConfiguration {
|
||||
|
||||
private static final long serialVersionUID = 5141617199229598965L;
|
||||
|
||||
@@ -32,7 +32,7 @@ public abstract class RacingProcedureWithConfigurableStartModeFlagConfigurationI
|
||||
return target;
|
||||
}
|
||||
|
||||
protected LineStartConfiguration copy() {
|
||||
protected ConfigurableStartModeFlagRacingProcedureConfiguration copy() {
|
||||
RacingProcedureWithConfigurableStartModeFlagConfigurationImpl copy = (RacingProcedureWithConfigurableStartModeFlagConfigurationImpl) super.copy();
|
||||
copy.setStartModeFlags(startModeFlags);
|
||||
return copy;
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@ 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 {
|
||||
public interface ConfigurableStartModeFlagRacingProcedureConfiguration extends RacingProcedureConfiguration {
|
||||
|
||||
List<Flags> getStartModeFlags();
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.sap.sailing.domain.base.configuration.procedures;
|
||||
|
||||
public interface RRS26Configuration extends LineStartConfiguration {
|
||||
public interface RRS26Configuration extends ConfigurableStartModeFlagRacingProcedureConfiguration {
|
||||
}
|
||||
+1
-1
@@ -6,5 +6,5 @@ package com.sap.sailing.domain.base.configuration.procedures;
|
||||
* @author Frank
|
||||
*
|
||||
*/
|
||||
public interface SWCConfiguration extends LineStartConfiguration {
|
||||
public interface SWCConfiguration extends ConfigurableStartModeFlagRacingProcedureConfiguration {
|
||||
}
|
||||
+4
-4
@@ -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.line.LineStartRacingProcedure;
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line.ConfigurableStartModeFlagRacingProcedure;
|
||||
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;
|
||||
@@ -130,7 +130,7 @@ import com.sap.sailing.domain.base.configuration.impl.RacingProcedureConfigurati
|
||||
import com.sap.sailing.domain.base.configuration.impl.RacingProcedureWithConfigurableStartModeFlagConfigurationImpl;
|
||||
import com.sap.sailing.domain.base.configuration.impl.RegattaConfigurationImpl;
|
||||
import com.sap.sailing.domain.base.configuration.impl.SWCConfigurationImpl;
|
||||
import com.sap.sailing.domain.base.configuration.procedures.LineStartConfiguration;
|
||||
import com.sap.sailing.domain.base.configuration.procedures.ConfigurableStartModeFlagRacingProcedureConfiguration;
|
||||
import com.sap.sailing.domain.base.impl.BoatImpl;
|
||||
import com.sap.sailing.domain.base.impl.CourseDataImpl;
|
||||
import com.sap.sailing.domain.base.impl.CourseImpl;
|
||||
@@ -984,7 +984,7 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S
|
||||
break;
|
||||
case RRS26:
|
||||
case SWC:
|
||||
LineStartRacingProcedure linestart = state.getTypedReadonlyRacingProcedure();
|
||||
ConfigurableStartModeFlagRacingProcedure linestart = state.getTypedReadonlyRacingProcedure();
|
||||
info = new LineStartInfoDTO(linestart.getStartModeFlag());
|
||||
case UNKNOWN:
|
||||
default:
|
||||
@@ -4892,7 +4892,7 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S
|
||||
racingProcedureConfigurationDTO.isResultEntryEnabled = configuration.isResultEntryEnabled();
|
||||
}
|
||||
|
||||
private void copyRacingProcedureWithConfigurableStartModeFlagProperties(LineStartConfiguration configuration, final RacingProcedureWithConfigurableStartModeFlagConfigurationDTO racingProcedureConfigurationDTO) {
|
||||
private void copyRacingProcedureWithConfigurableStartModeFlagProperties(ConfigurableStartModeFlagRacingProcedureConfiguration configuration, final RacingProcedureWithConfigurableStartModeFlagConfigurationDTO racingProcedureConfigurationDTO) {
|
||||
racingProcedureConfigurationDTO.startModeFlags = configuration.getStartModeFlags();
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user