mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-11-14 06:18:12 +00:00
formatting changes only
Change-Id: I84ecc341cb5521858317a47904acce1f0f3e2cd8
This commit is contained in:
1 parent
2222f014fa
commit
5a6d21322c
2 files changed
+5
-11
No files matched your search
+1
-6
@@ -245,13 +245,12 @@ public abstract class AbstractCompetitorRaceChart<SettingsType extends ChartSett
|
||||
}
|
||||
|
||||
private void doLoadDataForCompetitorsAndDataType(final Date from, final Date to, final boolean append,
|
||||
ArrayList<CompetitorDTO> competitorsToLoad, final DetailType selectedDataTypeToRetrieve,final TimingHolder tholder) {
|
||||
ArrayList<CompetitorDTO> competitorsToLoad, final DetailType selectedDataTypeToRetrieve, final TimingHolder tholder) {
|
||||
long stepSize = Math.max(getStepSizeInMillis(),
|
||||
from==null||to==null ? 0 : Math.abs(to.getTime()-from.getTime())/SailingServiceConstants.MAX_NUMBER_OF_FIXES_TO_QUERY);
|
||||
GetCompetitorsRaceDataAction getCompetitorsRaceDataAction = new GetCompetitorsRaceDataAction(sailingService,
|
||||
selectedRaceIdentifier, competitorsToLoad, from, to, stepSize, selectedDataTypeToRetrieve,
|
||||
leaderboardGroupName, leaderboardName);
|
||||
|
||||
AsyncCallback<CompetitorsRaceDataDTO> dataLoadedCallback = new AsyncCallback<CompetitorsRaceDataDTO>() {
|
||||
@Override
|
||||
public void onSuccess(final CompetitorsRaceDataDTO result) {
|
||||
@@ -276,7 +275,6 @@ public abstract class AbstractCompetitorRaceChart<SettingsType extends ChartSett
|
||||
timer.getPlayMode() == PlayModes.Live);
|
||||
}
|
||||
};
|
||||
|
||||
if (append) {
|
||||
// this call is repeated, allow it to be throttled and dropped
|
||||
asyncActionsExecutor.execute(getCompetitorsRaceDataAction, LOAD_COMPETITOR_CHART_DATA_CATEGORY,
|
||||
@@ -286,7 +284,6 @@ public abstract class AbstractCompetitorRaceChart<SettingsType extends ChartSett
|
||||
// asyncActionExecutor
|
||||
getCompetitorsRaceDataAction.execute(dataLoadedCallback);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private boolean chartContainsNoData() {
|
||||
@@ -775,11 +772,9 @@ public abstract class AbstractCompetitorRaceChart<SettingsType extends ChartSett
|
||||
if (!isVisible()) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (allowTimeAdjust) {
|
||||
updateTimePlotLine(newTime);
|
||||
}
|
||||
|
||||
switch (timer.getPlayMode()) {
|
||||
case Live: {
|
||||
// is date before first cache entry or is cache empty?
|
||||
|
||||
+4
-5
@@ -79,16 +79,15 @@ public class MultiCompetitorRaceChart extends AbstractCompetitorRaceChart<MultiC
|
||||
boolean settingsChanged = updateSettingsOnly(newSettings);
|
||||
DetailType firstType = newSettings.getFirstDetailType();
|
||||
DetailType secondType = newSettings.getSecondDetailType();
|
||||
if(!lifecycle.getAllowedDetailTypes().contains(firstType)){
|
||||
//if the first type is not allowed here, choose a different valid value
|
||||
if (!lifecycle.getAllowedDetailTypes().contains(firstType)){
|
||||
// if the first type is not allowed here, choose a different valid value
|
||||
firstType = DetailType.WINDWARD_DISTANCE_TO_COMPETITOR_FARTHEST_AHEAD;
|
||||
}
|
||||
if(!lifecycle.getAllowedDetailTypes().contains(firstType)){
|
||||
if (!lifecycle.getAllowedDetailTypes().contains(firstType)){
|
||||
//if the second type is not allowed here, do not set it.
|
||||
secondType = null;
|
||||
}
|
||||
boolean selectedDetailTypeChanged = setSelectedDetailTypes(firstType,
|
||||
secondType);
|
||||
boolean selectedDetailTypeChanged = setSelectedDetailTypes(firstType, secondType);
|
||||
if (selectedDetailTypeChanged || settingsChanged) {
|
||||
clearChart();
|
||||
timeChanged(timer.getTime(), null);
|
||||
|
||||
Reference in new issue
Block a user