eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-18 02:00:58 +00:00
Code Activity

add RegattaLog competitors regardless of tracked races being available

Browse Source 
Change-Id: I96a9fa355023153837453cc6ce84cc599a5ebe46
This commit is contained in:
Axel Uhl committed 2017-11-21 23:02:05 +01:00
1 parent 1ef977b257
commit ce71848851
1 file changed
+4 -8
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/CompetitorProviderFromRaceColumnsAndRegattaLike.java
+4 -8
View File
@@ -181,9 +181,7 @@ public class CompetitorProviderFromRaceColumnsAndRegattaLike {
if (allCompetitorsCache == null) {
final Set<Competitor> result = new HashSet<>();
final Set<RaceDefinition> raceDefinitions = new HashSet<>();
boolean hasRaceColumns = false;
for (RaceColumn rc : provider.getRaceColumns()) {
hasRaceColumns = true;
final Pair<Iterable<RaceDefinition>, Iterable<Competitor>> allCompetitorsInRaceColumnWithRaceDefinitionsConsidered = rc.getAllCompetitorsWithRaceDefinitionsConsidered();
Util.addAll(allCompetitorsInRaceColumnWithRaceDefinitionsConsidered.getB(), result);
Util.addAll(allCompetitorsInRaceColumnWithRaceDefinitionsConsidered.getA(), raceDefinitions);
@@ -192,12 +190,10 @@ public class CompetitorProviderFromRaceColumnsAndRegattaLike {
}
}
final RegattaLog regattaLog = provider.getRegattaLike().getRegattaLog();
if (!hasRaceColumns) {
// If no race exists, the regatta log-provided competitor registrations will not have
// been considered yet; add them:
final Set<Competitor> regattaLogProvidedCompetitors = new CompetitorsInLogAnalyzer<>(regattaLog).analyze();
result.addAll(regattaLogProvidedCompetitors);
}
// If no race exists, the regatta log-provided competitor registrations will not have
// been considered yet; add them:
final Set<Competitor> regattaLogProvidedCompetitors = new CompetitorsInLogAnalyzer<>(regattaLog).analyze();
result.addAll(regattaLogProvidedCompetitors);
// else, don't add regatta log competitors because they have been added in each column already.
// The competitors are collected from the races. Those, however, will be the regatta log
// competitors if the race does not define its own.