eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-30 17:36:40 +00:00
Code Activity

don't implicitly add COMBINED wind track if wind sources are explicitly specified

Browse Source
This commit is contained in:
Axel Uhl committed 2012-03-08 16:49:21 +01:00
1 parent 2150629d7b
commit d9dcba2506
1 file changed
+2 -2
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
+2 -2
View File
@@ -546,12 +546,12 @@ public class SailingServiceImpl extends RemoteServiceServlet implements SailingS
result.windTrackInfoByWindSource = windTrackInfoDTOs; result.windTrackInfoByWindSource = windTrackInfoDTOs;
if (from != null && to != null) { if (from != null && to != null) {
List<WindSource> windSourcesToDeliver = new ArrayList<WindSource>(); List<WindSource> windSourcesToDeliver = new ArrayList<WindSource>();
if (windSources == null) { if (windSources != null) {
windSourcesToDeliver.addAll(Arrays.asList(windSources)); windSourcesToDeliver.addAll(Arrays.asList(windSources));
} else { } else {
Util.addAll(trackedRace.getWindSources(), windSourcesToDeliver); Util.addAll(trackedRace.getWindSources(), windSourcesToDeliver);
windSourcesToDeliver.add(new WindSourceImpl(WindSourceType.COMBINED));
} }
windSourcesToDeliver.add(new WindSourceImpl(WindSourceType.COMBINED));
for (WindSource windSource : windSourcesToDeliver) { for (WindSource windSource : windSourcesToDeliver) {
WindTrackInfoDTO windTrackInfoDTO = new WindTrackInfoDTO(); WindTrackInfoDTO windTrackInfoDTO = new WindTrackInfoDTO();
windTrackInfoDTO.windFixes = new ArrayList<WindDTO>(); windTrackInfoDTO.windFixes = new ArrayList<WindDTO>();