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

fixed NPEs for editable leaderboard in case a new untracked column is added

Browse Source
This commit is contained in:
Axel Uhl committed 2011-09-14 18:17:37 +02:00
1 parent f5804520df
commit 8a4707ecf0
2 files changed
+19 -14
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/leaderboard/impl/LeaderboardImpl.java
+7 -12
View File
@@ -219,18 +219,13 @@ public class LeaderboardImpl implements Named, Leaderboard {
@Override
public Entry getEntry(Competitor competitor, RaceInLeaderboard race, TimePoint timePoint) throws NoWindException {
Entry result;
if (race.getTrackedRace() != null) {
int trackedPoints = getTrackedPoints(competitor, race, timePoint);
final Result correctedResults = getScoreCorrection().getCorrectedScore(trackedPoints, competitor, race, timePoint);
boolean discarded = isDiscarded(competitor, race, timePoint);
return new EntryImpl(trackedPoints, correctedResults.getCorrectedScore(),
discarded ? 0 : correctedResults.getCorrectedScore() * (race.isMedalRace()?2:1),
correctedResults.getMaxPointsReason(), discarded);
} else {
result = new EntryImpl(/* trackedPoints */ 0, /* net points */ 0, /* total points */ 0, MaxPointsReason.NONE, /* discarded */ false);
}
return result;
int trackedPoints = getTrackedPoints(competitor, race, timePoint);
final Result correctedResults = getScoreCorrection().getCorrectedScore(trackedPoints, competitor, race,
timePoint);
boolean discarded = isDiscarded(competitor, race, timePoint);
return new EntryImpl(trackedPoints, correctedResults.getCorrectedScore(), discarded ? 0
: correctedResults.getCorrectedScore() * (race.isMedalRace() ? 2 : 1),
correctedResults.getMaxPointsReason(), discarded);
}
@Override
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/EditableLeaderboardPanel.java
+12 -2
View File
@@ -14,6 +14,7 @@ import com.google.gwt.cell.client.SelectionCell;
import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.sap.sailing.gwt.ui.shared.LeaderboardDAO;
import com.sap.sailing.gwt.ui.shared.LeaderboardEntryDAO;
import com.sap.sailing.gwt.ui.shared.LeaderboardRowDAO;
import com.sap.sailing.gwt.ui.shared.Pair;
@@ -137,7 +138,11 @@ public class EditableLeaderboardPanel extends LeaderboardPanel {
@Override
public String getValue(LeaderboardRowDAO object) {
String reasonForMaxPoints = object.fieldsByRaceName.get(raceName).reasonForMaxPoints;
LeaderboardEntryDAO leaderboardEntryDAO = object.fieldsByRaceName.get(raceName);
String reasonForMaxPoints = null;
if (leaderboardEntryDAO != null) {
reasonForMaxPoints = leaderboardEntryDAO.reasonForMaxPoints;
}
return reasonForMaxPoints == null ? "" : reasonForMaxPoints;
}
}
@@ -189,7 +194,12 @@ public class EditableLeaderboardPanel extends LeaderboardPanel {
@Override
public String getValue(LeaderboardRowDAO object) {
return ""+object.fieldsByRaceName.get(raceName).netPoints;
LeaderboardEntryDAO leaderboardEntryDAO = object.fieldsByRaceName.get(raceName);
String result = "";
if (leaderboardEntryDAO != null) {
result = result+leaderboardEntryDAO.netPoints;
}
return result;
}
}