From 562fcc835ab2144f05909599dab9a98dfc23127e Mon Sep 17 00:00:00 2001
From: Steffen Schaefer <steffen.schaefer@sap.com>
Date: Mon, 24 Jul 2017 15:00:44 +0200
Subject: [PATCH 1/4] Bug 4242: Fixed link from RegattaOverview to RaceBoard in
 case of a RegattaLeaderboardWithEliminations or FlexibleLeaderboard where
 regattaName!=leaderboardName

---
 .../regattaoverview/client/RegattaRaceStatesComponent.java  | 6 +++---
 .../com/sap/sailing/gwt/ui/server/SailingServiceImpl.java   | 4 +++-
 .../java/com/sap/sailing/gwt/ui/shared/RaceInfoDTO.java     | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/regattaoverview/client/RegattaRaceStatesComponent.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/regattaoverview/client/RegattaRaceStatesComponent.java
index d0a743b4a13..69acfea0608 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/regattaoverview/client/RegattaRaceStatesComponent.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/regattaoverview/client/RegattaRaceStatesComponent.java
@@ -889,9 +889,9 @@ public class RegattaRaceStatesComponent extends AbstractCompositeComponent<Regat
     }
 
     private String createRaceLink(RegattaOverviewEntryDTO entryDTO) {
-        if (entryDTO.raceInfo.raceIdentifier != null && entryDTO.raceInfo.isTracked) {
-            RaceboardContextDefinition raceboardContext = new RaceboardContextDefinition(entryDTO.regattaName,
-                    entryDTO.raceInfo.raceIdentifier.getRaceName(), entryDTO.regattaName, null, null, null);
+        if (entryDTO.raceInfo.regattaAndRaceIdentifier != null && entryDTO.raceInfo.isTracked) {
+            RaceboardContextDefinition raceboardContext = new RaceboardContextDefinition(entryDTO.raceInfo.regattaAndRaceIdentifier.getRegattaName(),
+                    entryDTO.raceInfo.regattaAndRaceIdentifier.getRaceName(), entryDTO.regattaName, null, null, null);
             RaceBoardPerspectiveOwnSettings perspectiveOwnSettings = RaceBoardPerspectiveOwnSettings
                     .createDefaultWithCanReplayDuringLiveRaces(true);
             ;
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
index e61f2ae62ec..a43aa6b7152 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
@@ -1033,7 +1033,9 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S
         raceInfoDTO.raceName = raceColumn.getName();
         raceInfoDTO.fleetName = fleet.getName();
         raceInfoDTO.fleetOrdering = fleet.getOrdering();
-        raceInfoDTO.raceIdentifier = raceColumn.getRaceIdentifier(fleet);
+        if(raceInfoDTO.isTracked) {
+            raceInfoDTO.regattaAndRaceIdentifier = trackedRace.getRaceIdentifier();
+        }
         return raceInfoDTO;
     }
     
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RaceInfoDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RaceInfoDTO.java
index 722ed03a2df..66a6b0ffb77 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RaceInfoDTO.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RaceInfoDTO.java
@@ -37,7 +37,7 @@ public class RaceInfoDTO implements IsSerializable {
         }
     }
     
-    public RaceIdentifier raceIdentifier;
+    public RaceIdentifier regattaAndRaceIdentifier;
     public String raceName;
     public String fleetName;
     public int fleetOrdering;

From f09d99c06992d9123b296bc3bfa51a60f12ab8cf Mon Sep 17 00:00:00 2001
From: Steffen Schaefer <steffen.schaefer@sap.com>
Date: Mon, 24 Jul 2017 15:05:24 +0200
Subject: [PATCH 2/4] Bug 4242: Code format

---
 .../java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
index a43aa6b7152..1163c57c98d 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
@@ -1033,7 +1033,7 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S
         raceInfoDTO.raceName = raceColumn.getName();
         raceInfoDTO.fleetName = fleet.getName();
         raceInfoDTO.fleetOrdering = fleet.getOrdering();
-        if(raceInfoDTO.isTracked) {
+        if (raceInfoDTO.isTracked) {
             raceInfoDTO.regattaAndRaceIdentifier = trackedRace.getRaceIdentifier();
         }
         return raceInfoDTO;

From fb37807a7f7aa737ec346acf4932be933fda1d07 Mon Sep 17 00:00:00 2001
From: Steffen Schaefer <steffen.schaefer@sap.com>
Date: Mon, 24 Jul 2017 16:06:36 +0200
Subject: [PATCH 3/4] Bug 4242: Simplified the fix (some changes weren't
 necessary)

---
 .../regattaoverview/client/RegattaRaceStatesComponent.java  | 6 +++---
 .../com/sap/sailing/gwt/ui/server/SailingServiceImpl.java   | 4 +---
 .../java/com/sap/sailing/gwt/ui/shared/RaceInfoDTO.java     | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/regattaoverview/client/RegattaRaceStatesComponent.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/regattaoverview/client/RegattaRaceStatesComponent.java
index 69acfea0608..a99c0734744 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/regattaoverview/client/RegattaRaceStatesComponent.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/regattaoverview/client/RegattaRaceStatesComponent.java
@@ -889,9 +889,9 @@ public class RegattaRaceStatesComponent extends AbstractCompositeComponent<Regat
     }
 
     private String createRaceLink(RegattaOverviewEntryDTO entryDTO) {
-        if (entryDTO.raceInfo.regattaAndRaceIdentifier != null && entryDTO.raceInfo.isTracked) {
-            RaceboardContextDefinition raceboardContext = new RaceboardContextDefinition(entryDTO.raceInfo.regattaAndRaceIdentifier.getRegattaName(),
-                    entryDTO.raceInfo.regattaAndRaceIdentifier.getRaceName(), entryDTO.regattaName, null, null, null);
+        if (entryDTO.raceInfo.raceIdentifier != null && entryDTO.raceInfo.isTracked) {
+            RaceboardContextDefinition raceboardContext = new RaceboardContextDefinition(entryDTO.raceInfo.raceIdentifier.getRegattaName(),
+                    entryDTO.raceInfo.raceIdentifier.getRaceName(), entryDTO.regattaName, null, null, null);
             RaceBoardPerspectiveOwnSettings perspectiveOwnSettings = RaceBoardPerspectiveOwnSettings
                     .createDefaultWithCanReplayDuringLiveRaces(true);
             ;
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
index 1163c57c98d..e61f2ae62ec 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
@@ -1033,9 +1033,7 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S
         raceInfoDTO.raceName = raceColumn.getName();
         raceInfoDTO.fleetName = fleet.getName();
         raceInfoDTO.fleetOrdering = fleet.getOrdering();
-        if (raceInfoDTO.isTracked) {
-            raceInfoDTO.regattaAndRaceIdentifier = trackedRace.getRaceIdentifier();
-        }
+        raceInfoDTO.raceIdentifier = raceColumn.getRaceIdentifier(fleet);
         return raceInfoDTO;
     }
     
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RaceInfoDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RaceInfoDTO.java
index 66a6b0ffb77..722ed03a2df 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RaceInfoDTO.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RaceInfoDTO.java
@@ -37,7 +37,7 @@ public class RaceInfoDTO implements IsSerializable {
         }
     }
     
-    public RaceIdentifier regattaAndRaceIdentifier;
+    public RaceIdentifier raceIdentifier;
     public String raceName;
     public String fleetName;
     public int fleetOrdering;

From 212ca185003a0d928c3ce1c2a3162e1b3229495f Mon Sep 17 00:00:00 2001
From: Steffen Schaefer <steffen.schaefer@sap.com>
Date: Mon, 24 Jul 2017 16:39:37 +0200
Subject: [PATCH 4/4] Bug 4242: Renamed RegattaOverviewEntryDTO.regattaName to
 leaderboardName because this is what gets assigned to the field

---
 .../sailing/gwt/regattaoverview/client/RaceDetailPanel.java   | 2 +-
 .../regattaoverview/client/RegattaRaceStatesComponent.java    | 4 ++--
 .../com/sap/sailing/gwt/ui/server/SailingServiceImpl.java     | 2 +-
 .../sap/sailing/gwt/ui/shared/RegattaOverviewEntryDTO.java    | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/regattaoverview/client/RaceDetailPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/regattaoverview/client/RaceDetailPanel.java
index b5413c30a37..f63ded2a00e 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/regattaoverview/client/RaceDetailPanel.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/regattaoverview/client/RaceDetailPanel.java
@@ -284,7 +284,7 @@ public class RaceDetailPanel extends SimplePanel {
         }
 
         return bothNullOrEquals(left.courseAreaIdAsString, right.courseAreaIdAsString)
-                && bothNullOrEquals(left.regattaName, right.regattaName)
+                && bothNullOrEquals(left.leaderboardName, right.leaderboardName)
                 && bothNullOrEquals(left.raceInfo.seriesName, right.raceInfo.seriesName)
                 && bothNullOrEquals(left.raceInfo.fleetName, right.raceInfo.fleetName)
                 && bothNullOrEquals(left.raceInfo.raceName, right.raceInfo.raceName);
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/regattaoverview/client/RegattaRaceStatesComponent.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/regattaoverview/client/RegattaRaceStatesComponent.java
index a99c0734744..b21951c7bca 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/regattaoverview/client/RegattaRaceStatesComponent.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/regattaoverview/client/RegattaRaceStatesComponent.java
@@ -891,7 +891,7 @@ public class RegattaRaceStatesComponent extends AbstractCompositeComponent<Regat
     private String createRaceLink(RegattaOverviewEntryDTO entryDTO) {
         if (entryDTO.raceInfo.raceIdentifier != null && entryDTO.raceInfo.isTracked) {
             RaceboardContextDefinition raceboardContext = new RaceboardContextDefinition(entryDTO.raceInfo.raceIdentifier.getRegattaName(),
-                    entryDTO.raceInfo.raceIdentifier.getRaceName(), entryDTO.regattaName, null, null, null);
+                    entryDTO.raceInfo.raceIdentifier.getRaceName(), entryDTO.leaderboardName, null, null, null);
             RaceBoardPerspectiveOwnSettings perspectiveOwnSettings = RaceBoardPerspectiveOwnSettings
                     .createDefaultWithCanReplayDuringLiveRaces(true);
             ;
@@ -904,7 +904,7 @@ public class RegattaRaceStatesComponent extends AbstractCompositeComponent<Regat
     }
 
     private String createRegattaLink(RegattaOverviewEntryDTO entryDTO) {
-        String leaderboardLink = EntryPointLinkFactory.createLeaderboardTabLink(eventId.toString(), entryDTO.regattaName);
+        String leaderboardLink = EntryPointLinkFactory.createLeaderboardTabLink(eventId.toString(), entryDTO.leaderboardName);
         return leaderboardLink;
     }
     public void setRepeatedInfoLabel(FlowPanel repeatedInfoLabel) {
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
index e61f2ae62ec..48540151951 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
@@ -4531,7 +4531,7 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S
         }
         entry.boatClassName = boatClassName;
         entry.regattaDisplayName = regattaName;
-        entry.regattaName = leaderboard.getName();
+        entry.leaderboardName = leaderboard.getName();
         entry.raceInfo = createRaceInfoDTO(seriesName, raceColumn, fleet);
         entry.currentServerTime = new Date();
         entry.buyZoneRadius = buyZoneRadius;
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RegattaOverviewEntryDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RegattaOverviewEntryDTO.java
index 4fdefad43fe..c3c9272bb79 100644
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RegattaOverviewEntryDTO.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RegattaOverviewEntryDTO.java
@@ -10,7 +10,7 @@ public class RegattaOverviewEntryDTO implements IsSerializable {
     public String courseAreaName;
     public String regattaDisplayName;
     public RaceInfoDTO raceInfo;
-    public String regattaName;
+    public String leaderboardName;
     public String boatClassName;
     public Date currentServerTime;
     public Distance buyZoneRadius;