Bug 4242: Simplified the fix (some changes weren't necessary)

This commit is contained in:
Steffen Schaefer committed 2017-07-24 16:06:36 +02:00
1 parent f09d99c069
commit fb37807a7f
3 files changed
+5 -7

No files matched your search

@@ -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);
;
@@ -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;
}
@@ -37,7 +37,7 @@ public class RaceInfoDTO implements IsSerializable {
}
}
public RaceIdentifier regattaAndRaceIdentifier;
public RaceIdentifier raceIdentifier;
public String raceName;
public String fleetName;
public int fleetOrdering;