eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-23 12:33:53 +00:00
Code Activity

refactored duplicate code to superclass

Browse Source
This commit is contained in:
Kai Börnert committed 2016-11-23 09:31:00 +01:00
1 parent 36a93b7c26
commit 0e9bd289fc
3 files changed
+11 -5
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/client/shared/charts/AbstractCompetitorRaceChart.java
+1 -3
View File
@@ -62,7 +62,6 @@ import com.sap.sse.gwt.client.async.AsyncActionsExecutor;
import com.sap.sse.gwt.client.player.TimeRangeWithZoomProvider;
import com.sap.sse.gwt.client.player.Timer;
import com.sap.sse.gwt.client.player.Timer.PlayModes;
import com.sap.sse.gwt.client.player.Timer.PlayStates;
import com.sap.sse.gwt.client.shared.components.Component;
/**
@@ -224,8 +223,7 @@ public abstract class AbstractCompetitorRaceChart<SettingsType extends ChartSett
if (isVisible()) {
// if no data is loaded yet, or if it is not playing and not live (append loading every second) show loading
// indicator
if (primary.timeOfLatestRequestInMillis == null
|| (timer.getPlayState() != PlayStates.Playing && timer.getPlayMode() != PlayModes.Live)) {
if (shouldShowLoading(primary.timeOfLatestRequestInMillis)) {
showLoading(stringMessages.loadingCompetitorData());
}
ArrayList<CompetitorDTO> competitorsToLoad = new ArrayList<CompetitorDTO>();
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/AbstractRaceChart.java
+9
View File
@@ -35,6 +35,7 @@ import com.sap.sse.gwt.client.player.TimeRangeWithZoomProvider;
import com.sap.sse.gwt.client.player.TimeZoomChangeListener;
import com.sap.sse.gwt.client.player.Timer;
import com.sap.sse.gwt.client.player.Timer.PlayModes;
import com.sap.sse.gwt.client.player.Timer.PlayStates;
import com.sap.sse.gwt.client.shared.components.Component;
import com.sap.sse.gwt.client.shared.components.SettingsDialog;
@@ -257,4 +258,12 @@ public abstract class AbstractRaceChart<SettingsType extends Settings> extends A
public String getId() {
return getLocalizedShortName();
}
/**
* Returns true if a normal loading message is allowed to appear over the
*/
public boolean shouldShowLoading(Long timestamp) {
return timestamp == null
|| (timer.getPlayState() != PlayStates.Playing && timer.getPlayMode() != PlayModes.Live);
}
}
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/WindChart.java
+1 -2
View File
@@ -56,7 +56,6 @@ import com.sap.sse.gwt.client.async.AsyncActionsExecutor;
import com.sap.sse.gwt.client.player.TimeRangeWithZoomProvider;
import com.sap.sse.gwt.client.player.Timer;
import com.sap.sse.gwt.client.player.Timer.PlayModes;
import com.sap.sse.gwt.client.player.Timer.PlayStates;
import com.sap.sse.gwt.client.shared.components.SettingsDialog;
import com.sap.sse.gwt.client.shared.components.SettingsDialogComponent;
@@ -470,7 +469,7 @@ public class WindChart extends AbstractRaceChart<WindChartSettings> implements R
} else if (needsDataLoading() && from != null && to != null) {
setWidget(chart);
// if not playing or empty show loading message
if (timer.getPlayState() != PlayStates.Playing || timeOfLatestRequestInMillis == null) {
if (shouldShowLoading(timeOfLatestRequestInMillis)) {
showLoading(stringMessages.windChartLoading());
}
GetWindInfoAction getWindInfoAction = new GetWindInfoAction(sailingService, selectedRaceIdentifier,