eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-30 17:36:40 +00:00
Code Activity

If the to-Date is null or now-delay depends on the play mode of the timer

Browse Source
This commit is contained in:
Lennart Hensler committed 2012-03-02 11:12:40 +01:00
1 parent 2ca7e24064
commit a50c80457c
4 files changed
+27 -19
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/WindChart.java
+5 -8
View File
@@ -260,9 +260,8 @@ public class WindChart implements Component<WindChartSettings>, RaceSelectionCha
selectedRaceIdentifier = selectedRaces.iterator().next();
timeOfEarliestRequestInMillis = null;
timeOfLatestRequestInMillis = null;
// TODO bug #363: if race is not in replay mode, fetch only up to now-delay
loadData(selectedRaceIdentifier, /* from */null, /* to */
new Date(System.currentTimeMillis() - timer.getLivePlayDelayInMillis()), /* append */false);
Date to = timer.getPlayMode() == PlayModes.Live ? new Date(System.currentTimeMillis() - timer.getLivePlayDelayInMillis()) : null;
loadData(selectedRaceIdentifier, /* from */null, to, /* append */false);
} else {
clearChart();
}
@@ -280,16 +279,14 @@ public class WindChart implements Component<WindChartSettings>, RaceSelectionCha
if (timeOfEarliestRequestInMillis == null || timeOfEarliestRequestInMillis > date.getTime()) {
loadData(selectedRaceIdentifier, null, date, /* append */ true);
} else if (timeOfLatestRequestInMillis < date.getTime()) {
// TODO bug #363: if race is not in replay mode, fetch only up to now-delay
loadData(selectedRaceIdentifier, new Date(timeOfLatestRequestInMillis), /* to */
new Date(System.currentTimeMillis() - timer.getLivePlayDelayInMillis()), /* append */true);
Date to = timer.getPlayMode() == PlayModes.Live ? new Date(System.currentTimeMillis() - timer.getLivePlayDelayInMillis()) : null;
loadData(selectedRaceIdentifier, new Date(timeOfLatestRequestInMillis), to, /* append */true);
}
// otherwise the cache spans across date and so we don't need to load anything
} else {
// assuming play mode is replay / non-live
if (timeOfLatestRequestInMillis == null) {
loadData(selectedRaceIdentifier, /* from */null, /* to */
new Date(System.currentTimeMillis() - timer.getLivePlayDelayInMillis()), /* append */false); // replace old series
loadData(selectedRaceIdentifier, /* from */null, /* to */ null, /* append */false); // replace old series
}
}
}
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/AbstractChartPanel.java
+12 -9
View File
@@ -44,6 +44,7 @@ import com.sap.sailing.gwt.ui.client.SailingServiceAsync;
import com.sap.sailing.gwt.ui.client.StringMessages;
import com.sap.sailing.gwt.ui.client.TimeListener;
import com.sap.sailing.gwt.ui.client.Timer;
import com.sap.sailing.gwt.ui.client.Timer.PlayModes;
import com.sap.sailing.gwt.ui.shared.CompetitorDTO;
import com.sap.sailing.gwt.ui.shared.CompetitorRaceDataDTO;
import com.sap.sailing.gwt.ui.shared.MultiCompetitorRaceDataDTO;
@@ -117,7 +118,8 @@ implements CompetitorSelectionChangeListener, RaceSelectionChangeListener, TimeL
List<RaceIdentifier> selectedRaces = raceSelectionProvider.getSelectedRaces();
if(!selectedRaces.isEmpty()) {
loadData(true);
Date to = timer.getPlayMode() == PlayModes.Live ? new Date(System.currentTimeMillis() - timer.getLivePlayDelayInMillis()) : null;
loadData(true, to);
}
timer.addTimeListener(this);
}
@@ -182,8 +184,9 @@ implements CompetitorSelectionChangeListener, RaceSelectionChangeListener, TimeL
* If no competitor is visible, is the {@link #noCompetitorsSelectedLabel} displayed.
*
* @param showBusyIndicator If <code>true</code> is the busy indicator shown while loading the data from the server.
* @param to The date until the data should be loaded
*/
protected void loadData(boolean showBusyIndicator) {
protected void loadData(boolean showBusyIndicator, Date to) {
if (hasVisibleCompetitors()) {
if (showBusyIndicator) {
setWidget(busyIndicatorPanel);
@@ -203,8 +206,7 @@ implements CompetitorSelectionChangeListener, RaceSelectionChangeListener, TimeL
}
}
sailingService.getCompetitorsRaceData(getSelectedRace(), dataQuery, new Date(System.currentTimeMillis()
- timer.getLivePlayDelayInMillis()), getStepSize(), getDataToShow(),
sailingService.getCompetitorsRaceData(getSelectedRace(), dataQuery, to, getStepSize(), getDataToShow(),
new AsyncCallback<MultiCompetitorRaceDataDTO>() {
@Override
@@ -245,7 +247,8 @@ implements CompetitorSelectionChangeListener, RaceSelectionChangeListener, TimeL
@Override
public void addedToSelection(CompetitorDTO competitor) {
loadData(true);
Date to = timer.getPlayMode() == PlayModes.Live ? new Date(System.currentTimeMillis() - timer.getLivePlayDelayInMillis()) : null;
loadData(true, to);
}
@Override
@@ -416,7 +419,7 @@ implements CompetitorSelectionChangeListener, RaceSelectionChangeListener, TimeL
/**
* Updates the settings known to be contained in {@link ChartSettings}. Subclasses have to update settings provided
* by subclasses thereof. Subclasses also need to call {@link #clearChart()} and {@link #loadData(boolean)}, if this method returns <code>true</code>;
* by subclasses thereof. Subclasses also need to call {@link #clearChart()} and {@link #loadData(boolean, Date)}, if this method returns <code>true</code>;
*
* @return <code>true</code> if the settings had been changed and a clearing and loading is needed.
*/
@@ -447,7 +450,7 @@ implements CompetitorSelectionChangeListener, RaceSelectionChangeListener, TimeL
/**
* Updates the {@link #dataToShow} field, creates a new chart for the new <code>dataToShow</code> and clears the {@link #chartData}.<br />
* Doesn't {@link #loadData(boolean) load the data}.
* Doesn't {@link #loadData(boolean, Date) load the data}.
*
* @return <code>true</code> if the data to show changed
*/
@@ -476,7 +479,7 @@ implements CompetitorSelectionChangeListener, RaceSelectionChangeListener, TimeL
public void onRaceSelectionChange(List<RaceIdentifier> selectedRaces) {
setChartData(null);
clearChart();
loadData(true);
loadData(true, null);
}
/**
@@ -525,7 +528,7 @@ implements CompetitorSelectionChangeListener, RaceSelectionChangeListener, TimeL
Date newestEvent = getChartData().getOldestDateOfNewestData();
if (hasVisibleCompetitors()
&& (newestEvent == null || (newestEvent.before(date) && (date.getTime() - newestEvent.getTime()) >= getStepSize()))) {
loadData(false);
loadData(false, new Date(System.currentTimeMillis() - timer.getLivePlayDelayInMillis()));
}
}
}
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/ChartPanel.java
+5 -1
View File
@@ -1,5 +1,7 @@
package com.sap.sailing.gwt.ui.leaderboard;
import java.util.Date;
import com.sap.sailing.domain.common.DetailType;
import com.sap.sailing.gwt.ui.client.CompetitorSelectionProvider;
import com.sap.sailing.gwt.ui.client.ErrorReporter;
@@ -7,6 +9,7 @@ import com.sap.sailing.gwt.ui.client.RaceSelectionProvider;
import com.sap.sailing.gwt.ui.client.SailingServiceAsync;
import com.sap.sailing.gwt.ui.client.StringMessages;
import com.sap.sailing.gwt.ui.client.Timer;
import com.sap.sailing.gwt.ui.client.Timer.PlayModes;
import com.sap.sailing.gwt.ui.shared.components.Component;
import com.sap.sailing.gwt.ui.shared.components.SettingsDialogComponent;
@@ -44,7 +47,8 @@ public class ChartPanel extends AbstractChartPanel<ChartSettings> implements Com
public void updateSettings(ChartSettings newSettings) {
updateSettingsOnly(newSettings);
clearChart();
loadData(true);
Date to = timer.getPlayMode() == PlayModes.Live ? new Date(System.currentTimeMillis() - timer.getLivePlayDelayInMillis()) : null;
loadData(true, to);
}
@Override
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/MultiChartPanel.java
+5 -1
View File
@@ -1,5 +1,7 @@
package com.sap.sailing.gwt.ui.leaderboard;
import java.util.Date;
import com.sap.sailing.domain.common.DetailType;
import com.sap.sailing.gwt.ui.client.CompetitorSelectionProvider;
import com.sap.sailing.gwt.ui.client.ErrorReporter;
@@ -7,6 +9,7 @@ import com.sap.sailing.gwt.ui.client.RaceSelectionProvider;
import com.sap.sailing.gwt.ui.client.SailingServiceAsync;
import com.sap.sailing.gwt.ui.client.StringMessages;
import com.sap.sailing.gwt.ui.client.Timer;
import com.sap.sailing.gwt.ui.client.Timer.PlayModes;
import com.sap.sailing.gwt.ui.shared.components.Component;
import com.sap.sailing.gwt.ui.shared.components.SettingsDialogComponent;
@@ -40,7 +43,8 @@ public class MultiChartPanel extends AbstractChartPanel<MultiChartSettings> impl
boolean dataToShowChanged = setDataToShow(newSettings.getDataToShow());
if (dataToShowChanged || settingsChanged) {
clearChart();
loadData(true);
Date to = timer.getPlayMode() == PlayModes.Live ? new Date(System.currentTimeMillis() - timer.getLivePlayDelayInMillis()) : null;
loadData(true, to);
}
}