eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-24 14:38:45 +00:00
Code Activity

Merge branch 'master' into bug4811-with-bug5288-with-elemental2

Browse Source
This commit is contained in:
Axel Uhl
2021-01-21 13:20:07 +01:00
parent a4b0127032 4a53e68d19
commit c3e57dc3d1
36 changed files with 492 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/CompetitorDescriptor.java
+11 -11
View File
@@ -1,8 +1,8 @@
package com.sap.sailing.domain.common;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import com.sap.sailing.domain.common.dto.PersonDTO;
import com.sap.sse.common.CountryCode;
@@ -15,8 +15,8 @@ import com.sap.sse.common.impl.NamedImpl;
public class CompetitorDescriptor extends NamedImpl implements Named {
private static final long serialVersionUID = -6645726854552711646L;
private final UUID competitorUUID;
private final UUID boatUUID;
private final Serializable competitorId;
private final Serializable boatId;
private final String shortName;
private final String eventName;
private final String regattaName;
@@ -32,23 +32,23 @@ public class CompetitorDescriptor extends NamedImpl implements Named {
private final Duration timeOnDistanceAllowancePerNauticalMile;
public CompetitorDescriptor(String eventName, String regattaName, String raceName, String fleetName,
UUID competitorUUID, String fullName, String shortName, String teamName, Iterable<PersonDTO> persons,
Serializable competitorId, String fullName, String shortName, String teamName, Iterable<PersonDTO> persons,
CountryCode countryCode, Double timeOnTimeFactor,
Duration timeOnDistanceAllowancePerNauticalMile, UUID boatUUID, String boatName, String boatClassName, String sailNumber) {
Duration timeOnDistanceAllowancePerNauticalMile, Serializable boatId, String boatName, String boatClassName, String sailNumber) {
super(fullName);
this.shortName = shortName;
this.eventName = eventName;
this.regattaName = regattaName;
this.raceName = raceName;
this.fleetName = fleetName;
this.competitorUUID = competitorUUID;
this.competitorId = competitorId;
this.teamName = teamName;
this.countryCode = countryCode;
this.persons = new ArrayList<>();
Util.addAll(persons, this.persons);
this.timeOnTimeFactor = timeOnTimeFactor;
this.timeOnDistanceAllowancePerNauticalMile = timeOnDistanceAllowancePerNauticalMile;
this.boatUUID = boatUUID;
this.boatId = boatId;
this.boatName = boatName;
this.boatClassName = boatClassName;
this.sailNumber = sailNumber;
@@ -106,12 +106,12 @@ public class CompetitorDescriptor extends NamedImpl implements Named {
return timeOnDistanceAllowancePerNauticalMile;
}
public UUID getCompetitorUUID() {
return competitorUUID;
public Serializable getCompetitorId() {
return competitorId;
}
public UUID getBoatUUID() {
return boatUUID;
public Serializable getBoatId() {
return boatId;
}
@Override