eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-11 14:50:56 +00:00
Code Activity

Merge remote-tracking branch 'server/master'

Browse Source
This commit is contained in:
Axel Uhl committed 2012-06-06 14:26:21 +02:00
2 parents 2d479ff039 c21ea5dae2
commit 6dbe4903f7
14 files changed
+77 -51
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java
+2 -3
View File
@@ -360,10 +360,9 @@ public interface RacingEventService extends TrackedRegattaRegistry, RegattaFetch
TrackedRace createTrackedRace(RegattaAndRaceIdentifier raceIdentifier, WindStore windStore,
long delayToLiveInMillis, long millisecondsOverWhichToAverageWind, long millisecondsOverWhichToAverageSpeed);
Regatta getOrCreateRegatta(String regattaName, String boatClassName, boolean boatClassTypicallyStartsUpwind);
Regatta getOrCreateRegatta(String regattaName, String boatClassName);
Regatta createRegatta(String baseName, String boatClassName, boolean boatClassTypicallyStartsUpwind,
Iterable<? extends Series> series, boolean persistent);
Regatta createRegatta(String baseName, String boatClassName, Iterable<? extends Series> series, boolean persistent);
/**
* Adds <code>raceDefinition</code> to the {@link Regatta} such that it will appear in {@link Regatta#getAllRaces()}
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
+6 -9
View File
@@ -489,9 +489,9 @@ public class RacingEventServiceImpl implements RacingEventService, RegattaListen
}
@Override
public Regatta getOrCreateRegatta(String baseEventName, String boatClassName, boolean boatClassTypicallyStartsUpwind) {
public Regatta getOrCreateRegatta(String baseEventName, String boatClassName) {
Regatta regatta = new RegattaImpl(baseEventName, com.sap.sailing.domain.base.DomainFactory.INSTANCE.getOrCreateBoatClass(
boatClassName, boatClassTypicallyStartsUpwind), this);
boatClassName), this);
Regatta result = regattasByName.get(regatta.getName());
if (result == null) {
result = regatta;
@@ -503,10 +503,9 @@ public class RacingEventServiceImpl implements RacingEventService, RegattaListen
@Override
public Regatta createRegatta(String baseEventName, String boatClassName,
boolean boatClassTypicallyStartsUpwind, Iterable<? extends Series> series, boolean persistent) {
Iterable<? extends Series> series, boolean persistent) {
Regatta regatta = new RegattaImpl(baseEventName,
com.sap.sailing.domain.base.DomainFactory.INSTANCE.getOrCreateBoatClass(boatClassName,
boatClassTypicallyStartsUpwind), series, persistent);
com.sap.sailing.domain.base.DomainFactory.INSTANCE.getOrCreateBoatClass(boatClassName), series, persistent);
logger.info("Created regatta " + regatta.getName() + " (" + hashCode() + ")");
cacheAndReplicateSpecificRegattaWithoutRaceColumns(regatta);
if (persistent) {
@@ -638,8 +637,7 @@ public class RacingEventServiceImpl implements RacingEventService, RegattaListen
regattasByName.put(regatta.getName(), regatta);
regatta.addRegattaListener(this);
replicate(new AddSpecificRegatta(regatta.getBaseName(), regatta.getBoatClass() == null ? null : regatta
.getBoatClass().getName(), regatta.getBoatClass() == null ? false : regatta.getBoatClass()
.typicallyStartsUpwind(), getSeriesWithoutRaceColumnsConstructionParametersAsMap(regatta), regatta.isPersistent()));
.getBoatClass().getName(), getSeriesWithoutRaceColumnsConstructionParametersAsMap(regatta), regatta.isPersistent()));
RegattaIdentifier regattaIdentifier = regatta.getRegattaIdentifier();
for (RaceDefinition race : regatta.getAllRaces()) {
replicate(new AddRaceDefinition(regattaIdentifier, race));
@@ -669,8 +667,7 @@ public class RacingEventServiceImpl implements RacingEventService, RegattaListen
if (!regattasByName.containsKey(regatta.getName())) {
regattasByName.put(regatta.getName(), regatta);
regatta.addRegattaListener(this);
replicate(new AddDefaultRegatta(regatta.getBaseName(), regatta.getBoatClass() == null ? null : regatta.getBoatClass().getName(),
regatta.getBoatClass() == null ? false : regatta.getBoatClass().typicallyStartsUpwind()));
replicate(new AddDefaultRegatta(regatta.getBaseName(), regatta.getBoatClass() == null ? null : regatta.getBoatClass().getName()));
RegattaIdentifier regattaIdentifier = regatta.getRegattaIdentifier();
for (RaceDefinition race : regatta.getAllRaces()) {
replicate(new AddRaceDefinition(regattaIdentifier, race));
java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/AbstractAddRegattaOperation.java
+1 -8
View File
@@ -6,13 +6,11 @@ public abstract class AbstractAddRegattaOperation extends AbstractRacingEventSer
private static final long serialVersionUID = 4596134166642095364L;
private final String baseEventName;
private final String boatClassName;
private final boolean boatClassTypicallyStartsUpwind;
public AbstractAddRegattaOperation(String regattaName, String boatClassName, boolean boatClassTypicallyStartsUpwind) {
public AbstractAddRegattaOperation(String regattaName, String boatClassName) {
super();
this.baseEventName = regattaName;
this.boatClassName = boatClassName;
this.boatClassTypicallyStartsUpwind = boatClassTypicallyStartsUpwind;
}
protected String getBaseEventName() {
@@ -22,9 +20,4 @@ public abstract class AbstractAddRegattaOperation extends AbstractRacingEventSer
protected String getBoatClassName() {
return boatClassName;
}
protected boolean isBoatClassTypicallyStartsUpwind() {
return boatClassTypicallyStartsUpwind;
}
}
java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/AddDefaultRegatta.java
+3 -3
View File
@@ -7,8 +7,8 @@ import com.sap.sailing.server.RacingEventServiceOperation;
public class AddDefaultRegatta extends AbstractAddRegattaOperation {
private static final long serialVersionUID = -3550383541066673065L;
public AddDefaultRegatta(String regattaName, String boatClassName, boolean boatClassTypicallyStartsUpwind) {
super(regattaName, boatClassName, boatClassTypicallyStartsUpwind);
public AddDefaultRegatta(String regattaName, String boatClassName) {
super(regattaName, boatClassName);
}
@Override
@@ -25,7 +25,7 @@ public class AddDefaultRegatta extends AbstractAddRegattaOperation {
@Override
public Regatta internalApplyTo(RacingEventService toState) {
return toState.getOrCreateRegatta(getBaseEventName(), getBoatClassName(), isBoatClassTypicallyStartsUpwind());
return toState.getOrCreateRegatta(getBaseEventName(), getBoatClassName());
}
}
java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/AddSpecificRegatta.java
+3 -4
View File
@@ -20,16 +20,15 @@ public class AddSpecificRegatta extends AbstractAddRegattaOperation {
private final Map<String, Pair<List<Pair<String, Integer>>, Boolean>> seriesNamesWithFleetNamesAndFleetOrderingAndMedal;
private final boolean persistent;
public AddSpecificRegatta(String regattaName, String boatClassName, boolean boatClassTypicallyStartsUpwind,
Map<String, Pair<List<Pair<String, Integer>>, Boolean>> seriesNamesWithFleetNamesAndFleetOrdering, boolean persistent) {
super(regattaName, boatClassName, boatClassTypicallyStartsUpwind);
public AddSpecificRegatta(String regattaName, String boatClassName, Map<String, Pair<List<Pair<String, Integer>>, Boolean>> seriesNamesWithFleetNamesAndFleetOrdering, boolean persistent) {
super(regattaName, boatClassName);
this.seriesNamesWithFleetNamesAndFleetOrderingAndMedal = seriesNamesWithFleetNamesAndFleetOrdering;
this.persistent = persistent;
}
@Override
public Regatta internalApplyTo(RacingEventService toState) throws Exception {
return toState.createRegatta(getBaseEventName(), getBoatClassName(), isBoatClassTypicallyStartsUpwind(), createSeries(toState), persistent);
return toState.createRegatta(getBaseEventName(), getBoatClassName(), createSeries(toState), persistent);
}
private Iterable<? extends Series> createSeries(TrackedRegattaRegistry trackedRegattaRegistry) {