eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-08 21:30:57 +00:00
Code Activity

fixed another NPE with race status transmission into RaceDTO

Browse Source
This commit is contained in:
Axel Uhl committed 2013-06-21 17:29:02 +02:00
1 parent 2d9795ab51
commit 71edc76a73
2 files changed
+10 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/DomainFactory.java
+6
View File
@@ -96,6 +96,9 @@ public interface DomainFactory extends SharedDomainFactory {
FleetDTO convertToFleetDTO(Fleet fleet);
/**
* @param trackedRace must not be <code>null</code>
*/
RaceDTO createRaceDTO(TrackedRegattaRegistry trackedRegattaRegistry, boolean withGeoLocationData, RegattaAndRaceIdentifier raceIdentifier, TrackedRace trackedRace);
PlacemarkDTO convertToPlacemarkDTO(Placemark placemark);
@@ -104,6 +107,9 @@ public interface DomainFactory extends SharedDomainFactory {
TrackedRaceDTO createTrackedRaceDTO(TrackedRace trackedRace);
/**
* @param trackedRace must not be <code>null</code>
*/
void updateRaceDTOWithTrackedRaceData(TrackedRace trackedRace, RaceDTO raceDTO);
}
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/DomainFactoryImpl.java
+4 -2
View File
@@ -358,6 +358,7 @@ public class DomainFactoryImpl implements DomainFactory {
@Override
public RaceDTO createRaceDTO(TrackedRegattaRegistry trackedRegattaRegistry, boolean withGeoLocationData, RegattaAndRaceIdentifier raceIdentifier, TrackedRace trackedRace) {
assert trackedRace != null;
// Optional: Getting the places of the race
PlacemarkOrderDTO racePlaces = withGeoLocationData ? getRacePlaces(trackedRace) : null;
TrackedRaceDTO trackedRaceDTO = createTrackedRaceDTO(trackedRace);
@@ -369,11 +370,12 @@ public class DomainFactoryImpl implements DomainFactory {
@Override
public void updateRaceDTOWithTrackedRaceData(TrackedRace trackedRace, RaceDTO raceDTO) {
assert trackedRace != null;
raceDTO.startOfRace = trackedRace.getStartOfRace() == null ? null : trackedRace.getStartOfRace().asDate();
raceDTO.endOfRace = trackedRace.getEndOfRace() == null ? null : trackedRace.getEndOfRace().asDate();
raceDTO.status = new RaceStatusDTO();
raceDTO.status.status = trackedRace.getStatus().getStatus();
raceDTO.status.loadingProgress = trackedRace.getStatus().getLoadingProgress();
raceDTO.status.status = trackedRace.getStatus() == null ? null : trackedRace.getStatus().getStatus();
raceDTO.status.loadingProgress = trackedRace.getStatus() == null ? 0.0 : trackedRace.getStatus().getLoadingProgress();
}
@Override