From 0e9bd289fc5f2c2d215d81c5388c4920bf6497b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kai=20B=C3=B6rnert?= <kboerner@intern.oio.de>
Date: Wed, 23 Nov 2016 09:31:00 +0100
Subject: [PATCH] refactored duplicate code to superclass

---
 .../shared/charts/AbstractCompetitorRaceChart.java       | 4 +---
 .../gwt/ui/client/shared/charts/AbstractRaceChart.java   | 9 +++++++++
 .../sailing/gwt/ui/client/shared/charts/WindChart.java   | 3 +--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/AbstractCompetitorRaceChart.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/AbstractCompetitorRaceChart.java
index eadb1be8d50..4d0a8a937cd 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/AbstractCompetitorRaceChart.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/AbstractCompetitorRaceChart.java
@@ -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>();
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/AbstractRaceChart.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/AbstractRaceChart.java
index c1c78c87c78..bb27220fc72 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/AbstractRaceChart.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/AbstractRaceChart.java
@@ -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);
+    }
 }
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/WindChart.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/WindChart.java
index 3d9036879a6..f1a84547d57 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/WindChart.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/WindChart.java
@@ -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,