eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-21 05:05:31 +00:00
Code Activity

Merge branch 'master' of /home/trac/git

Browse Source
This commit is contained in:
Generic Wiki User
2018-03-09 17:40:02 +00:00
parent 8bdcd13578 e25770f316
commit 5c02ba4767
3 changed files with 12 additions and 15 deletions
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/client/RaceTimePanel.java
+2 -1
View File
@@ -334,7 +334,8 @@ public class RaceTimePanel extends TimePanel<RaceTimePanelSettings> implements R
timer.setTime(newRaceTimesInfo.startOfRace.getTime() +
(initialTimeAfterRaceStartInReplayMode == null ? 0l : initialTimeAfterRaceStartInReplayMode.asMillis()));
} else if (newRaceTimesInfo.startOfTracking != null) {
timer.setTime(newRaceTimesInfo.startOfTracking.getTime());
timer.setTime(newRaceTimesInfo.startOfTracking.getTime() +
(initialTimeAfterRaceStartInReplayMode == null ? 0l : initialTimeAfterRaceStartInReplayMode.asMillis()));
}
break;
}
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/AbstractRaceBoardMode.java
+10 -8
View File
@@ -200,17 +200,19 @@ public abstract class AbstractRaceBoardMode implements RaceBoardMode, RaceTimesI
protected void setTimerOrUseCustomStart(final TimePoint startPlayingAt) {
final PlayModes playMode = getTimer().getPlayMode();
TimePoint startPlayingAtOverride = null;
if (playMode != PlayModes.Live && getRaceTimesInfoForRace() != null
&& getRaceTimesInfoForRace().getStartOfRace() != null) {
final Date startOfRace = getRaceTimesInfoForRace().getStartOfRace();
final RaceBoardPerspectiveOwnSettings perspectiveOwnSettings = raceBoardPanel.getSettings()
.getPerspectiveOwnSettings();
if (playMode != PlayModes.Live && getRaceTimesInfoForRace() != null) {
final RaceBoardPerspectiveOwnSettings perspectiveOwnSettings = raceBoardPanel.getSettings().getPerspectiveOwnSettings();
if (perspectiveOwnSettings != null) {
final Duration initialDurationAfterRaceStartInReplay = perspectiveOwnSettings
.getInitialDurationAfterRaceStartInReplay();
final Duration initialDurationAfterRaceStartInReplay = perspectiveOwnSettings.getInitialDurationAfterRaceStartInReplay();
if (initialDurationAfterRaceStartInReplay != null) {
final Date relativeTo;
if (getRaceTimesInfoForRace().getStartOfRace() != null) {
relativeTo = getRaceTimesInfoForRace().getStartOfRace();
} else {
relativeTo = getRaceTimesInfoForRace().getStartOfTracking();
}
startPlayingAtOverride = new MillisecondsTimePoint(
startOfRace.getTime() + initialDurationAfterRaceStartInReplay.asMillis());
relativeTo.getTime() + initialDurationAfterRaceStartInReplay.asMillis());
}
}
}
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardEntryPoint.java
-6
View File
@@ -53,17 +53,14 @@ public class RaceBoardEntryPoint extends AbstractSailingEntryPoint {
protected void doOnModuleLoad() {
super.doOnModuleLoad();
EntryPointHelper.registerASyncService((ServiceDefTarget) mediaService, RemoteServiceMappingConstants.mediaServiceRemotePath);
raceboardContextDefinition = new SettingsToUrlSerializer()
.deserializeFromCurrentLocation(new RaceboardContextDefinition());
final RaceBoardModes finalMode;
if (raceboardContextDefinition.getMode() != null) {
finalMode = RaceBoardModes.valueOf(raceboardContextDefinition.getMode());
} else {
finalMode = null;
}
if (raceboardContextDefinition.getRegattaName() == null || raceboardContextDefinition.getRegattaName().isEmpty()
|| raceboardContextDefinition.getRaceName() == null || raceboardContextDefinition.getRaceName().isEmpty()
|| raceboardContextDefinition.getLeaderboardName() == null
@@ -71,7 +68,6 @@ public class RaceBoardEntryPoint extends AbstractSailingEntryPoint {
createErrorPage(getStringMessages().requiresRegattaRaceAndLeaderboard());
return;
}
AsyncCallback<RaceboardDataDTO> asyncCallback = new AsyncCallback<RaceboardDataDTO>() {
@Override
public void onSuccess(RaceboardDataDTO raceboardData) {
@@ -137,7 +133,6 @@ public class RaceBoardEntryPoint extends AbstractSailingEntryPoint {
});
}
});
}
@Override
@@ -145,7 +140,6 @@ public class RaceBoardEntryPoint extends AbstractSailingEntryPoint {
reportError("Error trying to create the raceboard: " + caught.getMessage());
}
};
sailingService.getRaceboardData(raceboardContextDefinition.getRegattaName(),
raceboardContextDefinition.getRaceName(), raceboardContextDefinition.getLeaderboardName(),
raceboardContextDefinition.getLeaderboardGroupName(), raceboardContextDefinition.getEventId(),