eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-23 12:33:53 +00:00
Code Activity

Merge branch master in bug2851

Browse Source
This commit is contained in:
Jan Broß committed 2015-11-04 13:36:29 +01:00
2 parents 0daf5d427e bdd3113e14
commit f36c072247
160 files changed
+1554 -1843
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/jaxrs/api/LeaderboardsResource.java
+4 -4
View File
@@ -409,11 +409,11 @@ public class LeaderboardsResource extends AbstractSailingServerResource {
Set<Competitor> registered = new CompetitorsInLogAnalyzer<>(isRegattaLike.getRegattaLog()).analyze();
if (!registered.contains(mappedTo)) {
isRegattaLike.getRegattaLog().add(
new RegattaLogRegisterCompetitorEventImpl(now, author, now, UUID.randomUUID(), mappedTo));
new RegattaLogRegisterCompetitorEventImpl(now, now, author, UUID.randomUUID(), mappedTo));
}
DeviceIdentifier device = new SmartphoneUUIDIdentifierImpl(UUID.fromString(deviceUuid));
TimePoint from = new MillisecondsTimePoint(fromMillis);
event = new RegattaLogDeviceCompetitorMappingEventImpl(now, author, now, UUID.randomUUID(), mappedTo, device,
event = new RegattaLogDeviceCompetitorMappingEventImpl(now, now, author, UUID.randomUUID(), mappedTo, device,
from, null);
isRegattaLike.getRegattaLog().add(event);
logger.fine("Successfully checked in competitor " + mappedTo.getName());
@@ -496,8 +496,8 @@ public class LeaderboardsResource extends AbstractSailingServerResource {
.type(MediaType.TEXT_PLAIN).build();
}
RegattaLogCloseOpenEndedDeviceMappingEventImpl event = new RegattaLogCloseOpenEndedDeviceMappingEventImpl(now,
author, now, UUID.randomUUID(), deviceMappingEventId, closingTimePoint);
RegattaLogCloseOpenEndedDeviceMappingEventImpl event = new RegattaLogCloseOpenEndedDeviceMappingEventImpl(
author, now, deviceMappingEventId, closingTimePoint);
isRegattaLike.getRegattaLog().add(event);
logger.fine("Successfully checked out competitor " + mappedTo.getName());