Merge remote-tracking branch 'origin/raceboardmodes' into predefined-analysis

This commit is contained in:
Benjamin Barth committed 2016-07-15 17:05:05 +02:00
commit bfec534837
3 files changed
+8 -3

No files matched your search

@@ -2357,7 +2357,7 @@ public class LeaderboardPanel extends SimplePanel implements Component<Leaderboa
* Assigns <code>leaderboard</code> to {@link #leaderboard} and updates the UI accordingly. Also updates the min/max
* values on the columns.
*/
protected void updateLeaderboard(LeaderboardDTO leaderboard) {
public void updateLeaderboard(LeaderboardDTO leaderboard) {
if (leaderboard != null) {
Collection<RaceColumn<?>> columnsToCollapseAndExpandAgain = getExpandedRaceColumnsWhoseDisplayedLegCountChanged(leaderboard);
for (RaceColumn<?> columnToCollapseAndExpandAgain : columnsToCollapseAndExpandAgain) {
@@ -1012,7 +1012,7 @@ public class EditableLeaderboardPanel extends LeaderboardPanel {
}
@Override
protected void updateLeaderboard(LeaderboardDTO leaderboard) {
public void updateLeaderboard(LeaderboardDTO leaderboard) {
super.updateLeaderboard(leaderboard);
if (leaderboard != null) {
String lastScoreCorrectionComment = leaderboard.getComment();
@@ -66,9 +66,13 @@ public class StartAnalysisMode extends RaceBoardModeWithPerRaceCompetitors {
@Override
public void raceTimesInfosReceived(Map<RegattaAndRaceIdentifier, RaceTimesInfoDTO> raceTimesInfo,
long clientTimeWhenRequestWasSent, Date serverTimeDuringRequest, long clientTimeWhenResponseWasReceived) {
if (getTimer().getPlayMode() != PlayModes.Live && !raceTimesInfo.isEmpty() && raceTimesInfo.containsKey(getRaceIdentifier())) {
if (!raceTimesInfo.isEmpty() && raceTimesInfo.containsKey(getRaceIdentifier())) {
final RaceTimesInfoDTO times = raceTimesInfo.get(getRaceIdentifier());
if (times.startOfRace != null) {
// make sure we're no longer in live/playing mode/state; the start analysis is supposed to be a "frozen" display at first
if (getTimer().getPlayMode() == PlayModes.Live) {
getTimer().setPlayMode(PlayModes.Replay);
}
// the following call will always trigger a leaderboard load and therefore a callback
// to updatedLeaderboard; therefore, updatedLeaderboard can decide when it's time to
// trigger the chart display and the map settings application
@@ -110,6 +114,7 @@ public class StartAnalysisMode extends RaceBoardModeWithPerRaceCompetitors {
@Override
public void onSuccess(LeaderboardDTO result) {
setLeaderboard(result);
getLeaderboardPanel().updateLeaderboard(result);
updateCompetitorSelection();
getRaceBoardPanel().setCompetitorChartVisible(true);
}