Merge branch 'master' into bug5292

This commit is contained in:
Dennis Aulenbacher
2020-07-02 00:57:17 +02:00
143 changed files with 1062 additions and 772 deletions
@@ -10,6 +10,7 @@ public final class ExpeditionAllInOneConstants {
public static final String RESPONSE_EVENT_ID = "eventId";
public static final String RESPONSE_LEADER_BOARD_NAME = "leaderboardName";
public static final String RESPONSE_LEADER_BOARD_GROUP_NAME = "leaderboardGroupName";
public static final String RESPONSE_LEADER_BOARD_GROUP_ID = "leaderboardGroupId";
public static final String RESPONSE_REGATTA_NAME = "regattaName";
public static final String RESPONSE_RACE_LIST = "raceNameRaceColumnNameFleetNameList";
public static final String RESPONSE_ERRORS = "errors";
@@ -24,14 +24,12 @@ public class MasterDataImportObjectCreationCountImpl implements MasterDataImport
private int regattaCount = 0;
private int mediaTrackCount = 0;
private int trackedRacesCount = 0;
private Set<String> createdLeaderboards = new HashSet<String>();
private Set<String> createdLeaderboardGroups = new HashSet<String>();
private Set<String> createdEvents = new HashSet<String>();
private Set<String> createdRegattas = new HashSet<String>();
private Set<String> createdTrackedRaces = new HashSet<String>();
private Set<String> overwrittenRegattas = new HashSet<String>();
private Set<String> createdLeaderboards = new HashSet<>();
private Set<String> createdLeaderboardGroups = new HashSet<>();
private Set<String> createdEvents = new HashSet<>();
private Set<String> createdRegattas = new HashSet<>();
private Set<String> createdTrackedRaces = new HashSet<>();
private Set<String> overwrittenRegattas = new HashSet<>();
//For GWT serialization
public MasterDataImportObjectCreationCountImpl() {};
@@ -46,18 +44,18 @@ public class MasterDataImportObjectCreationCountImpl implements MasterDataImport
leaderboardGroupCount++;
}
public void addOneEvent(String id) {
createdEvents.add(id);
public void addOneEvent(String idAsString) {
createdEvents.add(idAsString);
eventCount++;
}
public void addOneRegatta(String id) {
createdRegattas.add(id);
public void addOneRegatta(String idAsString) {
createdRegattas.add(idAsString);
regattaCount++;
}
public void addOneTrackedRace(String id) {
createdTrackedRaces.add(id);
public void addOneTrackedRace(String idAsString) {
createdTrackedRaces.add(idAsString);
trackedRacesCount++;
}
@@ -87,16 +85,16 @@ public class MasterDataImportObjectCreationCountImpl implements MasterDataImport
return createdLeaderboardGroups.contains(name);
}
public boolean alreadyAddedEventWithId(String id) {
return createdEvents.contains(id);
public boolean alreadyAddedEventWithId(String idAsString) {
return createdEvents.contains(idAsString);
}
public boolean alreadyAddedRegattaWithId(String id) {
return createdRegattas.contains(id);
public boolean alreadyAddedRegattaWithId(String idAsString) {
return createdRegattas.contains(idAsString);
}
public boolean alreadyAddedTrackedRaceWithId(String id) {
return createdTrackedRaces.contains(id);
public boolean alreadyAddedTrackedRaceWithId(String idAsString) {
return createdTrackedRaces.contains(idAsString);
}
@Override