From 85f87ff55ef65e4b5755d05e702faffe1a99633a Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Thu, 26 Apr 2018 09:18:23 +0200 Subject: [PATCH] added PAPA to SWC Racing Procedure; disallow X-Ray under Uniform Change-Id: I206f006cc835af5d3f8f6ecaf347e3f36ec6ba84 --- .../race/state/racingprocedure/line/SWCRacingProcedure.java | 2 +- .../state/racingprocedure/line/impl/SWCRacingProcedureImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 450fa157b4b..9d6e1b27ea0 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 @@ -9,7 +9,7 @@ import com.sap.sailing.domain.common.racelog.Flags; public interface SWCRacingProcedure extends ConfigurableStartModeFlagRacingProcedure { public final static Flags DEFAULT_START_MODE = Flags.UNIFORM; - public final static List DEFAULT_START_MODE_FLAGS = Arrays.asList(Flags.BLACK, Flags.UNIFORM); + public final static List DEFAULT_START_MODE_FLAGS = Arrays.asList(Flags.BLACK, Flags.UNIFORM, Flags.PAPA); SWCStartConfiguration getConfiguration(); } 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 0cfaaf7c1b6..00a4bf5e0ee 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 @@ -51,7 +51,7 @@ public class SWCRacingProcedureImpl extends ConfigurableStartModeFlagRacingProce if (!hasRecall) { return false; } else if (startmodeFlagHasBeenSet()) { - return cachedStartmodeFlag != Flags.BLACK; + return cachedStartmodeFlag != Flags.BLACK && cachedStartmodeFlag != Flags.UNIFORM; } else { return hasRecall; }