eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-30 01:16:40 +00:00
Code Activity

replaced use of SailingServiceImpl.sizeOf by Util.isEmpty() and removed sizeOf

Browse Source 
Change-Id: I2b6a49b897790030618ce73abe5b83f5cf79d90d
This commit is contained in:
Axel Uhl
2016-01-18 15:08:06 +01:00
parent 1d9f04992f
commit bfc35601ce
1 changed files with 5 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
+5 -22
View File
@@ -2435,15 +2435,12 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S
raceColumn instanceof RaceColumnInSeries ? ((RaceColumnInSeries) raceColumn).getRegatta().getName() : null,
raceColumn instanceof RaceColumnInSeries ? ((RaceColumnInSeries) raceColumn).getSeries().getName() : null,
fleetDTO, raceColumn.isMedalRace(), raceIdentifier, raceDTO, raceColumn instanceof MetaLeaderboardColumn);
RaceLog raceLog = raceColumn.getRaceLog(fleet);
RaceLogTrackingState raceLogTrackingState = raceLog == null ? RaceLogTrackingState.NOT_A_RACELOG_TRACKED_RACE :
final RaceLog raceLog = raceColumn.getRaceLog(fleet);
final RaceLogTrackingState raceLogTrackingState = raceLog == null ? RaceLogTrackingState.NOT_A_RACELOG_TRACKED_RACE :
new RaceLogTrackingStateAnalyzer(raceLog).analyze();
boolean raceLogTrackerExists = raceLog == null ? false : getService().getRaceTrackerById(raceLog.getId()) != null;
boolean competitorRegistrationsExist;
competitorRegistrationsExist = raceLog == null ? false : sizeOf(raceColumn.getAllCompetitors(fleet)) > 0 ;
RaceLogTrackingInfoDTO raceLogTrackingInfo = new RaceLogTrackingInfoDTO(raceLogTrackerExists,
final boolean raceLogTrackerExists = raceLog == null ? false : getService().getRaceTrackerById(raceLog.getId()) != null;
final boolean competitorRegistrationsExist = raceLog == null ? false : !Util.isEmpty(raceColumn.getAllCompetitors(fleet));
final RaceLogTrackingInfoDTO raceLogTrackingInfo = new RaceLogTrackingInfoDTO(raceLogTrackerExists,
competitorRegistrationsExist, raceLogTrackingState);
raceColumnDTO.setRaceLogTrackingInfo(fleetDTO, raceLogTrackingInfo);
}
@@ -2451,20 +2448,6 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S
return leaderboardDTO;
}
private int sizeOf(Iterable<Competitor> values) {
if (values instanceof Collection<?>) {
return ((Collection<?>)values).size();
} else {
Iterator<Competitor> it = values.iterator();
int sum = 0;
while (it.hasNext()) {
it.next();
sum++;
}
return sum;
}
}
@Override
public StrippedLeaderboardDTO updateLeaderboard(String leaderboardName, String newLeaderboardName, String newLeaderboardDisplayName, int[] newDiscardingThresholds, UUID newCourseAreaId) {
Leaderboard updatedLeaderboard = getService().apply(new UpdateLeaderboard(leaderboardName, newLeaderboardName, newLeaderboardDisplayName, newDiscardingThresholds, newCourseAreaId));