34c60f88594aee8e38a5fb6878ce264e9166e91f
java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/fixtracker/RegattaLogDeviceMappings.java
| ... | ... | @@ -225,7 +225,7 @@ public abstract class RegattaLogDeviceMappings<ItemT extends WithID> { |
| 225 | 225 | |
| 226 | 226 | /** |
| 227 | 227 | * Adjusts the {@link #mappings} map according to the device mappings provided from the {@link #calculateMappings()} |
| 228 | - * method. Afterwards, the start end end of tracking is {@link #updateStartAndEndOfTracking() updated} from the |
|
| 228 | + * method. Afterwards, the start and end of tracking is {@link #updateStartAndEndOfTracking() updated} from the |
|
| 229 | 229 | * mapping intervals. |
| 230 | 230 | * |
| 231 | 231 | * @param loadIfNotCovered |
| ... | ... | @@ -317,12 +317,10 @@ public abstract class RegattaLogDeviceMappings<ItemT extends WithID> { |
| 317 | 317 | Iterable<DeviceMappingWithRegattaLogEvent<ItemT>> oldMappings, |
| 318 | 318 | Iterable<DeviceMappingWithRegattaLogEvent<ItemT>> newMappings, |
| 319 | 319 | GroupedOldAndNewMappingsCallback<ItemT> callback) { |
| 320 | - |
|
| 321 | 320 | final Map<Pair<DeviceIdentifier, Class<?>>, Iterable<DeviceMappingWithRegattaLogEvent<ItemT>>> groupedOldMappings = groupMappingsByDeviceIdAndMappingType( |
| 322 | 321 | oldMappings != null ? oldMappings : Collections.emptySet()); |
| 323 | 322 | final Map<Pair<DeviceIdentifier, Class<?>>, Iterable<DeviceMappingWithRegattaLogEvent<ItemT>>> groupedNewMappings = groupMappingsByDeviceIdAndMappingType( |
| 324 | 323 | newMappings); |
| 325 | - |
|
| 326 | 324 | groupedNewMappings.forEach((key, newMappingsForDeviceIdAndMappingType) -> { |
| 327 | 325 | Iterable<DeviceMappingWithRegattaLogEvent<ItemT>> oldMappingsForDeviceIdAndMappingType = groupedOldMappings |
| 328 | 326 | .get(key); |