revert change that made boatClass non-final

This commit is contained in:
Fredrik Teschke committed 2014-04-29 13:05:54 +02:00
1 parent 14645a8f98
commit 658fb95733
9 files changed
+17 -33

No files matched your search

@@ -4,7 +4,6 @@ import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.Serializable;
import com.sap.sailing.domain.base.BoatClass;
import com.sap.sailing.domain.base.Competitor;
import com.sap.sailing.domain.base.CompetitorStore;
import com.sap.sailing.domain.base.DomainFactory;
@@ -96,8 +95,8 @@ public class PersistentCompetitorStore extends TransientCompetitorStoreImpl impl
}
@Override
public Competitor updateCompetitor(String idAsString, String newName, Color newRgbDisplayColor, String newSailId, Nationality newNationality, BoatClass newBoatClass) {
Competitor result = super.updateCompetitor(idAsString, newName, newRgbDisplayColor, newSailId, newNationality, newBoatClass);
public Competitor updateCompetitor(String idAsString, String newName, Color newRgbDisplayColor, String newSailId, Nationality newNationality) {
Competitor result = super.updateCompetitor(idAsString, newName, newRgbDisplayColor, newSailId, newNationality);
storeTo.storeCompetitor(result);
return result;
}
@@ -1,6 +1,5 @@
package com.sap.sailing.server.operationaltransformation;
import com.sap.sailing.domain.base.BoatClass;
import com.sap.sailing.domain.base.Competitor;
import com.sap.sailing.domain.base.Nationality;
import com.sap.sailing.domain.common.Color;
@@ -14,25 +13,23 @@ public class UpdateCompetitor extends AbstractRacingEventServiceOperation<Compet
private final Color newDisplayColor;
private final String newSailId;
private final Nationality newNationality;
private final BoatClass boatClass;
/**
* @param idAsString Identified the competitor to update
* @param newNationality if <code>null</code>, the competitor obtains the "NONE" nationality, usually represented by a white flag
*/
public UpdateCompetitor(String idAsString, String newName, Color newDisplayColor, String newSailId, Nationality newNationality, BoatClass boatClass) {
public UpdateCompetitor(String idAsString, String newName, Color newDisplayColor, String newSailId, Nationality newNationality) {
super();
this.idAsString = idAsString;
this.newName = newName;
this.newDisplayColor = newDisplayColor;
this.newSailId = newSailId;
this.newNationality = newNationality;
this.boatClass = boatClass;
}
@Override
public Competitor internalApplyTo(RacingEventService toState) throws Exception {
return toState.getBaseDomainFactory().getCompetitorStore().updateCompetitor(idAsString, newName, newDisplayColor, newSailId, newNationality, boatClass);
return toState.getBaseDomainFactory().getCompetitorStore().updateCompetitor(idAsString, newName, newDisplayColor, newSailId, newNationality);
}
@Override