cleanup of method parameter name during regatta creation (baseRegattaName instead of baseEventName)

This commit is contained in:
fmittag committed 2013-03-20 12:07:47 +01:00
1 parent b1101a4740
commit 26da06454e
4 files changed
+11 -11

No files matched your search

@@ -634,13 +634,13 @@ public class RacingEventServiceImpl implements RacingEventService, RegattaListen
}
@Override
public Regatta getOrCreateRegatta(String baseEventName, String boatClassName, Serializable id) {
public Regatta getOrCreateRegatta(String baseRegattaName, String boatClassName, Serializable id) {
RaceLogStore raceLogStore = MongoRaceLogStoreFactory.INSTANCE.getMongoRaceLogStore(
mongoObjectFactory,
domainObjectFactory);
Regatta regatta = new RegattaImpl(raceLogStore, baseEventName, getBaseDomainFactory().getOrCreateBoatClass(
Regatta regatta = new RegattaImpl(raceLogStore, baseRegattaName, getBaseDomainFactory().getOrCreateBoatClass(
boatClassName), this, com.sap.sailing.domain.base.DomainFactory.INSTANCE.createScoringScheme(ScoringSchemeType.LOW_POINT),
RegattaImpl.getFullName(baseEventName, boatClassName), null);
RegattaImpl.getFullName(baseRegattaName, boatClassName), null);
//TODO: shall a default regatta have a default course area?
Regatta result = regattasByName.get(regatta.getName());
if (result == null) {
@@ -652,13 +652,13 @@ public class RacingEventServiceImpl implements RacingEventService, RegattaListen
}
@Override
public Regatta createRegatta(String baseEventName, String boatClassName,
public Regatta createRegatta(String baseRegattaName, String boatClassName,
Serializable id, Iterable<? extends Series> series, boolean persistent, ScoringScheme scoringScheme, Serializable defaultCourseAreaId) {
RaceLogStore raceLogStore = MongoRaceLogStoreFactory.INSTANCE.getMongoRaceLogStore(
mongoObjectFactory,
domainObjectFactory);
CourseArea courseArea = getCourseArea(defaultCourseAreaId);
Regatta regatta = new RegattaImpl(raceLogStore, baseEventName,
Regatta regatta = new RegattaImpl(raceLogStore, baseRegattaName,
getBaseDomainFactory().getOrCreateBoatClass(boatClassName), series, persistent, scoringScheme, id, courseArea);
logger.info("Created regatta " + regatta.getName() + " (" + hashCode() + ") on "+this);
cacheAndReplicateSpecificRegattaWithoutRaceColumns(regatta);
@@ -6,19 +6,19 @@ import com.sap.sailing.domain.base.Regatta;
public abstract class AbstractAddRegattaOperation extends AbstractRacingEventServiceOperation<Regatta> {
private static final long serialVersionUID = 4596134166642095364L;
private final String baseEventName;
private final String baseRegattaName;
private final String boatClassName;
private final Serializable id;
public AbstractAddRegattaOperation(String regattaName, String boatClassName, Serializable id) {
super();
this.baseEventName = regattaName;
this.baseRegattaName = regattaName;
this.boatClassName = boatClassName;
this.id = id;
}
protected String getBaseEventName() {
return baseEventName;
protected String getBaseRegattaName() {
return baseRegattaName;
}
protected String getBoatClassName() {
@@ -27,7 +27,7 @@ public class AddDefaultRegatta extends AbstractAddRegattaOperation {
@Override
public Regatta internalApplyTo(RacingEventService toState) {
return toState.getOrCreateRegatta(getBaseEventName(), getBoatClassName(), getId());
return toState.getOrCreateRegatta(getBaseRegattaName(), getBoatClassName(), getId());
}
}
@@ -38,7 +38,7 @@ public class AddSpecificRegatta extends AbstractAddRegattaOperation {
@Override
public Regatta internalApplyTo(RacingEventService toState) throws Exception {
return toState.createRegatta(getBaseEventName(), getBoatClassName(), getId(), createSeries(toState),
return toState.createRegatta(getBaseRegattaName(), getBoatClassName(), getId(), createSeries(toState),
persistent, scoringScheme, defaultCourseAreaId);
}