Merge branch 'master' into ubilabs--rcapp--bug-3077

This commit is contained in:
Axel Uhl committed 2016-02-04 23:20:49 +01:00
commit 2548aed407
2 files changed
+4 -4

No files matched your search

@@ -210,7 +210,7 @@ public class RaceTimePanel extends TimePanel<RaceTimePanelSettings> implements R
* was <code>null</code> before, or extended to a later point in time.
*/
private void updateMinMax(RaceTimesInfoDTO newRaceTimesInfo) {
Util.Pair<Date, Date> raceMinMax = RaceTimesCalculationUtil.caluclateRaceMinMax(timer, newRaceTimesInfo);
Util.Pair<Date, Date> raceMinMax = RaceTimesCalculationUtil.calculateRaceMinMax(timer, newRaceTimesInfo);
Date min = raceMinMax.getA();
Date max = raceMinMax.getB();
@@ -7,12 +7,12 @@ import com.sap.sse.common.Util;
import com.sap.sse.gwt.client.player.Timer;
public class RaceTimesCalculationUtil {
public static final long MIN_TIME_BEFORE_RACE_START = 5 * 60 * 1000; // 5 minutes
public static final long MIN_TIME_BEFORE_RACE_START = 3 * 60 * 1000; // 3 minutes
private static final long MIN_TIME_AFTER_RACE_START = 5 * 60 * 1000; // 5 minutes
private static final long TIME_AFTER_LIVE = 5 * 60 * 1000; // 5 minutes
public static final long MAX_TIME_AFTER_RACE_END = 5 * 60 * 1000; // 5 minutes
public static final long MAX_TIME_AFTER_RACE_END = 1 * 60 * 1000; // 1 minutes
public static Util.Pair<Date, Date> caluclateRaceMinMax(Timer timer, RaceTimesInfoDTO raceTimesInfo) {
public static Util.Pair<Date, Date> calculateRaceMinMax(Timer timer, RaceTimesInfoDTO raceTimesInfo) {
Date min = null;
Date max = null;