Merge branch 'foiling' of ssh://sapsailing.com/home/trac/git into foiling

This commit is contained in:
Papick Garcia Taboada committed 2016-04-12 14:43:47 +02:00
commit 5875db842f
19 files changed
+204 -56

No files matched your search

@@ -637,8 +637,8 @@ public class DummyTrackedRace extends TrackedRaceWithWindEssentials {
}
@Override
public <FixT extends SensorFix, TrackT extends SensorFixTrack<FixT>> TrackT getSensorTrack(Competitor competitor,
String trackName) {
public <FixT extends SensorFix, TrackT extends SensorFixTrack<Competitor, FixT>> TrackT getSensorTrack(
Competitor competitor, String trackName) {
return null;
}
@@ -0,0 +1,46 @@
package com.sap.sailing.server.operationaltransformation;
import com.sap.sailing.domain.base.Competitor;
import com.sap.sailing.domain.common.RegattaAndRaceIdentifier;
import com.sap.sailing.domain.tracking.DynamicSensorFixTrack;
import com.sap.sailing.domain.tracking.DynamicTrackedRace;
import com.sap.sailing.server.RacingEventService;
import com.sap.sailing.server.RacingEventServiceOperation;
public class RecordCompetitorSensorFixTrack extends AbstractRaceOperation<Void> {
private static final long serialVersionUID = -7092704633177037511L;
private DynamicSensorFixTrack<Competitor, ?> track;
public RecordCompetitorSensorFixTrack(RegattaAndRaceIdentifier raceIdentifier, DynamicSensorFixTrack<Competitor, ?> track) {
super(raceIdentifier);
this.track = track;
}
/**
* Operations of this type can be run in parallel to other operations; subsequent operations do not have to wait
* for this operation's completion.
*/
@Override
public boolean requiresSynchronousExecution() {
return false;
}
@Override
public Void internalApplyTo(RacingEventService toState) throws Exception {
DynamicTrackedRace trackedRace = (DynamicTrackedRace) toState.getTrackedRace(getRaceIdentifier());
trackedRace.addSensorTrack(track.getTrackedItem(), track.getTrackName(), track);
return null;
}
@Override
public RacingEventServiceOperation<?> transformClientOp(RacingEventServiceOperation<?> serverOp) {
// TODO Auto-generated method stub
return null;
}
@Override
public RacingEventServiceOperation<?> transformServerOp(RacingEventServiceOperation<?> clientOp) {
// TODO Auto-generated method stub
return null;
}
}