eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-10 04:51:07 +00:00
Code Activity

Merge branch 'bug5085' into bug5165

Browse Source
This commit is contained in:
Axel Uhl committed 2019-12-20 14:20:31 +01:00
2 parents 3ea8448099 a25479be51
commit e62848ad53
2 files changed
+10 -6
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/CourseAndMarkConfigurationFactoryImpl.java
+9 -5
View File
@@ -32,6 +32,7 @@ import com.sap.sailing.domain.abstractlog.regatta.events.impl.RegattaLogDeviceMa
import com.sap.sailing.domain.base.ControlPoint;
import com.sap.sailing.domain.base.ControlPointWithTwoMarks;
import com.sap.sailing.domain.base.CourseBase;
import com.sap.sailing.domain.base.DomainFactory;
import com.sap.sailing.domain.base.Fleet;
import com.sap.sailing.domain.base.Mark;
import com.sap.sailing.domain.base.RaceColumn;
@@ -40,7 +41,6 @@ import com.sap.sailing.domain.base.Regatta;
import com.sap.sailing.domain.base.Waypoint;
import com.sap.sailing.domain.base.impl.ControlPointWithTwoMarksImpl;
import com.sap.sailing.domain.base.impl.CourseDataImpl;
import com.sap.sailing.domain.base.impl.MarkImpl;
import com.sap.sailing.domain.base.impl.WaypointImpl;
import com.sap.sailing.domain.common.DeviceIdentifier;
import com.sap.sailing.domain.common.PassingInstruction;
@@ -105,9 +105,13 @@ public class CourseAndMarkConfigurationFactoryImpl implements CourseAndMarkConfi
private final SensorFixStore sensorFixStore;
private final Function<DeviceIdentifier, Position> positionResolver;
private final RaceLogResolver raceLogResolver;
private final DomainFactory domainFactory;
public CourseAndMarkConfigurationFactoryImpl(ServiceTracker<SharedSailingData, SharedSailingData> sharedSailingDataTracker, SensorFixStore sensorFixStore, RaceLogResolver raceLogResolver) {
public CourseAndMarkConfigurationFactoryImpl(
ServiceTracker<SharedSailingData, SharedSailingData> sharedSailingDataTracker,
SensorFixStore sensorFixStore, RaceLogResolver raceLogResolver, DomainFactory domainFactory) {
this.sharedSailingDataTracker = sharedSailingDataTracker;
this.domainFactory = domainFactory;
this.sensorFixStore = sensorFixStore;
this.raceLogResolver = raceLogResolver;
positionResolver = identifier -> {
@@ -479,9 +483,9 @@ public class CourseAndMarkConfigurationFactoryImpl implements CourseAndMarkConfi
optionalMarkProperties = null;
}
final CommonMarkProperties effectiveProperties = markConfiguration.getEffectiveProperties();
final Mark markToCreate = new MarkImpl(UUID.randomUUID(), effectiveProperties.getName(),
effectiveProperties.getShortName(), effectiveProperties.getType(),
effectiveProperties.getColor(), effectiveProperties.getShape(),
final Mark markToCreate = domainFactory.getOrCreateMark(UUID.randomUUID(),
effectiveProperties.getName(), effectiveProperties.getShortName(),
effectiveProperties.getType(), effectiveProperties.getColor(), effectiveProperties.getShape(),
effectiveProperties.getPattern(),
optionalMarkTemplate == null ? null : optionalMarkTemplate.getId(),
optionalMarkProperties == null ? null : optionalMarkProperties.getId());
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
+1 -1
View File
@@ -843,7 +843,7 @@ public class RacingEventServiceImpl implements RacingEventService, ClearStateTes
throw new RuntimeException(e);
}
this.courseAndMarkConfigurationFactory = new CourseAndMarkConfigurationFactoryImpl(sharedSailingDataTracker,
this.sensorFixStore, this);
this.sensorFixStore, this, getBaseDomainFactory());
this.raceManagerDeviceConfigurationsById = new HashMap<>();
this.raceManagerDeviceConfigurationsByName = new HashMap<>();
this.serviceFinderFactory = serviceFinderFactory;