Merge branch 'master' into gwt25

Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/CompactWindImpl.java
	java/com.sap.sailing.operationaltransformation/bin/com/sap/sailing/operationaltransformation/package.html
This commit is contained in:
Axel Uhl committed 2013-01-09 17:16:07 +01:00
commit 211d1f9844
218 files changed
+35548 -144

No files matched your search

@@ -1,5 +0,0 @@
package com.sap.sailing.domain.swisstimingreplayadapter.impl;
public class SwissTimingReplayRaceTracker {
}
@@ -134,7 +134,7 @@ public class SwissTimingReplayToDomainAdapter extends SwissTimingReplayAdapter {
* use / creation of a default regatta per race
*/
public SwissTimingReplayToDomainAdapter(Regatta regatta, DomainFactory domainFactory, TrackedRegattaRegistry trackedRegattaRegistry) {
this.regatta = null;
this.regatta = regatta;
this.trackedRegattaRegistry = trackedRegattaRegistry;
racePerRaceID = new HashMap<>();
trackedRacePerRaceID = new HashMap<>();
@@ -156,6 +156,7 @@ public class SwissTimingReplayToDomainAdapter extends SwissTimingReplayAdapter {
private BoatClass getCurrentBoatClass() {
return domainFactory.getOrCreateBoatClassFromRaceID(currentRaceID);
}
@Override
public void referenceTimestamp(long referenceTimestampMillis) {
referenceTimePoint = new MillisecondsTimePoint(referenceTimestampMillis);