diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/racingprocedure/line/LineStartRacingProcedure.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/racingprocedure/line/ConfigurableStartModeFlagRacingProcedure.java similarity index 69% rename from java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/racingprocedure/line/LineStartRacingProcedure.java rename to java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/racingprocedure/line/ConfigurableStartModeFlagRacingProcedure.java index 1213a17a206..cf105f82c59 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/racingprocedure/line/LineStartRacingProcedure.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/racingprocedure/line/ConfigurableStartModeFlagRacingProcedure.java @@ -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(); diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/racingprocedure/line/LineStartChangedListener.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/racingprocedure/line/LineStartChangedListener.java index 4f91b2f738e..ba55f2b73a2 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/racingprocedure/line/LineStartChangedListener.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/racingprocedure/line/LineStartChangedListener.java @@ -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); } diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/racingprocedure/line/RRS26RacingProcedure.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/racingprocedure/line/RRS26RacingProcedure.java index 13839774174..9e68847453c 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/racingprocedure/line/RRS26RacingProcedure.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/racingprocedure/line/RRS26RacingProcedure.java @@ -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(); diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/racingprocedure/line/SWCRacingProcedure.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/racingprocedure/line/SWCRacingProcedure.java index e241cd0783b..c381ca0a96e 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/racingprocedure/line/SWCRacingProcedure.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/racingprocedure/line/SWCRacingProcedure.java @@ -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; diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/racingprocedure/line/impl/LineStartRacingProcedureImpl.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/racingprocedure/line/impl/ConfigurableStartModeFlagRacingProcedureImpl.java similarity index 71% rename from java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/racingprocedure/line/impl/LineStartRacingProcedureImpl.java rename to java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/racingprocedure/line/impl/ConfigurableStartModeFlagRacingProcedureImpl.java index e9e0c01c285..a6748910fda 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/racingprocedure/line/impl/LineStartRacingProcedureImpl.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/racingprocedure/line/impl/ConfigurableStartModeFlagRacingProcedureImpl.java @@ -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(); } } diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/racingprocedure/line/impl/LineStartChangedListeners.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/racingprocedure/line/impl/LineStartChangedListeners.java index 4740b788ed5..e0e35ff4274 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/racingprocedure/line/impl/LineStartChangedListeners.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/racingprocedure/line/impl/LineStartChangedListeners.java @@ -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 implements LineStartChangedListener { @Override - public void onStartModeChanged(LineStartRacingProcedure racingProcedure) { + public void onStartModeChanged(ConfigurableStartModeFlagRacingProcedure racingProcedure) { for (LineStartChangedListener listener : getListeners()) { listener.onStartModeChanged(racingProcedure); } diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/racingprocedure/line/impl/RRS26RacingProcedureImpl.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/racingprocedure/line/impl/RRS26RacingProcedureImpl.java index c5031d7c846..dd08f630861 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/racingprocedure/line/impl/RRS26RacingProcedureImpl.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/racingprocedure/line/impl/RRS26RacingProcedureImpl.java @@ -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 diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/racingprocedure/line/impl/SWCRacingProcedureImpl.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/racingprocedure/line/impl/SWCRacingProcedureImpl.java index a9c940a2aec..91fb2b3add9 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/racingprocedure/line/impl/SWCRacingProcedureImpl.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/racingprocedure/line/impl/SWCRacingProcedureImpl.java @@ -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 diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/racingprocedure/line/impl/StartModePrerequisite.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/racingprocedure/line/impl/StartModePrerequisite.java index 97c0233d8c1..d09b38ff79e 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/racingprocedure/line/impl/StartModePrerequisite.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/racingprocedure/line/impl/StartModePrerequisite.java @@ -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; } } diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/configuration/impl/RacingProcedureWithConfigurableStartModeFlagConfigurationImpl.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/configuration/impl/RacingProcedureWithConfigurableStartModeFlagConfigurationImpl.java index 3ac674b4215..e09d3f994c5 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/configuration/impl/RacingProcedureWithConfigurableStartModeFlagConfigurationImpl.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/configuration/impl/RacingProcedureWithConfigurableStartModeFlagConfigurationImpl.java @@ -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; diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/configuration/procedures/LineStartConfiguration.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/configuration/procedures/ConfigurableStartModeFlagRacingProcedureConfiguration.java similarity index 68% rename from java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/configuration/procedures/LineStartConfiguration.java rename to java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/configuration/procedures/ConfigurableStartModeFlagRacingProcedureConfiguration.java index 4e921602fae..9ffb055d961 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/configuration/procedures/LineStartConfiguration.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/configuration/procedures/ConfigurableStartModeFlagRacingProcedureConfiguration.java @@ -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 getStartModeFlags(); diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/configuration/procedures/RRS26Configuration.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/configuration/procedures/RRS26Configuration.java index 00d2086a65e..6bd5d19d259 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/configuration/procedures/RRS26Configuration.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/configuration/procedures/RRS26Configuration.java @@ -1,4 +1,4 @@ package com.sap.sailing.domain.base.configuration.procedures; -public interface RRS26Configuration extends LineStartConfiguration { +public interface RRS26Configuration extends ConfigurableStartModeFlagRacingProcedureConfiguration { } diff --git a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/configuration/procedures/SWCConfiguration.java b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/configuration/procedures/SWCConfiguration.java index 0aa72c633ea..7b2267c7bdd 100644 --- a/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/configuration/procedures/SWCConfiguration.java +++ b/java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/configuration/procedures/SWCConfiguration.java @@ -6,5 +6,5 @@ package com.sap.sailing.domain.base.configuration.procedures; * @author Frank * */ -public interface SWCConfiguration extends LineStartConfiguration { +public interface SWCConfiguration extends ConfigurableStartModeFlagRacingProcedureConfiguration { } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java index 8f3489be167..a2458485504 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java @@ -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(); } diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/panels/SetupPanelFragment.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/panels/SetupPanelFragment.java index 47b57589319..ab303cf3d98 100644 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/panels/SetupPanelFragment.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/panels/SetupPanelFragment.java @@ -21,7 +21,7 @@ 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.line.LineStartRacingProcedure; +import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line.ConfigurableStartModeFlagRacingProcedure; import com.sap.sailing.domain.common.Wind; import com.sap.sailing.racecommittee.app.AppConstants; import com.sap.sailing.racecommittee.app.R; @@ -176,9 +176,9 @@ public class SetupPanelFragment extends BasePanelFragment { mButtonRaceGroup.setVisibility(View.GONE); } - if (getRaceState().getRacingProcedure() instanceof LineStartRacingProcedure) { + if (getRaceState().getRacingProcedure() instanceof ConfigurableStartModeFlagRacingProcedure) { if (mButtonMode != null) { - LineStartRacingProcedure typedProcedure = getRaceState().getTypedRacingProcedure(); + ConfigurableStartModeFlagRacingProcedure typedProcedure = getRaceState().getTypedRacingProcedure(); mButtonMode.setPanelImage(FlagsResources.getFlagDrawable(getActivity(), typedProcedure.getStartModeFlag().name(), getResources().getInteger(R.integer.flag_size))); mButtonMode.setVisibility(View.VISIBLE); } diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/MainScheduleFragment.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/MainScheduleFragment.java index 1b59bbb3a4c..55d74b5644f 100644 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/MainScheduleFragment.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/MainScheduleFragment.java @@ -22,7 +22,7 @@ import com.sap.sailing.domain.abstractlog.race.state.impl.BaseRaceStateChangedLi import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.RacingProcedure; 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.line.LineStartRacingProcedure; +import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line.ConfigurableStartModeFlagRacingProcedure; import com.sap.sailing.domain.common.Wind; import com.sap.sailing.domain.common.racelog.Flags; import com.sap.sailing.racecommittee.app.R; @@ -155,8 +155,8 @@ public class MainScheduleFragment extends BaseFragment implements View.OnClickLi } }; mItems.add(new SelectionItem(getString(R.string.start_procedure), mRacingProcedure.getType().toString(), null, false, false, runnableProcedure)); - if (mRacingProcedure instanceof LineStartRacingProcedure) { - final LineStartRacingProcedure procedure = getRaceState().getTypedRacingProcedure(); + if (mRacingProcedure instanceof ConfigurableStartModeFlagRacingProcedure) { + final ConfigurableStartModeFlagRacingProcedure procedure = getRaceState().getTypedRacingProcedure(); Flags flag = procedure.getStartModeFlag(); Runnable runnableMode = new Runnable() { @Override @@ -250,10 +250,10 @@ public class MainScheduleFragment extends BaseFragment implements View.OnClickLi } private void startRace() { - LineStartRacingProcedure lineStartRacingProcedure = null; + ConfigurableStartModeFlagRacingProcedure lineStartRacingProcedure = null; Flags flag = null; - if (getRaceState().getRacingProcedure() instanceof LineStartRacingProcedure) { + if (getRaceState().getRacingProcedure() instanceof ConfigurableStartModeFlagRacingProcedure) { lineStartRacingProcedure = getRaceState().getTypedRacingProcedure(); flag = lineStartRacingProcedure.getStartModeFlag(); } diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/StartModeFragment.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/StartModeFragment.java index 763bfc1ad1a..540dd1765fa 100755 --- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/StartModeFragment.java +++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/StartModeFragment.java @@ -14,7 +14,7 @@ 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.line.LineStartRacingProcedure; +import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line.ConfigurableStartModeFlagRacingProcedure; import com.sap.sailing.domain.common.racelog.Flags; import com.sap.sailing.racecommittee.app.AppConstants; import com.sap.sailing.racecommittee.app.R; @@ -27,7 +27,7 @@ import com.sap.sse.common.impl.MillisecondsTimePoint; public class StartModeFragment extends BaseFragment { private ListView mListView; - private LineStartRacingProcedure mLineStartProcedure; + private ConfigurableStartModeFlagRacingProcedure mLineStartProcedure; private int mFlagSize; public static StartModeFragment newInstance(@START_MODE_VALUES int startMode) {