eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-14 22:43:57 +00:00
Code Activity

Merge branch 'bug4242'

Browse Source
This commit is contained in:
Steffen Schaefer committed 2017-07-24 17:05:23 +02:00
2 parents 9f61d9a834 212ca18500
commit 83515b0c16
4 files changed
+6 -6
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/regattaoverview/client/RaceDetailPanel.java
+1 -1
View File
@@ -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);
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/regattaoverview/client/RegattaRaceStatesComponent.java
+3 -3
View File
@@ -890,8 +890,8 @@ 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);
RaceboardContextDefinition raceboardContext = new RaceboardContextDefinition(entryDTO.raceInfo.raceIdentifier.getRegattaName(),
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) {
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
+1 -1
View File
@@ -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;
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RegattaOverviewEntryDTO.java
+1 -1
View File
@@ -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;