Consistent naming of Settings used as context definition

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/AbstractEventActivity.java

@@ -35,8 +35,8 @@ import com.sap.sailing.gwt.home.shared.places.fakeseries.SeriesDefaultPlace;
 import com.sap.sailing.gwt.home.shared.places.start.StartPlace;
 import com.sap.sailing.gwt.settings.client.EntryPointWithSettingsLinkFactory;
 import com.sap.sailing.gwt.settings.client.raceboard.RaceBoardPerspectiveOwnSettings;
-import com.sap.sailing.gwt.settings.client.raceboard.RaceboardContextSettings;
-import com.sap.sailing.gwt.settings.client.regattaoverview.RegattaOverviewBaseSettings;
+import com.sap.sailing.gwt.settings.client.raceboard.RaceboardContextDefinition;
+import com.sap.sailing.gwt.settings.client.regattaoverview.RegattaOverviewContextDefinition;
 import com.sap.sailing.gwt.settings.client.regattaoverview.RegattaRaceStatesSettings;
 import com.sap.sailing.gwt.ui.client.SailingServiceAsync;
 import com.sap.sailing.gwt.ui.client.refresh.ErrorAndBusyClientFactory;
@@ -156,7 +156,7 @@ public abstract class AbstractEventActivity<PLACE extends AbstractEventPlace> ex
     @Override
     public String getRaceViewerURL(SimpleRaceMetadataDTO raceMetadata, String mode) {
         RaceIdentifier raceIdentifier = raceMetadata.getRegattaAndRaceIdentifier();
-        RaceboardContextSettings raceboardContext = new RaceboardContextSettings(raceIdentifier.getRegattaName(),
+        RaceboardContextDefinition raceboardContext = new RaceboardContextDefinition(raceIdentifier.getRegattaName(),
                 raceIdentifier.getRaceName(), raceMetadata.getLeaderboardName(), raceMetadata.getLeaderboardGroupName(),
                 null, null);
         RaceBoardPerspectiveOwnSettings perspectiveOwnSettings = RaceBoardPerspectiveOwnSettings
@@ -172,7 +172,7 @@ public abstract class AbstractEventActivity<PLACE extends AbstractEventPlace> ex
     
     @Override
     public String getRaceViewerURL(String leaderboardName, String leaderboardGroupName, RegattaAndRaceIdentifier raceIdentifier) {
-        RaceboardContextSettings raceboardContext = new RaceboardContextSettings(raceIdentifier.getRegattaName(),
+        RaceboardContextDefinition raceboardContext = new RaceboardContextDefinition(raceIdentifier.getRegattaName(),
                 raceIdentifier.getRaceName(), leaderboardName, leaderboardGroupName, null, null);
         RaceBoardPerspectiveOwnSettings perspectiveOwnSettings = RaceBoardPerspectiveOwnSettings
                 .createDefaultWithCanReplayDuringLiveRaces(true);
@@ -247,7 +247,7 @@ public abstract class AbstractEventActivity<PLACE extends AbstractEventPlace> ex
                 regattaRaceStatesSettings.getVisibleRegattaSettings().addValue(getRegattaId());
             }
         }
-        return EntryPointWithSettingsLinkFactory.createRegattaOverviewLink(new RegattaOverviewBaseSettings(getCtx().getEventId()), regattaRaceStatesSettings);
+        return EntryPointWithSettingsLinkFactory.createRegattaOverviewLink(new RegattaOverviewContextDefinition(getCtx().getEventId()), regattaRaceStatesSettings);
     }
     
     @Override

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/event/AbstractEventActivity.java

@@ -45,7 +45,7 @@ import com.sap.sailing.gwt.home.shared.places.fakeseries.SeriesContext;
 import com.sap.sailing.gwt.home.shared.places.fakeseries.SeriesDefaultPlace;
 import com.sap.sailing.gwt.settings.client.EntryPointWithSettingsLinkFactory;
 import com.sap.sailing.gwt.settings.client.raceboard.RaceBoardPerspectiveOwnSettings;
-import com.sap.sailing.gwt.settings.client.raceboard.RaceboardContextSettings;
+import com.sap.sailing.gwt.settings.client.raceboard.RaceboardContextDefinition;
 import com.sap.sailing.gwt.ui.client.StringMessages;
 import com.sap.sailing.gwt.ui.client.refresh.ErrorAndBusyClientFactory;
 import com.sap.sailing.gwt.ui.client.shared.racemap.RaceMapLifecycle;
@@ -264,7 +264,7 @@ public abstract class AbstractEventActivity<PLACE extends AbstractEventPlace> ex
     
     private String getRaceViewerURL(String leaderboardName, String leaderboardGroupName,
             RegattaAndRaceIdentifier raceIdentifier, String mode) {
-        RaceboardContextSettings raceboardContext = new RaceboardContextSettings(raceIdentifier.getRegattaName(),
+        RaceboardContextDefinition raceboardContext = new RaceboardContextDefinition(raceIdentifier.getRegattaName(),
                 raceIdentifier.getRaceName(), leaderboardName, leaderboardGroupName,
                 UUID.fromString(getCtx().getEventId()), mode);
         RaceBoardPerspectiveOwnSettings perspectiveOwnSettings = RaceBoardPerspectiveOwnSettings

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/regattaoverview/client/RegattaOverviewEntryPoint.java

@@ -17,7 +17,7 @@ import com.sap.sailing.gwt.common.authentication.FixedSailingAuthentication;
 import com.sap.sailing.gwt.common.authentication.SAPSailingHeaderWithAuthentication;
 import com.sap.sailing.gwt.common.client.SharedResources;
 import com.sap.sailing.gwt.regattaoverview.client.RegattaRaceStatesComponent.EntryHandler;
-import com.sap.sailing.gwt.settings.client.regattaoverview.RegattaOverviewBaseSettings;
+import com.sap.sailing.gwt.settings.client.regattaoverview.RegattaOverviewContextDefinition;
 import com.sap.sailing.gwt.settings.client.regattaoverview.RegattaRaceStatesSettings;
 import com.sap.sailing.gwt.ui.client.AbstractSailingEntryPoint;
 import com.sap.sailing.gwt.ui.shared.RegattaOverviewEntryDTO;
@@ -56,8 +56,8 @@ public class RegattaOverviewEntryPoint extends AbstractSailingEntryPoint  {
         siteHeader.addWidgetToRightSide(clockLabel);
         containerPanel.addNorth(siteHeader, 75);
         
-        RegattaOverviewBaseSettings regattaOverviewSettings = serializer
-                .deserializeFromCurrentLocation(new RegattaOverviewBaseSettings());
+        RegattaOverviewContextDefinition regattaOverviewSettings = serializer
+                .deserializeFromCurrentLocation(new RegattaOverviewContextDefinition());
 
         if (regattaOverviewSettings.getEvent() == null) {
             Window.alert("Missing parameter");
@@ -87,7 +87,7 @@ public class RegattaOverviewEntryPoint extends AbstractSailingEntryPoint  {
         containerPanel.animate(500);
     }
 
-    private void createAndAddRegattaPanel(RegattaOverviewBaseSettings regattaOverviewContextDefinition) {
+    private void createAndAddRegattaPanel(RegattaOverviewContextDefinition regattaOverviewContextDefinition) {
         regattaPanel = new RegattaOverviewPanel(sailingService, getUserService(), this, getStringMessages(),
                 regattaOverviewContextDefinition);
 
@@ -124,7 +124,7 @@ public class RegattaOverviewEntryPoint extends AbstractSailingEntryPoint  {
 
     public static String getUrl(UUID eventId, RegattaRaceStatesSettings settings) {
         UrlBuilder urlBuilder = serializer.serializeUrlBuilderBasedOnCurrentLocationWithCleanParameters(settings);
-        serializer.serializeToUrlBuilder(new RegattaOverviewBaseSettings(eventId), urlBuilder);
+        serializer.serializeToUrlBuilder(new RegattaOverviewContextDefinition(eventId), urlBuilder);
         return urlBuilder.buildString();
     }
 }

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/regattaoverview/client/RegattaOverviewPanel.java

@@ -21,7 +21,7 @@ import com.google.gwt.user.client.ui.VerticalPanel;
 import com.sap.sailing.gwt.common.client.SharedResources;
 import com.sap.sailing.gwt.regattaoverview.client.RegattaRaceStatesComponent.EntryHandler;
 import com.sap.sailing.gwt.settings.client.leaderboard.LeaderboardSettings;
-import com.sap.sailing.gwt.settings.client.regattaoverview.RegattaOverviewBaseSettings;
+import com.sap.sailing.gwt.settings.client.regattaoverview.RegattaOverviewContextDefinition;
 import com.sap.sailing.gwt.settings.client.regattaoverview.RegattaRaceStatesSettings;
 import com.sap.sailing.gwt.ui.client.CompetitorSelectionModel;
 import com.sap.sailing.gwt.ui.client.SailingServiceAsync;
@@ -58,7 +58,7 @@ public class RegattaOverviewPanel extends SimplePanel {
     protected final StringMessages stringMessages;
     protected final ErrorReporter errorReporter;
     
-    private final RegattaOverviewBaseSettings regattaOverviewContextDefinition;
+    private final RegattaOverviewContextDefinition regattaOverviewContextDefinition;
     private EventDTO eventDTO;
     private List<RaceGroupDTO> raceGroupDTOs;
     private List<EventAndRaceGroupAvailabilityListener> eventRaceGroupListeners;
@@ -85,7 +85,7 @@ public class RegattaOverviewPanel extends SimplePanel {
             UserService userService,
             final ErrorReporter errorReporter, 
             final StringMessages stringMessages, 
-            RegattaOverviewBaseSettings regattaOverviewContextDefinition) {
+            RegattaOverviewContextDefinition regattaOverviewContextDefinition) {
         
         this.sailingService = sailingService;
         this.stringMessages = stringMessages;

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/regattaoverview/client/RegattaRaceStatesComponent.java

@@ -48,7 +48,7 @@ import com.sap.sailing.domain.common.dto.FleetDTO;
 import com.sap.sailing.domain.common.racelog.Flags;
 import com.sap.sailing.gwt.settings.client.EntryPointWithSettingsLinkFactory;
 import com.sap.sailing.gwt.settings.client.raceboard.RaceBoardPerspectiveOwnSettings;
-import com.sap.sailing.gwt.settings.client.raceboard.RaceboardContextSettings;
+import com.sap.sailing.gwt.settings.client.raceboard.RaceboardContextDefinition;
 import com.sap.sailing.gwt.settings.client.regattaoverview.RegattaRaceStatesSettings;
 import com.sap.sailing.gwt.ui.client.AnchorCell;
 import com.sap.sailing.gwt.ui.client.EntryPointLinkFactory;
@@ -897,7 +897,7 @@ public class RegattaRaceStatesComponent extends AbstractCompositeComponent<Regat
 
     private String createRaceLink(RegattaOverviewEntryDTO entryDTO) {
         if (entryDTO.raceInfo.raceIdentifier != null && entryDTO.raceInfo.isTracked) {
-            RaceboardContextSettings raceboardContext = new RaceboardContextSettings(entryDTO.regattaName,
+            RaceboardContextDefinition raceboardContext = new RaceboardContextDefinition(entryDTO.regattaName,
                     entryDTO.raceInfo.raceIdentifier.getRaceName(), entryDTO.regattaName, null, null, null);
             RaceBoardPerspectiveOwnSettings perspectiveOwnSettings = RaceBoardPerspectiveOwnSettings
                     .createDefaultWithCanReplayDuringLiveRaces(true);

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/EntryPointWithSettingsLinkFactory.java

@@ -1,8 +1,8 @@
 package com.sap.sailing.gwt.settings.client;
 
 import com.sap.sailing.gwt.settings.client.raceboard.RaceBoardPerspectiveOwnSettings;
-import com.sap.sailing.gwt.settings.client.raceboard.RaceboardContextSettings;
-import com.sap.sailing.gwt.settings.client.regattaoverview.RegattaOverviewBaseSettings;
+import com.sap.sailing.gwt.settings.client.raceboard.RaceboardContextDefinition;
+import com.sap.sailing.gwt.settings.client.regattaoverview.RegattaOverviewContextDefinition;
 import com.sap.sailing.gwt.settings.client.regattaoverview.RegattaRaceStatesSettings;
 import com.sap.sse.gwt.client.shared.components.LinkWithSettingsGenerator;
 import com.sap.sse.gwt.client.shared.perspective.IgnoreLocalSettings;
@@ -16,17 +16,17 @@ import com.sap.sse.gwt.settings.AbstractEntryPointWithSettingsLinkFactory;
  */
 public class EntryPointWithSettingsLinkFactory extends AbstractEntryPointWithSettingsLinkFactory {
 
-    public static String createRegattaOverviewLink(RegattaOverviewBaseSettings regattaOverviewSettings) {
+    public static String createRegattaOverviewLink(RegattaOverviewContextDefinition regattaOverviewSettings) {
         return createRegattaOverviewLink(regattaOverviewSettings, new RegattaRaceStatesSettings());
     }
 
-    public static String createRegattaOverviewLink(RegattaOverviewBaseSettings regattaOverviewSettings,
+    public static String createRegattaOverviewLink(RegattaOverviewContextDefinition regattaOverviewSettings,
             RegattaRaceStatesSettings regattaRaceStatesSettings) {
         return new LinkWithSettingsGenerator<>("/gwt/RegattaOverview.html", regattaOverviewSettings,
                 new IgnoreLocalSettings(true)).createUrl(regattaRaceStatesSettings);
     }
 
-    public static String createRaceBoardLink(RaceboardContextSettings ctx,
+    public static String createRaceBoardLink(RaceboardContextDefinition ctx,
             PerspectiveCompositeSettings<RaceBoardPerspectiveOwnSettings> settings) {
         return new LinkWithSettingsGenerator<>("/gwt/RaceBoard.html", ctx).createUrl(settings);
     }

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/LeaderboardContextDefinition.java

@@ -6,7 +6,7 @@ import com.sap.sse.common.settings.generic.AbstractGenericSerializableSettings;
 import com.sap.sse.common.settings.generic.StringSetting;
 import com.sap.sse.common.settings.generic.UUIDSetting;
 
-public class LeaderboardContextSettings extends AbstractGenericSerializableSettings {
+public class LeaderboardContextDefinition extends AbstractGenericSerializableSettings {
     private static final long serialVersionUID = 6699950643747065960L;
     
     private transient UUIDSetting eventId;
@@ -16,10 +16,10 @@ public class LeaderboardContextSettings extends AbstractGenericSerializableSetti
     private transient StringSetting raceName;
     private transient StringSetting regattaName;
 
-    public LeaderboardContextSettings() {
+    public LeaderboardContextDefinition() {
     }
 
-    public LeaderboardContextSettings(String leaderboardName, String displayName) {
+    public LeaderboardContextDefinition(String leaderboardName, String displayName) {
         this.leaderboardName.setValue(leaderboardName);
         this.displayName.setValue(displayName);
     }

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/raceboard/RaceboardContextDefinition.java

@@ -6,7 +6,7 @@ import com.sap.sse.common.settings.generic.AbstractGenericSerializableSettings;
 import com.sap.sse.common.settings.generic.StringSetting;
 import com.sap.sse.common.settings.generic.UUIDSetting;
 
-public class RaceboardContextSettings extends AbstractGenericSerializableSettings {
+public class RaceboardContextDefinition extends AbstractGenericSerializableSettings {
     private static final long serialVersionUID = 2632481216072003426L;
     
     private StringSetting regattaName;
@@ -16,10 +16,10 @@ public class RaceboardContextSettings extends AbstractGenericSerializableSetting
     private UUIDSetting eventId;
     private StringSetting mode;
 
-    public RaceboardContextSettings() {
+    public RaceboardContextDefinition() {
     }
 
-    public RaceboardContextSettings(String regattaName, String raceName, String leaderboardName,
+    public RaceboardContextDefinition(String regattaName, String raceName, String leaderboardName,
             String leaderboardGroupName, UUID eventId, String mode) {
         this.regattaName.setValue(regattaName);
         this.raceName.setValue(raceName);

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/regattaoverview/RegattaOverviewContextDefinition.java

@@ -5,18 +5,18 @@ import java.util.UUID;
 import com.sap.sse.common.settings.generic.AbstractGenericSerializableSettings;
 import com.sap.sse.common.settings.generic.UUIDSetting;
 
-public final class RegattaOverviewBaseSettings extends AbstractGenericSerializableSettings {
+public final class RegattaOverviewContextDefinition extends AbstractGenericSerializableSettings {
     private static final long serialVersionUID = -8541790130000694098L;
     private transient UUIDSetting event;
 
-    public RegattaOverviewBaseSettings() {
+    public RegattaOverviewContextDefinition() {
     }
     
-    public RegattaOverviewBaseSettings(String event) {
+    public RegattaOverviewContextDefinition(String event) {
         this(UUID.fromString(event));
     }
     
-    public RegattaOverviewBaseSettings(UUID event) {
+    public RegattaOverviewContextDefinition(UUID event) {
         this.event.setValue(event);
     }
     

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/EventDetailsComposite.java

@@ -12,7 +12,7 @@ import com.google.gwt.user.client.ui.HasVerticalAlignment;
 import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.VerticalPanel;
 import com.sap.sailing.gwt.settings.client.EntryPointWithSettingsLinkFactory;
-import com.sap.sailing.gwt.settings.client.regattaoverview.RegattaOverviewBaseSettings;
+import com.sap.sailing.gwt.settings.client.regattaoverview.RegattaOverviewContextDefinition;
 import com.sap.sailing.gwt.ui.client.SailingServiceAsync;
 import com.sap.sailing.gwt.ui.client.StringMessages;
 import com.sap.sailing.gwt.ui.shared.CourseAreaDTO;
@@ -139,7 +139,7 @@ public class EventDetailsComposite extends Composite  {
             baseURL.setHref(event.getBaseURL());
             sailorsInfoWebsiteURLList.setValues(new ArrayList<String>(event.getSailorsInfoWebsiteURLs().values()));
             String regattaOverviewLink = EntryPointWithSettingsLinkFactory
-                    .createRegattaOverviewLink(new RegattaOverviewBaseSettings(event.id));
+                    .createRegattaOverviewLink(new RegattaOverviewContextDefinition(event.id));
             eventOverviewURL.setText(regattaOverviewLink);
             eventOverviewURL.setHref(UriUtils.fromString(regattaOverviewLink));
      

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardConfigPanel.java

@@ -36,7 +36,7 @@ import com.sap.sailing.domain.common.dto.AbstractLeaderboardDTO;
 import com.sap.sailing.domain.common.dto.CompetitorDTO;
 import com.sap.sailing.domain.common.dto.FleetDTO;
 import com.sap.sailing.domain.common.dto.RaceColumnDTO;
-import com.sap.sailing.gwt.settings.client.leaderboard.LeaderboardContextSettings;
+import com.sap.sailing.gwt.settings.client.leaderboard.LeaderboardContextDefinition;
 import com.sap.sailing.gwt.settings.client.leaderboard.LeaderboardPerspectiveOwnSettings;
 import com.sap.sailing.gwt.ui.adminconsole.DisablableCheckboxCell.IsEnabled;
 import com.sap.sailing.gwt.ui.client.EntryPointLinkFactory;
@@ -143,7 +143,7 @@ TrackedRaceChangedListener, LeaderboardsDisplayer {
             public SafeHtml getValue(StrippedLeaderboardDTO object) {
                 final LinkWithSettingsGenerator<Settings> linkWithSettingsGenerator = new LinkWithSettingsGenerator<>(
                         EntryPointLinkFactory.LEADERBOARD_PATH,
-                        new LeaderboardContextSettings(object.name, object.displayName));
+                        new LeaderboardContextDefinition(object.name, object.displayName));
                 LeaderboardPerspectiveOwnSettings perspectiveOwnSettings = new LeaderboardPerspectiveOwnSettings(
                         showRaceDetails);
                 final PerspectiveCompositeSettings<LeaderboardPerspectiveOwnSettings> settings = new PerspectiveCompositeSettings<LeaderboardPerspectiveOwnSettings>(

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RaceTableWrapper.java

@@ -11,7 +11,7 @@ import com.google.gwt.user.cellview.client.TextColumn;
 import com.sap.sailing.domain.common.RegattaNameAndRaceName;
 import com.sap.sailing.gwt.settings.client.EntryPointWithSettingsLinkFactory;
 import com.sap.sailing.gwt.settings.client.raceboard.RaceBoardPerspectiveOwnSettings;
-import com.sap.sailing.gwt.settings.client.raceboard.RaceboardContextSettings;
+import com.sap.sailing.gwt.settings.client.raceboard.RaceboardContextDefinition;
 import com.sap.sailing.gwt.ui.adminconsole.AbstractLeaderboardConfigPanel.RaceColumnDTOAndFleetDTOWithNameBasedEquality;
 import com.sap.sailing.gwt.ui.adminconsole.LeaderboardConfigPanel.AnchorCell;
 import com.sap.sailing.gwt.ui.adminconsole.LeaderboardConfigPanel.AnchorTemplates;
@@ -52,7 +52,7 @@ extends TableWrapper<RaceColumnDTOAndFleetDTOWithNameBasedEquality, S> {
                 if (raceInLeaderboardDTOAndFleetName.getA().getRaceIdentifier(raceInLeaderboardDTOAndFleetName.getB()) != null) {
                     RegattaNameAndRaceName raceIdentifier = (RegattaNameAndRaceName) raceInLeaderboardDTOAndFleetName
                             .getA().getRaceIdentifier(raceInLeaderboardDTOAndFleetName.getB());
-                            RaceboardContextSettings raceboardContext = new RaceboardContextSettings(
+                            RaceboardContextDefinition raceboardContext = new RaceboardContextDefinition(
                                     raceIdentifier.getRegattaName(), raceIdentifier.getRaceName(),
                                     selectedLeaderboardName, null, null, null);
                             RaceBoardPerspectiveOwnSettings perspectiveOwnSettings = RaceBoardPerspectiveOwnSettings

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardEntryPoint.java

@@ -19,7 +19,7 @@ import com.sap.sailing.domain.common.dto.AbstractLeaderboardDTO;
 import com.sap.sailing.gwt.common.authentication.FixedSailingAuthentication;
 import com.sap.sailing.gwt.common.authentication.SAPSailingHeaderWithAuthentication;
 import com.sap.sailing.gwt.settings.client.leaderboard.AbstractLeaderboardPerspectiveLifecycle;
-import com.sap.sailing.gwt.settings.client.leaderboard.LeaderboardContextSettings;
+import com.sap.sailing.gwt.settings.client.leaderboard.LeaderboardContextDefinition;
 import com.sap.sailing.gwt.settings.client.leaderboard.LeaderboardPerspectiveLifecycle;
 import com.sap.sailing.gwt.settings.client.leaderboard.LeaderboardPerspectiveOwnSettings;
 import com.sap.sailing.gwt.settings.client.leaderboard.LeaderboardSettings;
@@ -58,8 +58,8 @@ public class LeaderboardEntryPoint extends AbstractSailingEntryPoint {
     protected void doOnModuleLoad() {
         super.doOnModuleLoad();
 
-        final LeaderboardContextSettings leaderboardContextSettings = new SettingsToUrlSerializer()
-                .deserializeFromCurrentLocation(new LeaderboardContextSettings());
+        final LeaderboardContextDefinition leaderboardContextSettings = new SettingsToUrlSerializer()
+                .deserializeFromCurrentLocation(new LeaderboardContextDefinition());
 
         final UUID eventId = leaderboardContextSettings.getEventId();
 
@@ -116,7 +116,7 @@ public class LeaderboardEntryPoint extends AbstractSailingEntryPoint {
         }
     }
 
-    private void loadSettingsAndCreateUI(LeaderboardContextSettings leaderboardContextSettings, EventDTO event) {
+    private void loadSettingsAndCreateUI(LeaderboardContextDefinition leaderboardContextSettings, EventDTO event) {
         long delayBetweenAutoAdvancesInMilliseconds = DEFAULT_REFRESH_INTERVAL_MILLIS;
         final Timer timer = new Timer(PlayModes.Live, PlayStates.Paused, delayBetweenAutoAdvancesInMilliseconds);
         
@@ -196,7 +196,7 @@ public class LeaderboardEntryPoint extends AbstractSailingEntryPoint {
         return leaderboardType.isMetaLeaderboard() ? DetailType.OVERALL_RANK : DetailType.REGATTA_RANK;
     }
     
-    private void createUi(Widget leaderboardViewer, PerspectiveCompositeSettings<LeaderboardPerspectiveOwnSettings> settings, Timer timer, LeaderboardContextSettings leaderboardContextSettings) {
+    private void createUi(Widget leaderboardViewer, PerspectiveCompositeSettings<LeaderboardPerspectiveOwnSettings> settings, Timer timer, LeaderboardContextDefinition leaderboardContextSettings) {
         LeaderboardPerspectiveOwnSettings ownSettings = settings.getPerspectiveOwnSettings();
         
         DockLayoutPanel mainPanel = new DockLayoutPanel(Unit.PX);
@@ -233,7 +233,7 @@ public class LeaderboardEntryPoint extends AbstractSailingEntryPoint {
         }
     }
 
-    private RegattaAndRaceIdentifier getPreselectedRace(LeaderboardContextSettings leaderboardContextSettings) {
+    private RegattaAndRaceIdentifier getPreselectedRace(LeaderboardContextDefinition leaderboardContextSettings) {
         final String raceName = leaderboardContextSettings.getRaceName();
         final String regattaName = leaderboardContextSettings.getRegattaName();
         RegattaAndRaceIdentifier result;
@@ -266,7 +266,7 @@ public class LeaderboardEntryPoint extends AbstractSailingEntryPoint {
         } else {
             lifeCycle = new LeaderboardPerspectiveLifecycle(stringmessages, leaderboard);
         }
-        final LeaderboardContextSettings leaderboardContextSettings = new LeaderboardContextSettings(leaderboard.name,
+        final LeaderboardContextDefinition leaderboardContextSettings = new LeaderboardContextDefinition(leaderboard.name,
                 leaderboard.getDisplayName());
         final LinkWithSettingsGenerator<PerspectiveCompositeSettings<LeaderboardPerspectiveOwnSettings>> linkWithSettingsGenerator = new LinkWithSettingsGenerator<>(
                 EntryPointLinkFactory.LEADERBOARD_PATH, leaderboardContextSettings);

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardEntryPoint.java

@@ -14,7 +14,7 @@ import com.google.gwt.user.client.ui.RootLayoutPanel;
 import com.sap.sailing.gwt.common.client.formfactor.DeviceDetector;
 import com.sap.sailing.gwt.settings.client.raceboard.RaceBoardPerspectiveLifecycle;
 import com.sap.sailing.gwt.settings.client.raceboard.RaceBoardPerspectiveOwnSettings;
-import com.sap.sailing.gwt.settings.client.raceboard.RaceboardContextSettings;
+import com.sap.sailing.gwt.settings.client.raceboard.RaceboardContextDefinition;
 import com.sap.sailing.gwt.ui.client.AbstractSailingEntryPoint;
 import com.sap.sailing.gwt.ui.client.LogoAndTitlePanel;
 import com.sap.sailing.gwt.ui.client.MediaService;
@@ -43,7 +43,7 @@ public class RaceBoardEntryPoint extends AbstractSailingEntryPoint {
      */
     private final MediaServiceAsync mediaService = GWT.create(MediaService.class);
 
-    private RaceboardContextSettings raceBoardContextSettings;
+    private RaceboardContextDefinition raceBoardContextSettings;
 
     @Override
     protected void doOnModuleLoad() {
@@ -51,7 +51,7 @@ public class RaceBoardEntryPoint extends AbstractSailingEntryPoint {
         EntryPointHelper.registerASyncService((ServiceDefTarget) mediaService, RemoteServiceMappingConstants.mediaServiceRemotePath);
 
         raceBoardContextSettings = new SettingsToUrlSerializer()
-                .deserializeFromCurrentLocation(new RaceboardContextSettings());
+                .deserializeFromCurrentLocation(new RaceboardContextDefinition());
 
         final RaceBoardModes finalMode;
         if (raceBoardContextSettings.getMode() != null) {

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/spectator/LeaderboardGroupPanel.java

@@ -33,7 +33,7 @@ import com.sap.sailing.domain.common.dto.RaceColumnDTO;
 import com.sap.sailing.domain.common.dto.RaceDTO;
 import com.sap.sailing.gwt.settings.client.EntryPointWithSettingsLinkFactory;
 import com.sap.sailing.gwt.settings.client.raceboard.RaceBoardPerspectiveOwnSettings;
-import com.sap.sailing.gwt.settings.client.raceboard.RaceboardContextSettings;
+import com.sap.sailing.gwt.settings.client.raceboard.RaceboardContextDefinition;
 import com.sap.sailing.gwt.ui.adminconsole.LeaderboardConfigPanel.AnchorCell;
 import com.sap.sailing.gwt.ui.client.EntryPointLinkFactory;
 import com.sap.sailing.gwt.ui.client.HasWelcomeWidget;
@@ -406,7 +406,7 @@ public class LeaderboardGroupPanel extends SimplePanel implements HasWelcomeWidg
         if (race != null) {
             RegattaAndRaceIdentifier raceIdentifier = race.getRaceIdentifier();
 
-            RaceboardContextSettings raceboardContext = new RaceboardContextSettings(raceIdentifier.getRegattaName(),
+            RaceboardContextDefinition raceboardContext = new RaceboardContextDefinition(raceIdentifier.getRegattaName(),
                     raceIdentifier.getRaceName(), leaderboardName, leaderboardGroup.getName(), null, viewMode);
             RaceBoardPerspectiveOwnSettings perspectiveOwnSettings = RaceBoardPerspectiveOwnSettings
                     .createDefaultWithCanReplayDuringLiveRaces(canReplayDuringLiveRaces);