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

added TrackedRegattaRegistry as argument to SeriesImpl constructor and refactored all usages accordingly

Browse Source
This commit is contained in:
Axel Uhl committed 2012-06-05 16:31:57 +02:00
1 parent e964d4b77b
commit 2d7815978b
33 files changed
+148 -97
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/impl/RacingEventServiceImpl.java
+2 -2
View File
@@ -205,7 +205,7 @@ public class RacingEventServiceImpl implements RacingEventService, RegattaListen
}
private void loadStoredRegattas() {
for (Regatta regatta : domainObjectFactory.loadAllRegattas()) {
for (Regatta regatta : domainObjectFactory.loadAllRegattas(this)) {
regattasByName.put(regatta.getName(), regatta);
}
}
@@ -462,7 +462,7 @@ public class RacingEventServiceImpl implements RacingEventService, RegattaListen
@Override
public Regatta getOrCreateRegatta(String baseEventName, String boatClassName, boolean boatClassTypicallyStartsUpwind) {
Regatta regatta = new RegattaImpl(baseEventName, com.sap.sailing.domain.base.DomainFactory.INSTANCE.getOrCreateBoatClass(
boatClassName, boatClassTypicallyStartsUpwind));
boatClassName, boatClassTypicallyStartsUpwind), this);
Regatta result = regattasByName.get(regatta.getName());
if (result == null) {
result = regatta;
java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/AddColumnToSeries.java
+1 -1
View File
@@ -18,7 +18,7 @@ public class AddColumnToSeries extends AbstractColumnInSeriesOperation<RaceColum
RaceColumnInSeries result = null;
Series series = getSeries(toState);
if (series != null) {
result = series.addRaceColumn(getColumnName());
result = series.addRaceColumn(getColumnName(), toState);
if (series.getRegatta().isPersistent()) {
toState.updateStoredRegatta(series.getRegatta());
}
java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/AddSpecificRegatta.java
+4 -3
View File
@@ -11,6 +11,7 @@ import com.sap.sailing.domain.base.Series;
import com.sap.sailing.domain.base.impl.FleetImpl;
import com.sap.sailing.domain.base.impl.SeriesImpl;
import com.sap.sailing.domain.common.impl.Util.Pair;
import com.sap.sailing.domain.tracking.TrackedRegattaRegistry;
import com.sap.sailing.server.RacingEventService;
import com.sap.sailing.server.RacingEventServiceOperation;
@@ -28,14 +29,14 @@ public class AddSpecificRegatta extends AbstractAddRegattaOperation {
@Override
public Regatta internalApplyTo(RacingEventService toState) throws Exception {
return toState.createRegatta(getBaseEventName(), getBoatClassName(), isBoatClassTypicallyStartsUpwind(), createSeries(), persistent);
return toState.createRegatta(getBaseEventName(), getBoatClassName(), isBoatClassTypicallyStartsUpwind(), createSeries(toState), persistent);
}
private Iterable<? extends Series> createSeries() {
private Iterable<? extends Series> createSeries(TrackedRegattaRegistry trackedRegattaRegistry) {
List<Series> result = new ArrayList<Series>();
for (Map.Entry<String, Pair<List<Pair<String, Integer>>, Boolean>> e : seriesNamesWithFleetNamesAndFleetOrderingAndMedal.entrySet()) {
final List<String> emptyRaceColumnNamesList = Collections.emptyList();
Series s = new SeriesImpl(e.getKey(), /* isMedal */ e.getValue().getB(), createFleets(e.getValue().getA()), emptyRaceColumnNamesList);
Series s = new SeriesImpl(e.getKey(), /* isMedal */ e.getValue().getB(), createFleets(e.getValue().getA()), emptyRaceColumnNamesList, trackedRegattaRegistry);
result.add(s);
}
return result;