eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-08 21:30:57 +00:00
Code Activity

Merge branch 'master' into ubilabs--tracking_app--develop

Browse Source
This commit is contained in:
Peter Siegmund committed 2015-05-06 08:57:26 +02:00
2 parents ffc96c2308 173d76f3e5
commit 125ff95d12
18 files changed
+94 -42
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/RaceGroupFactory.java
+3 -10
View File
@@ -43,11 +43,9 @@ public class RaceGroupFactory {
String name = leaderboard.getName();
CourseArea courseArea = leaderboard.getDefaultCourseArea();
Regatta regatta = ((RegattaLeaderboard) leaderboard).getRegatta();
Iterable<SeriesWithRows> series = getSeries(leaderboard);
return new RaceGroupImpl(name, regatta.getBoatClass(), courseArea, series,
regatta.getRegattaConfiguration());
return new RaceGroupImpl(name, leaderboard.getDisplayName(), regatta.getBoatClass(), courseArea,
series, regatta.getRegattaConfiguration());
}
/**
@@ -57,20 +55,15 @@ public class RaceGroupFactory {
*/
public RaceGroup convert(FlexibleLeaderboard leaderboard) {
String name = leaderboard.getName();
CourseArea courseArea = leaderboard.getDefaultCourseArea();
BoatClass boatClass = null;
RegattaConfiguration configuration = null;
Iterable<SeriesWithRows> series = getSeries(leaderboard);
return new RaceGroupImpl(name, boatClass, courseArea, series, configuration);
return new RaceGroupImpl(name, leaderboard.getDisplayName(), boatClass, courseArea, series, configuration);
}
public Iterable<SeriesWithRows> getSeries(Leaderboard leaderboard) {
Map<Series, List<RaceColumn>> seriesToRaceColumns = getSeriesToRaceColumns(leaderboard);
Collection<SeriesWithRows> seriesWithRows = new ArrayList<>();
for (Series series : getSeriesIterable(leaderboard, seriesToRaceColumns)) {
seriesWithRows.add(new SeriesWithRowsImpl(series.getName(), series.isMedal(), getRows(series,