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

added null check for tracked race in updateCourseFromRaceLogs

Browse Source 
Change-Id: Ie2c4ecf25beb2c93b8b572dabd4034f125fd5dd0
This commit is contained in:
Axel Uhl committed 2019-09-13 18:33:44 +02:00
1 parent c94c1b69ad
commit d1a9bf3ad4
2 files changed
+15 -13
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/orc/impl/ORCPerformanceCurveRankingMetric.java
+14 -12
View File
@@ -69,7 +69,7 @@ public class ORCPerformanceCurveRankingMetric extends AbstractRankingMetric {
boatsById = initBoatsById();
updateCertificatesFromLogs();
updateCourseFromRaceLogs();
certificatesFromRaceLogUpdater = createCertificatesFromRaceLogUpdater();
certificatesFromRaceLogUpdater = createCertificatesFromRaceLogAndCourseUpdater();
certificatesFromRegattaLogUpdater = createCertificatesFromRegattaLogUpdater();
if (trackedRace != null) {
trackedRace.addListener(new AbstractRaceChangeListener() {
@@ -104,7 +104,7 @@ public class ORCPerformanceCurveRankingMetric extends AbstractRankingMetric {
return result;
}
private RaceLogEventVisitor createCertificatesFromRaceLogUpdater() {
private RaceLogEventVisitor createCertificatesFromRaceLogAndCourseUpdater() {
return new BaseRaceLogEventVisitor() {
@Override
public void visit(RaceLogORCLegDataEvent orcLegDataEventImpl) {
@@ -154,17 +154,19 @@ public class ORCPerformanceCurveRankingMetric extends AbstractRankingMetric {
private void updateCourseFromRaceLogs() {
final Map<Integer, ORCPerformanceCurveLeg> legsWithDefinitions = new HashMap<>();
for (final RaceLog raceLog : getTrackedRace().getAttachedRaceLogs()) {
legsWithDefinitions.putAll(new RaceLogORCLegDataAnalyzer(raceLog).analyze());
if (getTrackedRace() != null) {
for (final RaceLog raceLog : getTrackedRace().getAttachedRaceLogs()) {
legsWithDefinitions.putAll(new RaceLogORCLegDataAnalyzer(raceLog).analyze());
}
final Iterable<Leg> legs = getTrackedRace().getRace().getCourse().getLegs();
int oneBasedLegNumber = 1;
final List<ORCPerformanceCurveLeg> performanceCurveLegs = new ArrayList<>(Util.size(legs));
for (final Leg leg : legs) {
performanceCurveLegs.add(legsWithDefinitions.computeIfAbsent(oneBasedLegNumber, i->new ORCPerformanceCurveLegAdapter(getTrackedRace().getTrackedLeg(leg))));
oneBasedLegNumber++;
}
totalCourse = new ORCPerformanceCurveCourseImpl(performanceCurveLegs);
}
final Iterable<Leg> legs = getTrackedRace().getRace().getCourse().getLegs();
int oneBasedLegNumber = 1;
final List<ORCPerformanceCurveLeg> performanceCurveLegs = new ArrayList<>(Util.size(legs));
for (final Leg leg : legs) {
performanceCurveLegs.add(legsWithDefinitions.computeIfAbsent(oneBasedLegNumber, i->new ORCPerformanceCurveLegAdapter(getTrackedRace().getTrackedLeg(leg))));
oneBasedLegNumber++;
}
totalCourse = new ORCPerformanceCurveCourseImpl(performanceCurveLegs);
}
public ORCPerformanceCurveCourse getTotalCourse() {
java/com.sap.sse.gwt.adminconsole/src/com/sap/sse/gwt/adminconsole/URLFieldWithFileUpload.java
+1 -1
View File
@@ -114,7 +114,7 @@ public class URLFieldWithFileUpload extends Composite implements HasValue<String
fileUploadField.addChangeHandler(new ChangeHandler() {
@Override
public void onChange(ChangeEvent event) {
if(fileUploadField.getFilename() != null && !fileUploadField.getFilename().isEmpty()) {
if (fileUploadField.getFilename() != null && !fileUploadField.getFilename().isEmpty()) {
submitButton.setEnabled(true);
}
}