mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-11-16 07:10:48 +00:00
Merge remote-tracking branch 'server/master'
Change-Id: Ia456e81f14a9a4a5605a82ca063d320ba963e456
This commit is contained in:
commit
c9bc780220
7 files changed
+171
-162
No files matched your search
+24
-20
@@ -19,22 +19,30 @@ import com.sap.sailing.domain.common.racelog.Flags;
|
||||
import com.sap.sse.common.Duration;
|
||||
import com.sap.sse.common.TimePoint;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public abstract class ConfigurableStartModeFlagRacingProcedureImpl extends BaseRacingProcedure implements ConfigurableStartModeFlagRacingProcedure {
|
||||
|
||||
protected Flags cachedStartmodeFlag;
|
||||
private boolean startmodeFlagHasBeenSet;
|
||||
|
||||
Flags cachedStartmodeFlag;
|
||||
boolean startmodeFlagHasBeenSet;
|
||||
private StartModeFlagFinder startModeFlagAnalyzer;
|
||||
|
||||
public ConfigurableStartModeFlagRacingProcedureImpl(RaceLog raceLog, AbstractLogEventAuthor author,
|
||||
ConfigurableStartModeFlagRacingProcedureConfiguration configuration, RaceLogResolver raceLogResolver) {
|
||||
ConfigurableStartModeFlagRacingProcedureImpl(RaceLog raceLog, AbstractLogEventAuthor author,
|
||||
ConfigurableStartModeFlagRacingProcedureConfiguration configuration, RaceLogResolver raceLogResolver) {
|
||||
super(raceLog, author, configuration, raceLogResolver);
|
||||
RacingProcedureTypeAnalyzer procedureAnalyzer = new RacingProcedureTypeAnalyzer(raceLog);
|
||||
if (configuration.getStartModeFlags() != null) {
|
||||
this.startModeFlagAnalyzer = new StartModeFlagFinder(procedureAnalyzer, raceLog, configuration.getStartModeFlags());
|
||||
} else {
|
||||
List<Flags> startModeFlags = getConfiguration().getStartModeFlags();
|
||||
if (startModeFlags == null) {
|
||||
this.startModeFlagAnalyzer = new StartModeFlagFinder(procedureAnalyzer, raceLog, getDefaultStartModeFlags());
|
||||
} else {
|
||||
Flags defaultStartMode = getDefaultStartMode();
|
||||
if (startModeFlags.isEmpty() || startModeFlags.contains(defaultStartMode)) {
|
||||
this.cachedStartmodeFlag = defaultStartMode;
|
||||
} else {
|
||||
this.cachedStartmodeFlag = startModeFlags.get(0);
|
||||
}
|
||||
this.startModeFlagAnalyzer = new StartModeFlagFinder(procedureAnalyzer, raceLog, startModeFlags);
|
||||
}
|
||||
this.cachedStartmodeFlag = getDefaultStartMode();
|
||||
this.startmodeFlagHasBeenSet = false;
|
||||
update();
|
||||
}
|
||||
@@ -48,17 +56,13 @@ public abstract class ConfigurableStartModeFlagRacingProcedureImpl extends BaseR
|
||||
|
||||
@Override
|
||||
public RacingProcedurePrerequisite checkPrerequisitesForStart(TimePoint now, TimePoint startTime,
|
||||
FulfillmentFunction function) {
|
||||
if (startTime.minus(getStartPhaseStartModeUpInterval()).before(now) && !startmodeFlagHasBeenSet()) {
|
||||
FulfillmentFunction function) {
|
||||
if (startTime.minus(getStartPhaseStartModeUpInterval()).before(now) && !startmodeFlagHasBeenSet) {
|
||||
return new StartModePrerequisite(function, this, now, startTime);
|
||||
}
|
||||
return new NoMorePrerequisite(function);
|
||||
}
|
||||
|
||||
public boolean startmodeFlagHasBeenSet() {
|
||||
return startmodeFlagHasBeenSet;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setStartModeFlag(TimePoint timePoint, Flags startMode) {
|
||||
raceLog.add(new RaceLogFlagEventImpl(timePoint, author, raceLog.getCurrentPassId(), startMode, Flags.NONE, true));
|
||||
@@ -71,10 +75,10 @@ public abstract class ConfigurableStartModeFlagRacingProcedureImpl extends BaseR
|
||||
|
||||
@Override
|
||||
protected void update() {
|
||||
Flags startmodeFlag = startModeFlagAnalyzer.analyze();
|
||||
if (startmodeFlag != null && (!startmodeFlag.equals(cachedStartmodeFlag) || !startmodeFlagHasBeenSet)) {
|
||||
cachedStartmodeFlag = startmodeFlag;
|
||||
Flags startModeFlag = startModeFlagAnalyzer.analyze();
|
||||
if (startModeFlag != null && (!startModeFlag.equals(cachedStartmodeFlag) || !startmodeFlagHasBeenSet)) {
|
||||
startmodeFlagHasBeenSet = true;
|
||||
cachedStartmodeFlag = startModeFlag;
|
||||
getChangedListeners().onStartModeChanged(this);
|
||||
}
|
||||
super.update();
|
||||
@@ -84,7 +88,7 @@ public abstract class ConfigurableStartModeFlagRacingProcedureImpl extends BaseR
|
||||
protected RacingProcedureChangedListeners<? extends RacingProcedureChangedListener> createChangedListenerContainer() {
|
||||
return new LineStartChangedListeners();
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
protected LineStartChangedListeners getChangedListeners() {
|
||||
return (LineStartChangedListeners) super.getChangedListeners();
|
||||
@@ -94,7 +98,7 @@ public abstract class ConfigurableStartModeFlagRacingProcedureImpl extends BaseR
|
||||
public void addChangedListener(LineStartChangedListener listener) {
|
||||
getChangedListeners().add(listener);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public ConfigurableStartModeFlagRacingProcedureConfiguration getConfiguration() {
|
||||
return (ConfigurableStartModeFlagRacingProcedureConfiguration) super.getConfiguration();
|
||||
|
||||
+38
-38
@@ -1,9 +1,5 @@
|
||||
package com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line.impl;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
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;
|
||||
@@ -19,14 +15,18 @@ import com.sap.sailing.domain.common.racelog.RacingProcedureType;
|
||||
import com.sap.sse.common.Duration;
|
||||
import com.sap.sse.common.TimePoint;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
public class RRS26RacingProcedureImpl extends ConfigurableStartModeFlagRacingProcedureImpl implements RRS26RacingProcedure {
|
||||
|
||||
private final static Duration startPhaseClassUpInterval = Duration.ONE_MINUTE.times(5);
|
||||
private final static Duration startPhaseStartModeUpInterval = Duration.ONE_MINUTE.times(4);
|
||||
private final static Duration startPhaseStartModeDownInterval = Duration.ONE_MINUTE;
|
||||
|
||||
public RRS26RacingProcedureImpl(RaceLog raceLog, AbstractLogEventAuthor author,
|
||||
RRS26Configuration configuration, RaceLogResolver raceLogResolver) {
|
||||
public RRS26RacingProcedureImpl(RaceLog raceLog, AbstractLogEventAuthor author,
|
||||
RRS26Configuration configuration, RaceLogResolver raceLogResolver) {
|
||||
super(raceLog, author, configuration, raceLogResolver);
|
||||
}
|
||||
|
||||
@@ -39,24 +39,24 @@ public class RRS26RacingProcedureImpl extends ConfigurableStartModeFlagRacingPro
|
||||
public RacingProcedureType getType() {
|
||||
return RacingProcedureType.RRS26;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public boolean hasIndividualRecall() {
|
||||
boolean hasRecall = super.hasIndividualRecall();
|
||||
if (!hasRecall) {
|
||||
return false;
|
||||
} else if (startmodeFlagHasBeenSet()) {
|
||||
return cachedStartmodeFlag != Flags.BLACK;
|
||||
} else {
|
||||
return hasRecall;
|
||||
if (hasRecall) {
|
||||
return true;
|
||||
}
|
||||
if (startmodeFlagHasBeenSet) {
|
||||
return cachedStartmodeFlag != Flags.BLACK;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
protected boolean hasIndividualRecallByDefault() {
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
protected Boolean isResultEntryEnabledByDefault() {
|
||||
return false;
|
||||
@@ -64,72 +64,72 @@ public class RRS26RacingProcedureImpl extends ConfigurableStartModeFlagRacingPro
|
||||
|
||||
@Override
|
||||
public Iterable<RaceStateEvent> createStartStateEvents(TimePoint startTime) {
|
||||
return Arrays.<RaceStateEvent> asList(
|
||||
return Arrays.<RaceStateEvent>asList(
|
||||
new RaceStateEventImpl(startTime.minus(startPhaseClassUpInterval), RaceStateEvents.RRS26_CLASS_UP),
|
||||
new RaceStateEventImpl(startTime.minus(startPhaseStartModeUpInterval), RaceStateEvents.RRS26_STARTMODE_UP),
|
||||
new RaceStateEventImpl(startTime.minus(startPhaseStartModeDownInterval), RaceStateEvents.RRS26_STARTMODE_DOWN),
|
||||
new RaceStateEventImpl(startTime.minus(startPhaseStartModeDownInterval), RaceStateEvents.RRS26_STARTMODE_DOWN),
|
||||
new RaceStateEventImpl(startTime, RaceStateEvents.START));
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean processStateEvent(RaceStateEvent event) {
|
||||
switch (event.getEventName()) {
|
||||
case RRS26_STARTMODE_UP:
|
||||
if (!startmodeFlagHasBeenSet()) {
|
||||
setStartModeFlag(event.getTimePoint(), cachedStartmodeFlag);
|
||||
}
|
||||
case RRS26_CLASS_UP:
|
||||
case RRS26_STARTMODE_DOWN:
|
||||
getChangedListeners().onActiveFlagsChanged(this);
|
||||
return true;
|
||||
default:
|
||||
return super.processStateEvent(event);
|
||||
case RRS26_STARTMODE_UP:
|
||||
if (!startmodeFlagHasBeenSet) {
|
||||
setStartModeFlag(event.getTimePoint(), cachedStartmodeFlag);
|
||||
}
|
||||
case RRS26_CLASS_UP:
|
||||
case RRS26_STARTMODE_DOWN:
|
||||
getChangedListeners().onActiveFlagsChanged(this);
|
||||
return true;
|
||||
default:
|
||||
return super.processStateEvent(event);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public FlagPoleState getActiveFlags(TimePoint startTime, TimePoint now) {
|
||||
Flags classFlag = getConfiguration().getClassFlag() != null ?
|
||||
getConfiguration().getClassFlag() : Flags.CLASS;
|
||||
getConfiguration().getClassFlag() : Flags.CLASS;
|
||||
if (now.before(startTime.minus(startPhaseClassUpInterval))) {
|
||||
return new FlagPoleState(
|
||||
Arrays.asList(new FlagPole(classFlag, false), new FlagPole(cachedStartmodeFlag, false)),
|
||||
null,
|
||||
Arrays.asList(new FlagPole(classFlag, true), new FlagPole(cachedStartmodeFlag, false)),
|
||||
Arrays.asList(new FlagPole(classFlag, true), new FlagPole(cachedStartmodeFlag, false)),
|
||||
startTime.minus(startPhaseClassUpInterval));
|
||||
} else if (now.before(startTime.minus(startPhaseStartModeUpInterval))) {
|
||||
return new FlagPoleState(
|
||||
Arrays.asList(new FlagPole(classFlag, true), new FlagPole(cachedStartmodeFlag, false)),
|
||||
startTime.minus(startPhaseClassUpInterval),
|
||||
Arrays.asList(new FlagPole(classFlag, true), new FlagPole(cachedStartmodeFlag, true)),
|
||||
Arrays.asList(new FlagPole(classFlag, true), new FlagPole(cachedStartmodeFlag, true)),
|
||||
startTime.minus(startPhaseStartModeUpInterval));
|
||||
} else if (now.before(startTime.minus(startPhaseStartModeDownInterval))) {
|
||||
return new FlagPoleState(
|
||||
Arrays.asList(new FlagPole(classFlag, true), new FlagPole(cachedStartmodeFlag, true)),
|
||||
startTime.minus(startPhaseStartModeUpInterval),
|
||||
Arrays.asList(new FlagPole(classFlag, true), new FlagPole(cachedStartmodeFlag, false)),
|
||||
Arrays.asList(new FlagPole(classFlag, true), new FlagPole(cachedStartmodeFlag, false)),
|
||||
startTime.minus(startPhaseStartModeDownInterval));
|
||||
} else if (now.before(startTime)) {
|
||||
return new FlagPoleState(
|
||||
Arrays.asList(new FlagPole(classFlag, true), new FlagPole(cachedStartmodeFlag, false)),
|
||||
startTime.minus(startPhaseStartModeDownInterval),
|
||||
Arrays.asList(new FlagPole(classFlag, false), new FlagPole(cachedStartmodeFlag, false)),
|
||||
Arrays.asList(new FlagPole(classFlag, false), new FlagPole(cachedStartmodeFlag, false)),
|
||||
startTime);
|
||||
} else {
|
||||
if (isIndividualRecallDisplayed(now)) {
|
||||
return new FlagPoleState(
|
||||
Arrays.asList(new FlagPole(Flags.XRAY, true)),
|
||||
Collections.singletonList(new FlagPole(Flags.XRAY, true)),
|
||||
getIndividualRecallDisplayedTime(),
|
||||
Arrays.asList(new FlagPole(Flags.XRAY, false)),
|
||||
Collections.singletonList(new FlagPole(Flags.XRAY, false)),
|
||||
getIndividualRecallRemovalTime());
|
||||
} else if (isFinished(now)) {
|
||||
return new FlagPoleState(
|
||||
Arrays.asList(new FlagPole(Flags.BLUE, false)), getFinishedTime());
|
||||
Collections.singletonList(new FlagPole(Flags.BLUE, false)), getFinishedTime());
|
||||
} else if (isInFinishingPhase(now)) {
|
||||
return new FlagPoleState(
|
||||
Arrays.asList(new FlagPole(Flags.BLUE, true)),
|
||||
Collections.singletonList(new FlagPole(Flags.BLUE, true)),
|
||||
getFinishingTime(),
|
||||
Arrays.asList(new FlagPole(Flags.BLUE, false)),
|
||||
Collections.singletonList(new FlagPole(Flags.BLUE, false)),
|
||||
null);
|
||||
} else {
|
||||
TimePoint recallRemoved = getIndividualRecallRemovalTime();
|
||||
@@ -137,7 +137,7 @@ public class RRS26RacingProcedureImpl extends ConfigurableStartModeFlagRacingPro
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public Flags getDefaultStartMode() {
|
||||
return RRS26RacingProcedure.DEFAULT_START_MODE;
|
||||
|
||||
+45
-45
@@ -1,9 +1,5 @@
|
||||
package com.sap.sailing.domain.abstractlog.race.state.racingprocedure.line.impl;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
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;
|
||||
@@ -20,6 +16,10 @@ import com.sap.sailing.domain.common.racelog.RacingProcedureType;
|
||||
import com.sap.sse.common.Duration;
|
||||
import com.sap.sse.common.TimePoint;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
public class SWCRacingProcedureImpl extends ConfigurableStartModeFlagRacingProcedureImpl implements SWCRacingProcedure {
|
||||
|
||||
private final static Duration CLASS_AND_STARTMODE_UP_INTERVAL = Duration.ONE_MINUTE.times(6); // 6 minutes before start
|
||||
@@ -30,8 +30,8 @@ public class SWCRacingProcedureImpl extends ConfigurableStartModeFlagRacingProce
|
||||
private final static Duration TWO_MINUTES_FLAG_UP_INTERVAL = Duration.ONE_MINUTE.times(2); // 2 minutes before start
|
||||
private final static Duration ONE_MINUTE_FLAG_UP_INTERVAL = Duration.ONE_MINUTE; // 1 minutes before start
|
||||
|
||||
public SWCRacingProcedureImpl(RaceLog raceLog, AbstractLogEventAuthor author,
|
||||
SWCStartConfiguration configuration, RaceLogResolver raceLogResolver) {
|
||||
public SWCRacingProcedureImpl(RaceLog raceLog, AbstractLogEventAuthor author,
|
||||
SWCStartConfiguration configuration, RaceLogResolver raceLogResolver) {
|
||||
super(raceLog, author, configuration, raceLogResolver);
|
||||
}
|
||||
|
||||
@@ -44,24 +44,24 @@ public class SWCRacingProcedureImpl extends ConfigurableStartModeFlagRacingProce
|
||||
public RacingProcedureType getType() {
|
||||
return RacingProcedureType.SWC;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public boolean hasIndividualRecall() {
|
||||
boolean hasRecall = super.hasIndividualRecall();
|
||||
if (!hasRecall) {
|
||||
return false;
|
||||
} else if (startmodeFlagHasBeenSet()) {
|
||||
return cachedStartmodeFlag != Flags.BLACK && cachedStartmodeFlag != Flags.UNIFORM;
|
||||
} else {
|
||||
return hasRecall;
|
||||
if (hasRecall) {
|
||||
return true;
|
||||
}
|
||||
if (startmodeFlagHasBeenSet) {
|
||||
return cachedStartmodeFlag != Flags.BLACK && cachedStartmodeFlag != Flags.UNIFORM;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
protected boolean hasIndividualRecallByDefault() {
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
protected Boolean isResultEntryEnabledByDefault() {
|
||||
return false;
|
||||
@@ -69,7 +69,7 @@ public class SWCRacingProcedureImpl extends ConfigurableStartModeFlagRacingProce
|
||||
|
||||
@Override
|
||||
public Iterable<RaceStateEvent> createStartStateEvents(TimePoint startTime) {
|
||||
return Arrays.<RaceStateEvent> asList(
|
||||
return Arrays.<RaceStateEvent>asList(
|
||||
new RaceStateEventImpl(startTime.minus(CLASS_AND_STARTMODE_UP_INTERVAL), RaceStateEvents.SWC_CLASS_AND_STARTMODE_UP),
|
||||
new RaceStateEventImpl(startTime.minus(FIVE_MINUTES_FLAG_UP_INTERVAL), RaceStateEvents.SWC_FIVE_UP),
|
||||
new RaceStateEventImpl(startTime.minus(FOUR_MINUTES_FLAG_UP_INTERVAL), RaceStateEvents.SWC_FOUR_UP),
|
||||
@@ -84,21 +84,21 @@ public class SWCRacingProcedureImpl extends ConfigurableStartModeFlagRacingProce
|
||||
@Override
|
||||
public boolean processStateEvent(RaceStateEvent event) {
|
||||
switch (event.getEventName()) {
|
||||
case SWC_CLASS_AND_STARTMODE_UP:
|
||||
if (!startmodeFlagHasBeenSet()) {
|
||||
setStartModeFlag(event.getTimePoint(), cachedStartmodeFlag);
|
||||
}
|
||||
case SWC_CLASS_AND_STARTMODE_DOWN:
|
||||
case SWC_FIVE_UP:
|
||||
case SWC_FOUR_UP:
|
||||
case SWC_THREE_UP:
|
||||
case SWC_TWO_UP:
|
||||
case SWC_ONE_UP:
|
||||
case SWC_GREEN_UP:
|
||||
getChangedListeners().onActiveFlagsChanged(this);
|
||||
return true;
|
||||
default:
|
||||
return super.processStateEvent(event);
|
||||
case SWC_CLASS_AND_STARTMODE_UP:
|
||||
if (!startmodeFlagHasBeenSet) {
|
||||
setStartModeFlag(event.getTimePoint(), cachedStartmodeFlag);
|
||||
}
|
||||
case SWC_CLASS_AND_STARTMODE_DOWN:
|
||||
case SWC_FIVE_UP:
|
||||
case SWC_FOUR_UP:
|
||||
case SWC_THREE_UP:
|
||||
case SWC_TWO_UP:
|
||||
case SWC_ONE_UP:
|
||||
case SWC_GREEN_UP:
|
||||
getChangedListeners().onActiveFlagsChanged(this);
|
||||
return true;
|
||||
default:
|
||||
return super.processStateEvent(event);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -106,67 +106,67 @@ public class SWCRacingProcedureImpl extends ConfigurableStartModeFlagRacingProce
|
||||
public FlagPoleState getActiveFlags(TimePoint startTime, TimePoint now) {
|
||||
if (now.before(startTime.minus(CLASS_AND_STARTMODE_UP_INTERVAL))) {
|
||||
return new FlagPoleState(
|
||||
Arrays.asList(new FlagPole(cachedStartmodeFlag, false)),
|
||||
Collections.singletonList(new FlagPole(cachedStartmodeFlag, false)),
|
||||
null,
|
||||
Arrays.asList(new FlagPole(cachedStartmodeFlag, true)),
|
||||
Collections.singletonList(new FlagPole(cachedStartmodeFlag, true)),
|
||||
startTime.minus(CLASS_AND_STARTMODE_UP_INTERVAL));
|
||||
} else if (now.before(startTime.minus(FIVE_MINUTES_FLAG_UP_INTERVAL))) {
|
||||
return new FlagPoleState(
|
||||
Arrays.asList(new FlagPole(cachedStartmodeFlag, true), new FlagPole(Flags.SWC_FIVE, false)),
|
||||
startTime.minus(CLASS_AND_STARTMODE_UP_INTERVAL),
|
||||
Arrays.asList(new FlagPole(cachedStartmodeFlag, true), new FlagPole(Flags.SWC_FIVE, true)),
|
||||
Arrays.asList(new FlagPole(cachedStartmodeFlag, true), new FlagPole(Flags.SWC_FIVE, true)),
|
||||
startTime.minus(FIVE_MINUTES_FLAG_UP_INTERVAL));
|
||||
} else if (now.before(startTime.minus(FOUR_MINUTES_FLAG_UP_INTERVAL))) {
|
||||
return new FlagPoleState(
|
||||
Arrays.asList(new FlagPole(cachedStartmodeFlag, true), new FlagPole(Flags.SWC_FIVE, true), new FlagPole(Flags.SWC_FOUR, false)),
|
||||
startTime.minus(FIVE_MINUTES_FLAG_UP_INTERVAL),
|
||||
Arrays.asList(new FlagPole(cachedStartmodeFlag, true), new FlagPole(Flags.SWC_FOUR, true), new FlagPole(Flags.SWC_THREE, false)),
|
||||
Arrays.asList(new FlagPole(cachedStartmodeFlag, true), new FlagPole(Flags.SWC_FOUR, true), new FlagPole(Flags.SWC_THREE, false)),
|
||||
startTime.minus(FOUR_MINUTES_FLAG_UP_INTERVAL));
|
||||
} else if (now.before(startTime.minus(THREE_MINUTES_FLAG_UP_INTERVAL))) {
|
||||
return new FlagPoleState(
|
||||
Arrays.asList(new FlagPole(cachedStartmodeFlag, true), new FlagPole(Flags.SWC_FOUR, true), new FlagPole(Flags.SWC_THREE, false)),
|
||||
startTime.minus(FOUR_MINUTES_FLAG_UP_INTERVAL),
|
||||
Arrays.asList(new FlagPole(cachedStartmodeFlag, true), new FlagPole(Flags.SWC_THREE, true), new FlagPole(Flags.SWC_TWO, false)),
|
||||
Arrays.asList(new FlagPole(cachedStartmodeFlag, true), new FlagPole(Flags.SWC_THREE, true), new FlagPole(Flags.SWC_TWO, false)),
|
||||
startTime.minus(THREE_MINUTES_FLAG_UP_INTERVAL));
|
||||
} else if (now.before(startTime.minus(TWO_MINUTES_FLAG_UP_INTERVAL))) {
|
||||
return new FlagPoleState(
|
||||
Arrays.asList(new FlagPole(cachedStartmodeFlag, true), new FlagPole(Flags.SWC_THREE, true), new FlagPole(Flags.SWC_TWO, false)),
|
||||
startTime.minus(THREE_MINUTES_FLAG_UP_INTERVAL),
|
||||
Arrays.asList(new FlagPole(cachedStartmodeFlag, true), new FlagPole(Flags.SWC_TWO, true), new FlagPole(Flags.SWC_ONE, false)),
|
||||
Arrays.asList(new FlagPole(cachedStartmodeFlag, true), new FlagPole(Flags.SWC_TWO, true), new FlagPole(Flags.SWC_ONE, false)),
|
||||
startTime.minus(TWO_MINUTES_FLAG_UP_INTERVAL));
|
||||
} else if (now.before(startTime.minus(ONE_MINUTE_FLAG_UP_INTERVAL))) {
|
||||
return new FlagPoleState(
|
||||
Arrays.asList(new FlagPole(cachedStartmodeFlag, true), new FlagPole(Flags.SWC_TWO, true), new FlagPole(Flags.SWC_ONE, false)),
|
||||
startTime.minus(TWO_MINUTES_FLAG_UP_INTERVAL),
|
||||
Arrays.asList(new FlagPole(cachedStartmodeFlag, true), new FlagPole(Flags.SWC_ONE, true), new FlagPole(Flags.SWC_ZERO, false)),
|
||||
Arrays.asList(new FlagPole(cachedStartmodeFlag, true), new FlagPole(Flags.SWC_ONE, true), new FlagPole(Flags.SWC_ZERO, false)),
|
||||
startTime.minus(ONE_MINUTE_FLAG_UP_INTERVAL));
|
||||
} else if (now.before(startTime)) {
|
||||
return new FlagPoleState(
|
||||
Arrays.asList(new FlagPole(cachedStartmodeFlag, true), new FlagPole(Flags.SWC_ONE, true), new FlagPole(Flags.SWC_ZERO, false)),
|
||||
startTime.minus(ONE_MINUTE_FLAG_UP_INTERVAL),
|
||||
Arrays.asList(new FlagPole(cachedStartmodeFlag, true), new FlagPole(Flags.SWC_ZERO, true)),
|
||||
Arrays.asList(new FlagPole(cachedStartmodeFlag, true), new FlagPole(Flags.SWC_ZERO, true)),
|
||||
startTime);
|
||||
} else if (now.before(startTime.plus(CLASS_AND_STARTMODE_DOWN_INTERVAL))) {
|
||||
return new FlagPoleState(
|
||||
Arrays.asList(new FlagPole(cachedStartmodeFlag, true), new FlagPole(Flags.SWC_ZERO, true)),
|
||||
startTime,
|
||||
Arrays.asList(new FlagPole(cachedStartmodeFlag, false), new FlagPole(Flags.SWC_ZERO, false)),
|
||||
Arrays.asList(new FlagPole(cachedStartmodeFlag, false), new FlagPole(Flags.SWC_ZERO, false)),
|
||||
startTime.plus(CLASS_AND_STARTMODE_DOWN_INTERVAL));
|
||||
} else {
|
||||
if (isIndividualRecallDisplayed(now)) {
|
||||
return new FlagPoleState(
|
||||
Arrays.asList(new FlagPole(Flags.XRAY, true)),
|
||||
Collections.singletonList(new FlagPole(Flags.XRAY, true)),
|
||||
getIndividualRecallDisplayedTime(),
|
||||
Arrays.asList(new FlagPole(Flags.XRAY, false)),
|
||||
Collections.singletonList(new FlagPole(Flags.XRAY, false)),
|
||||
getIndividualRecallRemovalTime());
|
||||
} else if (isFinished(now)) {
|
||||
return new FlagPoleState(
|
||||
Arrays.asList(new FlagPole(Flags.BLUE, false)), getFinishedTime());
|
||||
Collections.singletonList(new FlagPole(Flags.BLUE, false)), getFinishedTime());
|
||||
} else if (isInFinishingPhase(now)) {
|
||||
return new FlagPoleState(
|
||||
Arrays.asList(new FlagPole(Flags.BLUE, true)),
|
||||
Collections.singletonList(new FlagPole(Flags.BLUE, true)),
|
||||
getFinishingTime(),
|
||||
Arrays.asList(new FlagPole(Flags.BLUE, false)),
|
||||
Collections.singletonList(new FlagPole(Flags.BLUE, false)),
|
||||
null);
|
||||
} else {
|
||||
TimePoint recallRemoved = getIndividualRecallRemovalTime();
|
||||
|
||||
+27
-30
@@ -69,6 +69,7 @@ import com.sap.sailing.racecommittee.app.ui.fragments.RaceListFragment;
|
||||
import com.sap.sailing.racecommittee.app.ui.fragments.RaceListFragment.RaceListCallbacks;
|
||||
import com.sap.sailing.racecommittee.app.ui.fragments.WelcomeFragment;
|
||||
import com.sap.sailing.racecommittee.app.ui.fragments.raceinfo.BaseFragment;
|
||||
import com.sap.sailing.racecommittee.app.ui.fragments.raceinfo.MainScheduleFragment;
|
||||
import com.sap.sailing.racecommittee.app.ui.fragments.raceinfo.RaceFinishingFragment;
|
||||
import com.sap.sailing.racecommittee.app.ui.fragments.raceinfo.RaceFlagViewerFragment;
|
||||
import com.sap.sailing.racecommittee.app.ui.fragments.raceinfo.RaceSummaryFragment;
|
||||
@@ -184,21 +185,14 @@ public class RacingActivity extends SessionActivity implements RaceListCallbacks
|
||||
}
|
||||
|
||||
Fragment fragment = getSupportFragmentManager().findFragmentById(R.id.racing_view_container);
|
||||
if (!(fragment instanceof RaceInfoFragment || fragment instanceof WelcomeFragment)) {
|
||||
if (getFragmentManager().getBackStackEntryCount() > 0) {
|
||||
getFragmentManager().popBackStackImmediate();
|
||||
getFragmentManager().beginTransaction().commit();
|
||||
|
||||
// fix for filled out RaceInfoFragment
|
||||
if (infoFragment != null && infoFragment.isFragmentUIActive() && mSelectedRace != null) {
|
||||
ExLog.i(this, this.getClass().getCanonicalName(), "Returning to RaceInfoFragment");
|
||||
|
||||
getFragmentManager().popBackStackImmediate();
|
||||
onRaceItemClicked(mSelectedRace);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (fragment instanceof WelcomeFragment) {
|
||||
logoutSession();
|
||||
} else if (fragment instanceof RaceInfoFragment || fragment instanceof MainScheduleFragment) {
|
||||
loadWelcomeFragment();
|
||||
mSelectedRace = null;
|
||||
mRaceList.resetSelectedRace();
|
||||
} else {
|
||||
super.onBackPressed();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -291,7 +285,8 @@ public class RacingActivity extends SessionActivity implements RaceListCallbacks
|
||||
private void loadWelcomeFragment() {
|
||||
preferences = AppPreferences.on(this);
|
||||
getSupportFragmentManager().beginTransaction()
|
||||
.replace(R.id.racing_view_container, WelcomeFragment.newInstance()).commitAllowingStateLoss();
|
||||
.replace(R.id.racing_view_container, WelcomeFragment.newInstance())
|
||||
.commitAllowingStateLoss();
|
||||
}
|
||||
|
||||
public TimePoint getStartTime() {
|
||||
@@ -332,7 +327,9 @@ public class RacingActivity extends SessionActivity implements RaceListCallbacks
|
||||
|
||||
setupActionBar(managedRace);
|
||||
|
||||
getSupportFragmentManager().beginTransaction().replace(R.id.racing_view_container, infoFragment).commit();
|
||||
getSupportFragmentManager().beginTransaction()
|
||||
.replace(R.id.racing_view_container, infoFragment)
|
||||
.commit();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -369,17 +366,17 @@ public class RacingActivity extends SessionActivity implements RaceListCallbacks
|
||||
@Override
|
||||
public boolean onOptionsItemSelected(MenuItem item) {
|
||||
switch (item.getItemId()) {
|
||||
case R.id.options_menu_reset:
|
||||
ExLog.i(this, TAG, "Clicked RESET RACE");
|
||||
resetRace();
|
||||
return true;
|
||||
case R.id.options_menu_reset:
|
||||
ExLog.i(this, TAG, "Clicked RESET RACE");
|
||||
resetRace();
|
||||
return true;
|
||||
|
||||
case R.id.options_menu_role:
|
||||
logoutSession();
|
||||
return true;
|
||||
case R.id.options_menu_role:
|
||||
logoutSession();
|
||||
return true;
|
||||
|
||||
default:
|
||||
return super.onOptionsItemSelected(item);
|
||||
default:
|
||||
return super.onOptionsItemSelected(item);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -481,7 +478,7 @@ public class RacingActivity extends SessionActivity implements RaceListCallbacks
|
||||
}
|
||||
|
||||
public List<ManagedRace> getRacesWithStartTimeImmediatelyDependingOn(ManagedRace currentRace,
|
||||
@Nullable RaceLogRaceStatus[] state) {
|
||||
@Nullable RaceLogRaceStatus[] state) {
|
||||
StartTimeFinderResult result;
|
||||
SimpleRaceLogIdentifier identifier;
|
||||
ArrayList<ManagedRace> list = new ArrayList<>();
|
||||
@@ -704,10 +701,10 @@ public class RacingActivity extends SessionActivity implements RaceListCallbacks
|
||||
dialog.cancel();
|
||||
}
|
||||
}).setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() {
|
||||
public void onClick(DialogInterface dialog, int id) {
|
||||
dialog.cancel();
|
||||
}
|
||||
});
|
||||
public void onClick(DialogInterface dialog, int id) {
|
||||
dialog.cancel();
|
||||
}
|
||||
});
|
||||
builder.create().show();
|
||||
}
|
||||
|
||||
|
||||
+6
@@ -465,6 +465,12 @@ public class RaceListFragment extends LoggableFragment
|
||||
}
|
||||
}
|
||||
|
||||
public void resetSelectedRace() {
|
||||
mSelectedRace = null;
|
||||
mAdapter.setSelectedRace(null);
|
||||
mAdapter.notifyDataSetChanged();
|
||||
}
|
||||
|
||||
private void unregisterOnAllRaces() {
|
||||
for (ManagedRace managedRace : mManagedRacesById.values()) {
|
||||
managedRace.getState().removeChangedListener(stateListener);
|
||||
|
||||
+22
-21
@@ -1,7 +1,14 @@
|
||||
package com.sap.sailing.racecommittee.app.ui.fragments.raceinfo;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Calendar;
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.os.Bundle;
|
||||
import android.os.Handler;
|
||||
import android.support.v7.widget.LinearLayoutManager;
|
||||
import android.support.v7.widget.RecyclerView;
|
||||
import android.text.TextUtils;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
|
||||
import com.sap.sailing.android.shared.logging.ExLog;
|
||||
import com.sap.sailing.android.shared.util.ViewHelper;
|
||||
@@ -22,7 +29,6 @@ import com.sap.sailing.racecommittee.app.domain.impl.SelectionItem;
|
||||
import com.sap.sailing.racecommittee.app.ui.activities.RacingActivity;
|
||||
import com.sap.sailing.racecommittee.app.ui.adapters.SelectionAdapter;
|
||||
import com.sap.sailing.racecommittee.app.ui.fragments.RaceFragment;
|
||||
import com.sap.sailing.racecommittee.app.ui.fragments.chooser.RaceInfoFragmentChooser;
|
||||
import com.sap.sailing.racecommittee.app.ui.utils.FlagsResources;
|
||||
import com.sap.sailing.racecommittee.app.utils.RaceHelper;
|
||||
import com.sap.sailing.racecommittee.app.utils.TimeUtils;
|
||||
@@ -30,15 +36,8 @@ import com.sap.sse.common.Duration;
|
||||
import com.sap.sse.common.TimePoint;
|
||||
import com.sap.sse.common.impl.MillisecondsTimePoint;
|
||||
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.os.Bundle;
|
||||
import android.os.Handler;
|
||||
import android.support.v7.widget.LinearLayoutManager;
|
||||
import android.support.v7.widget.RecyclerView;
|
||||
import android.text.TextUtils;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Calendar;
|
||||
|
||||
public class MainScheduleFragment extends BaseFragment implements View.OnClickListener, SelectionAdapter.ItemClick {
|
||||
|
||||
@@ -249,12 +248,12 @@ public class MainScheduleFragment extends BaseFragment implements View.OnClickLi
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
switch (v.getId()) {
|
||||
case R.id.start_race:
|
||||
startRace();
|
||||
break;
|
||||
case R.id.start_race:
|
||||
startRace();
|
||||
break;
|
||||
|
||||
default:
|
||||
ExLog.i(getActivity(), TAG, "Clicked on " + v);
|
||||
default:
|
||||
ExLog.i(getActivity(), TAG, "Clicked on " + v);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -337,7 +336,10 @@ public class MainScheduleFragment extends BaseFragment implements View.OnClickLi
|
||||
args.putBoolean(RACE_GROUP, mItemRaceGroup.isChecked());
|
||||
}
|
||||
|
||||
getFragmentManager().beginTransaction().replace(R.id.racing_view_container, fragment).commitAllowingStateLoss();
|
||||
getFragmentManager().beginTransaction()
|
||||
.replace(R.id.racing_view_container, fragment)
|
||||
.addToBackStack(null)
|
||||
.commitAllowingStateLoss();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -352,9 +354,8 @@ public class MainScheduleFragment extends BaseFragment implements View.OnClickLi
|
||||
@Override
|
||||
public void onStatusChanged(ReadonlyRaceState state) {
|
||||
super.onStatusChanged(state);
|
||||
|
||||
openFragment(
|
||||
RaceInfoFragmentChooser.on(state.getRacingProcedure().getType()).choose(getActivity(), getRace()));
|
||||
RacingActivity activity = (RacingActivity) requireActivity();
|
||||
activity.onRaceItemClicked(getRace(), true);
|
||||
}
|
||||
}
|
||||
}
|
||||
+9
-8
@@ -1,5 +1,12 @@
|
||||
package com.sap.sailing.racecommittee.app.ui.fragments.raceinfo;
|
||||
|
||||
import android.os.Bundle;
|
||||
import android.support.annotation.NonNull;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.ListView;
|
||||
|
||||
import com.sap.sailing.android.shared.util.ViewHelper;
|
||||
import com.sap.sailing.domain.abstractlog.race.state.racingprocedure.RacingProcedure;
|
||||
import com.sap.sailing.domain.common.racelog.Flags;
|
||||
@@ -13,12 +20,6 @@ import com.sap.sailing.racecommittee.app.ui.layouts.HeaderLayout;
|
||||
import com.sap.sse.common.TimePoint;
|
||||
import com.sap.sse.common.impl.MillisecondsTimePoint;
|
||||
|
||||
import android.os.Bundle;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.ListView;
|
||||
|
||||
public class RecallFlagsFragment extends RaceFragment implements RecallFlagItemClick {
|
||||
|
||||
private final static String HEADER_TEXT = "headerText";
|
||||
@@ -34,13 +35,13 @@ public class RecallFlagsFragment extends RaceFragment implements RecallFlagItemC
|
||||
}
|
||||
|
||||
@Override
|
||||
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
||||
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
||||
View layout = inflater.inflate(R.layout.flag_list, container, false);
|
||||
|
||||
HeaderLayout header = ViewHelper.get(layout, R.id.header);
|
||||
if (header != null) {
|
||||
header.setHeaderText(getArguments().getString(HEADER_TEXT, getString(R.string.not_available)));
|
||||
header.setOnClickListener(new View.OnClickListener() {
|
||||
header.setHeaderOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
sendIntent(AppConstants.INTENT_ACTION_CLEAR_TOGGLE);
|
||||
|
||||
Reference in new issue
Block a user