diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/SharedLeaderboardRegattaTabView.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/SharedLeaderboardRegattaTabView.java index dfe425a9e06..ff9b296d235 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/SharedLeaderboardRegattaTabView.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/SharedLeaderboardRegattaTabView.java @@ -1,12 +1,10 @@ package com.sap.sailing.gwt.home.desktop.places.event.regatta; -import com.google.gwt.core.shared.GWT; import com.google.gwt.event.logical.shared.AttachEvent; import com.google.gwt.event.logical.shared.AttachEvent.Handler; import com.google.gwt.user.client.ui.Composite; import com.sap.sailing.domain.common.DetailType; import com.sap.sailing.gwt.home.desktop.places.Consumer; -import com.sap.sailing.gwt.settings.client.leaderboard.LeaderboardSettingsFactory; import com.sap.sailing.gwt.settings.client.leaderboard.LeaderboardUrlSettings; import com.sap.sailing.gwt.settings.client.leaderboard.MultiRaceLeaderboardPanelLifecycle; import com.sap.sailing.gwt.settings.client.leaderboard.MultiRaceLeaderboardSettings; @@ -20,7 +18,6 @@ import com.sap.sse.gwt.client.shared.settings.DefaultOnSettingsLoadedCallback; import com.sap.sse.gwt.client.shared.settings.PipelineLevel; import com.sap.sse.gwt.shared.GwtHttpRequestUtils; import com.sap.sse.security.ui.client.UserService; -import com.sap.sse.security.ui.settings.ComponentContextWithSettingsStorageAndAdditionalSettingsLayers.OnSettingsReloadedCallback; import com.sap.sse.security.ui.settings.PlaceBasedComponentContextWithSettingsStorage; import com.sap.sse.security.ui.settings.StoredSettingsLocation; @@ -34,38 +31,37 @@ public abstract class SharedLeaderboardRegattaTabView consumer, Iterable availableDetailTypes) { - + public void createSharedLeaderboardPanel(String leaderboardName, + RegattaAnalyticsDataManager regattaAnalyticsManager, UserService userService, String placeToken, + final Consumer consumer, Iterable availableDetailTypes) { + // FIXME remove - boolean autoExpandLastRaceColumn = GwtHttpRequestUtils.getBooleanParameter( - LeaderboardUrlSettings.PARAM_AUTO_EXPAND_LAST_RACE_COLUMN, false); - - - - final PlaceBasedComponentContextWithSettingsStorage componentContext = createLeaderboardComponentContext(leaderboardName, userService, - placeToken, availableDetailTypes); + boolean autoExpandLastRaceColumn = GwtHttpRequestUtils + .getBooleanParameter(LeaderboardUrlSettings.PARAM_AUTO_EXPAND_LAST_RACE_COLUMN, false); + + final PlaceBasedComponentContextWithSettingsStorage componentContext = createLeaderboardComponentContext( + leaderboardName, userService, placeToken, availableDetailTypes); componentContext.getInitialSettings(new DefaultOnSettingsLoadedCallback() { @Override public void onSuccess(MultiRaceLeaderboardSettings leaderboardSettings) { - final MultiRaceLeaderboardPanel leaderboardPanel = regattaAnalyticsManager.createMultiRaceLeaderboardPanel(null, componentContext, // - leaderboardSettings, // - "leaderboardGroupName", // TODO: keep using magic string? ask frank! - leaderboardName, // - true, - autoExpandLastRaceColumn, availableDetailTypes); + final MultiRaceLeaderboardPanel leaderboardPanel = regattaAnalyticsManager + .createMultiRaceLeaderboardPanel(null, componentContext, // + leaderboardSettings, // + "leaderboardGroupName", // TODO: keep using magic string? ask frank! + leaderboardName, // + true, autoExpandLastRaceColumn, availableDetailTypes); leaderboardPanel.addAttachHandler(new Handler() { @Override public void onAttachOrDetach(AttachEvent event) { - if(!event.isAttached()) { + if (!event.isAttached()) { componentContext.dispose(); } } - + }); - - if(ElementSizeMutationObserver.isSupported()) { + + if (ElementSizeMutationObserver.isSupported()) { ElementSizeMutationObserver observer = new ElementSizeMutationObserver(new DomMutationCallback() { @Override public void onSizeChanged(int newWidth, int newHeight) { @@ -73,22 +69,15 @@ public abstract class SharedLeaderboardRegattaTabView 0 && newHeight > 0 && newWidth > 1500) { final int numberOfLastRacesToShow = (1500 - 600) / 50; - final MultiRaceLeaderboardSettings newSettings = LeaderboardSettingsFactory.getInstance() - .createNewDefaultSettingsWithLastN(numberOfLastRacesToShow); - + MultiRaceLeaderboardSettings newSettings = MultiRaceLeaderboardSettings + .createDefaultSettingsWithLastNRaceColumnSelection(numberOfLastRacesToShow); componentContext.addAdditionalSettingsLayerForComponent(leaderboardPanel, PipelineLevel.SYSTEM_DEFAULTS, newSettings, - new OnSettingsReloadedCallback() { - @Override - public void onSettingsReloaded(MultiRaceLeaderboardSettings patchedSettings) { - GWT.log("Switching to last_n mode with settings" + patchedSettings); - leaderboardPanel.updateSettings(patchedSettings); - } - }); + leaderboardPanel::updateSettings); } } } - }); + }); observer.observe(leaderboardPanel.getLeaderboardTable().getElement()); } consumer.consume(leaderboardPanel); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/leaderboardstab/EventSeriesLeaderboardsTabView.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/leaderboardstab/EventSeriesLeaderboardsTabView.java index 0ad163958f8..40d6bd3739a 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/leaderboardstab/EventSeriesLeaderboardsTabView.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/fakeseries/leaderboardstab/EventSeriesLeaderboardsTabView.java @@ -160,7 +160,7 @@ public class EventSeriesLeaderboardsTabView extends Composite implements SeriesT private ComponentContext createLeaderboardComponentContext(String leaderboardName, UserService userService, String placeToken, Iterable availableDetailTypes) { - final MultipleMultiLeaderboardPanelLifecycle lifecycle = new MultipleMultiLeaderboardPanelLifecycle(null, StringMessages.INSTANCE, availableDetailTypes); + final MultipleMultiLeaderboardPanelLifecycle lifecycle = new MultipleMultiLeaderboardPanelLifecycle(StringMessages.INSTANCE, availableDetailTypes); final StoredSettingsLocation storageDefinition = StoredSettingsLocationFactory.createStoredSettingsLocatorForSeriesRegattaLeaderboards(leaderboardName); final ComponentContext componentContext = new PlaceBasedComponentContextWithSettingsStorage<>( diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/regattaoverview/client/RegattaRaceStatesComponentLifecycle.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/regattaoverview/client/RegattaRaceStatesComponentLifecycle.java index cf94d50a418..7e7ea0ed24b 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/regattaoverview/client/RegattaRaceStatesComponentLifecycle.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/regattaoverview/client/RegattaRaceStatesComponentLifecycle.java @@ -60,9 +60,4 @@ public class RegattaRaceStatesComponentLifecycle implements ComponentLifecycle namesOfRaceColumns) { - MultiRaceLeaderboardSettings leaderboardSettings = new MultiRaceLeaderboardSettings(namesOfRaceColumns); - SettingsUtil.copyDefaultsFromValues(leaderboardSettings, leaderboardSettings); - return leaderboardSettings; - } - - - public MultiRaceLeaderboardSettings createNewDefaultSettingsWithLastN(int numberOfLastRacesToShow) { - MultiRaceLeaderboardSettings defaultSettings = new MultiRaceLeaderboardSettings(); - return new MultiRaceLeaderboardSettings( - defaultSettings.getManeuverDetailsToShow(), - defaultSettings.getLegDetailsToShow(), - defaultSettings.getRaceDetailsToShow(), defaultSettings.getOverallDetailsToShow(), - defaultSettings.getNamesOfRaceColumnsToShow(), - numberOfLastRacesToShow, - defaultSettings.getDelayBetweenAutoAdvancesInMilliseconds(), - RaceColumnSelectionStrategies.LAST_N, - defaultSettings.isShowAddedScores(), - defaultSettings.isShowCompetitorShortNameColumn(), - defaultSettings.isShowCompetitorFullNameColumn(), - defaultSettings.isShowCompetitorBoatInfoColumn(), - defaultSettings.isShowCompetitorNationality()); - } - - public SingleRaceLeaderboardSettings createNewSettingsWithCustomRaceDetails(List raceDetailsToShow) { - SingleRaceLeaderboardSettings defaultSettings = new SingleRaceLeaderboardSettings(false); - return new SingleRaceLeaderboardSettings( - defaultSettings.getManeuverDetailsToShow(), - defaultSettings.getLegDetailsToShow(), - raceDetailsToShow, defaultSettings.getOverallDetailsToShow(), - defaultSettings.getDelayBetweenAutoAdvancesInMilliseconds(), - defaultSettings.isShowAddedScores(), - defaultSettings.isShowCompetitorShortNameColumn(), - defaultSettings.isShowCompetitorFullNameColumn(), - defaultSettings.isShowCompetitorBoatInfoColumn(), - defaultSettings.isShowRaceRankColumn(), - defaultSettings.isShowCompetitorNationality()); - } - - public MultiRaceLeaderboardSettings mergeLeaderboardSettings(MultiRaceLeaderboardSettings settingsWithRaceSelection, MultiRaceLeaderboardSettings settingsWithDetails) { - final MultiRaceLeaderboardSettings newSettings = mergeLeaderboardSettingsHelper(settingsWithRaceSelection, settingsWithDetails); - return newSettings; - } - - private MultiRaceLeaderboardSettings mergeLeaderboardSettingsHelper(MultiRaceLeaderboardSettings settingsWithRaceSelection, MultiRaceLeaderboardSettings settingsWithDetails) { - Collection maneuverDetails = settingsWithDetails.getManeuverDetailsToShow(); - Collection legDetails = settingsWithDetails.getLegDetailsToShow(); - Collection raceDetails = settingsWithDetails.getRaceDetailsToShow(); - Collection overallDetailsToShow = settingsWithDetails.getOverallDetailsToShow(); - Long refreshIntervalInMs = settingsWithDetails.getDelayBetweenAutoAdvancesInMilliseconds(); - - RaceColumnSelectionStrategies strategy = settingsWithRaceSelection.getActiveRaceColumnSelectionStrategy(); - List namesOfRaceColumnsToShow = settingsWithRaceSelection.getNamesOfRaceColumnsToShow(); - Integer numberOfLastRacesToShow = settingsWithRaceSelection.getNumberOfLastRacesToShow(); - boolean showCompetitorShortNameColumn = settingsWithRaceSelection.isShowCompetitorShortNameColumn(); - boolean showCompetitorFullNameColumn = settingsWithRaceSelection.isShowCompetitorFullNameColumn(); - boolean showCompetitorBoatInfoColumn = settingsWithRaceSelection.isShowCompetitorBoatInfoColumn(); - - return new MultiRaceLeaderboardSettings(maneuverDetails, legDetails, raceDetails, overallDetailsToShow, - namesOfRaceColumnsToShow, numberOfLastRacesToShow, refreshIntervalInMs, - strategy, /*showAddedScores*/ false, - showCompetitorShortNameColumn, showCompetitorFullNameColumn, showCompetitorBoatInfoColumn, - settingsWithRaceSelection.isShowCompetitorNationality()); - } - -} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/MetaLeaderboardPerspectiveLifecycle.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/MetaLeaderboardPerspectiveLifecycle.java index 8e6da10b159..30a57a6fe2a 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/MetaLeaderboardPerspectiveLifecycle.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/MetaLeaderboardPerspectiveLifecycle.java @@ -12,7 +12,7 @@ public class MetaLeaderboardPerspectiveLifecycle extends AbstractLeaderboardPers public MetaLeaderboardPerspectiveLifecycle(StringMessages stringMessages, AbstractLeaderboardDTO leaderboard, Iterable availableDetailTypes) { super(stringMessages, leaderboard, true, availableDetailTypes); - multiLeaderboardPanelLifecycle = new MultipleMultiLeaderboardPanelLifecycle(null, stringMessages, availableDetailTypes); + multiLeaderboardPanelLifecycle = new MultipleMultiLeaderboardPanelLifecycle(stringMessages, availableDetailTypes); addLifeCycle(multiLeaderboardPanelLifecycle); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/MultiCompetitorLeaderboardChartLifecycle.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/MultiCompetitorLeaderboardChartLifecycle.java index c16c4fa1b4d..a29eb6e3fca 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/MultiCompetitorLeaderboardChartLifecycle.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/MultiCompetitorLeaderboardChartLifecycle.java @@ -42,16 +42,4 @@ public class MultiCompetitorLeaderboardChartLifecycle implements public boolean hasSettings() { return true; } - - @Override - public MultiCompetitorLeaderboardChartSettings extractUserSettings( - MultiCompetitorLeaderboardChartSettings settings) { - return settings; - } - - @Override - public MultiCompetitorLeaderboardChartSettings extractDocumentSettings( - MultiCompetitorLeaderboardChartSettings settings) { - return settings; - } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/MultiRaceLeaderboardPanelLifecycle.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/MultiRaceLeaderboardPanelLifecycle.java index 29a5b5a89e6..2a3ad11994c 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/MultiRaceLeaderboardPanelLifecycle.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/MultiRaceLeaderboardPanelLifecycle.java @@ -15,44 +15,22 @@ public class MultiRaceLeaderboardPanelLifecycle extends LeaderboardPanelLifecycl public MultiRaceLeaderboardPanelLifecycle(AbstractLeaderboardDTO leaderboard, StringMessages stringMessages, Iterable availableDetailTypes) { - super(stringMessages, availableDetailTypes); - this.namesOfRaceColumns = leaderboard != null ? leaderboard.getNamesOfRaceColumns() : new ArrayList(); - this.canBoatInfoBeShown = leaderboard != null ? !leaderboard.canBoatsOfCompetitorsChangePerRace : false; + this(leaderboard != null ? leaderboard.getNamesOfRaceColumns() : new ArrayList(), + leaderboard != null ? !leaderboard.canBoatsOfCompetitorsChangePerRace : false, stringMessages, + availableDetailTypes); } - @Override - public MultiRaceLeaderboardSettings extractUserSettings(MultiRaceLeaderboardSettings currentLeaderboardSettings) { - MultiRaceLeaderboardSettings defaultLeaderboardSettings = createDefaultSettings(); - MultiRaceLeaderboardSettings globalLeaderboardSettings = new MultiRaceLeaderboardSettings( - currentLeaderboardSettings.getManeuverDetailsToShow(), currentLeaderboardSettings.getLegDetailsToShow(), - currentLeaderboardSettings.getRaceDetailsToShow(), currentLeaderboardSettings.getOverallDetailsToShow(), - defaultLeaderboardSettings.getNamesOfRaceColumnsToShow(), - currentLeaderboardSettings.getNumberOfLastRacesToShow(), - currentLeaderboardSettings.getDelayBetweenAutoAdvancesInMilliseconds(), - currentLeaderboardSettings.getActiveRaceColumnSelectionStrategy(), - currentLeaderboardSettings.isShowAddedScores(), - currentLeaderboardSettings.isShowCompetitorShortNameColumn(), - currentLeaderboardSettings.isShowCompetitorFullNameColumn(), - currentLeaderboardSettings.isShowCompetitorBoatInfoColumn(), - currentLeaderboardSettings.isShowCompetitorNationality()); - return SettingsUtil.copyValues(globalLeaderboardSettings, defaultLeaderboardSettings); + + protected MultiRaceLeaderboardPanelLifecycle(List namesOfRaceColumns, boolean canBoatInfoBeShown, StringMessages stringMessages, + Iterable availableDetailTypes) { + super(stringMessages, availableDetailTypes); + this.namesOfRaceColumns = namesOfRaceColumns; + this.canBoatInfoBeShown = canBoatInfoBeShown; } @Override - public MultiRaceLeaderboardSettings extractDocumentSettings(MultiRaceLeaderboardSettings currentLeaderboardSettings) { - MultiRaceLeaderboardSettings defaultLeaderboardSettings = createDefaultSettings(); - MultiRaceLeaderboardSettings contextSpecificLeaderboardSettings = new MultiRaceLeaderboardSettings( - currentLeaderboardSettings.getManeuverDetailsToShow(), currentLeaderboardSettings.getLegDetailsToShow(), - currentLeaderboardSettings.getRaceDetailsToShow(), currentLeaderboardSettings.getOverallDetailsToShow(), - defaultLeaderboardSettings.getNamesOfRaceColumnsToShow(), - currentLeaderboardSettings.getNumberOfLastRacesToShow(), - currentLeaderboardSettings.getDelayBetweenAutoAdvancesInMilliseconds(), - currentLeaderboardSettings.getActiveRaceColumnSelectionStrategy(), - currentLeaderboardSettings.isShowAddedScores(), - currentLeaderboardSettings.isShowCompetitorShortNameColumn(), - currentLeaderboardSettings.isShowCompetitorFullNameColumn(), - currentLeaderboardSettings.isShowCompetitorBoatInfoColumn(), - currentLeaderboardSettings.isShowCompetitorNationality()); - return SettingsUtil.copyValues(contextSpecificLeaderboardSettings, defaultLeaderboardSettings); + public MultiRaceLeaderboardSettings extractUserSettings(MultiRaceLeaderboardSettings currentLeaderboardSettings) { + // All settings except namesOfRaceColumnsToShow are used for the user settings + return currentLeaderboardSettings.withNamesOfRaceColumnsToShowDefaultsAndValues(namesOfRaceColumns); } @Override @@ -63,7 +41,8 @@ public class MultiRaceLeaderboardPanelLifecycle extends LeaderboardPanelLifecycl @Override public MultiRaceLeaderboardSettings createDefaultSettings() { - return LeaderboardSettingsFactory.getInstance() - .createNewDefaultSettingsWithRaceColumns(namesOfRaceColumns); + MultiRaceLeaderboardSettings leaderboardSettings = new MultiRaceLeaderboardSettings(namesOfRaceColumns); + SettingsUtil.copyDefaultsFromValues(leaderboardSettings, leaderboardSettings); + return leaderboardSettings; } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/MultiRaceLeaderboardSettings.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/MultiRaceLeaderboardSettings.java index fc9714d71fd..4a7803f02c4 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/MultiRaceLeaderboardSettings.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/MultiRaceLeaderboardSettings.java @@ -9,6 +9,7 @@ import com.sap.sse.common.Util; import com.sap.sse.common.settings.generic.EnumSetting; import com.sap.sse.common.settings.generic.IntegerSetting; import com.sap.sse.common.settings.generic.StringSetSetting; +import com.sap.sse.common.settings.generic.support.SettingsUtil; public class MultiRaceLeaderboardSettings extends LeaderboardSettings { private static final long serialVersionUID = -3445146715292390755L; @@ -49,28 +50,9 @@ public class MultiRaceLeaderboardSettings extends LeaderboardSettings { public MultiRaceLeaderboardSettings(Iterable namesOfRaceColumnsToShow) { super(false); - this.namesOfRaceColumnsToShow.setValues(namesOfRaceColumnsToShow); + this.namesOfRaceColumnsToShow.setValues(namesOfRaceColumnsToShow); } - - public MultiRaceLeaderboardSettings overrideDefaultsForNamesOfRaceColumns(List namesOfRaceColumns) { - MultiRaceLeaderboardSettings newSettings = new MultiRaceLeaderboardSettings(); - newSettings.legDetailsToShow.setValues(this.getLegDetailsToShow()); - newSettings.raceDetailsToShow.setValues(this.getRaceDetailsToShow()); - newSettings.overallDetailsToShow.setValues(this.getOverallDetailsToShow()); - newSettings.numberOfLastRacesToShow.setValue(this.getNumberOfLastRacesToShow()); - newSettings.activeRaceColumnSelectionStrategy.setValue(this.getActiveRaceColumnSelectionStrategy()); - newSettings.delayBetweenAutoAdvancesInMilliseconds.setValue(this.getDelayBetweenAutoAdvancesInMilliseconds()); - newSettings.maneuverDetailsToShow.setValues(this.getManeuverDetailsToShow()); - newSettings.showAddedScores.setValue(this.isShowAddedScores()); - newSettings.showCompetitorShortNameColumn.setValue(this.isShowCompetitorShortNameColumn()); - newSettings.showCompetitorFullNameColumn.setValue(this.isShowCompetitorFullNameColumn()); - newSettings.showCompetitorBoatInfoColumn.setValue(this.isShowCompetitorBoatInfoColumn()); - newSettings.isShowCompetitorNationality.setValue(this.isShowCompetitorNationality()); - newSettings.namesOfRaceColumnsToShow.setValues(this.getNamesOfRaceColumnsToShow()); - newSettings.namesOfRaceColumnsToShow.setDefaultValues(namesOfRaceColumns); - return newSettings; - } - + @Override protected void addChildSettings() { super.addChildSettings(); @@ -100,4 +82,58 @@ public class MultiRaceLeaderboardSettings extends LeaderboardSettings { return activeRaceColumnSelectionStrategy.getValue(); } + /** + * Constructs a new {@link MultiRaceLeaderboardSettings} instance with all defaults and values taken from this + * instance except the defaults for namesOfRaceColumnsToShow which are set to the given values. + */ + public MultiRaceLeaderboardSettings withNamesOfRaceColumnsToShowDefaults( + final Iterable namesOfRaceColumnsToShow) { + final MultiRaceLeaderboardSettings newSettings = new MultiRaceLeaderboardSettings(); + SettingsUtil.copyValuesAndDefaults(this, this, newSettings); + newSettings.namesOfRaceColumnsToShow.setDefaultValues(namesOfRaceColumnsToShow); + return newSettings; + } + + /** + * Constructs a new {@link MultiRaceLeaderboardSettings} instance with all defaults and values taken from this + * instance except the namesOfRaceColumnsToShow. The defaults as well as the value of namesOfRaceColumnsToShow are + * set to the given values. + */ + public MultiRaceLeaderboardSettings withNamesOfRaceColumnsToShowDefaultsAndValues( + final Iterable namesOfRaceColumnsToShow) { + final MultiRaceLeaderboardSettings newSettings = withNamesOfRaceColumnsToShowDefaults(namesOfRaceColumnsToShow); + newSettings.namesOfRaceColumnsToShow.setValues(namesOfRaceColumnsToShow); + return newSettings; + } + + /** + * Constructs a new {@link MultiRaceLeaderboardSettings} instance with all defaults and values taken from this + * instance except of the values for activeRaceColumnSelectionStrategy, numberOfLastRacesToShow and + * namesOfRaceColumnsToShow which are taken from the given instance. + */ + public MultiRaceLeaderboardSettings withRaceColumnSelectionValuesFrom( + MultiRaceLeaderboardSettings settingsWithRaceColumnSelection) { + final MultiRaceLeaderboardSettings newSettings = new MultiRaceLeaderboardSettings(); + SettingsUtil.copyValuesAndDefaults(this, this, newSettings); + newSettings.activeRaceColumnSelectionStrategy + .setValue(settingsWithRaceColumnSelection.getActiveRaceColumnSelectionStrategy()); + newSettings.numberOfLastRacesToShow.setValue(settingsWithRaceColumnSelection.getNumberOfLastRacesToShow()); + newSettings.namesOfRaceColumnsToShow.setValues(settingsWithRaceColumnSelection.getNamesOfRaceColumnsToShow()); + return newSettings; + } + + /** + * Constructs a new {@link MultiRaceLeaderboardSettings} instance using defaults, resets the + * namesOfRaceColumnsToShow, sets the activeRaceColumnSelectionStrategy to last-n and uses the given value for + * numberOfLastRacesToShow. + */ + public static MultiRaceLeaderboardSettings createDefaultSettingsWithLastNRaceColumnSelection( + int numberOfLastRacesToShow) { + final MultiRaceLeaderboardSettings newSettings = new MultiRaceLeaderboardSettings(); + newSettings.namesOfRaceColumnsToShow.setValues(null); + newSettings.activeRaceColumnSelectionStrategy.setValue(RaceColumnSelectionStrategies.LAST_N); + newSettings.numberOfLastRacesToShow.setValue(numberOfLastRacesToShow); + return newSettings; + } + } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/MultipleMultiLeaderboardPanelLifecycle.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/MultipleMultiLeaderboardPanelLifecycle.java index b2c67912086..a67014efe85 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/MultipleMultiLeaderboardPanelLifecycle.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/MultipleMultiLeaderboardPanelLifecycle.java @@ -1,7 +1,8 @@ package com.sap.sailing.gwt.settings.client.leaderboard; +import java.util.Collections; + import com.sap.sailing.domain.common.DetailType; -import com.sap.sailing.domain.common.dto.AbstractLeaderboardDTO; import com.sap.sailing.gwt.ui.client.StringMessages; /** @@ -11,8 +12,8 @@ import com.sap.sailing.gwt.ui.client.StringMessages; public class MultipleMultiLeaderboardPanelLifecycle extends MultiRaceLeaderboardPanelLifecycle { public static final String MID = "mlb"; - public MultipleMultiLeaderboardPanelLifecycle(AbstractLeaderboardDTO leaderboard, StringMessages stringMessages, Iterable availableDetailTypes) { - super(leaderboard, stringMessages, availableDetailTypes); + public MultipleMultiLeaderboardPanelLifecycle(StringMessages stringMessages, Iterable availableDetailTypes) { + super(Collections.emptyList(), false, stringMessages, availableDetailTypes); } @Override @@ -21,8 +22,8 @@ public class MultipleMultiLeaderboardPanelLifecycle extends MultiRaceLeaderboard } @Override - public MultiRaceLeaderboardSettings extractDocumentSettings(MultiRaceLeaderboardSettings leaderboardSettings) { - return createDefaultSettings(); + public MultiRaceLeaderboardSettings extractDocumentSettings(MultiRaceLeaderboardSettings currentLeaderboardSettings) { + return currentLeaderboardSettings.withNamesOfRaceColumnsToShowDefaultsAndValues(Collections.emptyList()); } @Override diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/SingleRaceLeaderboardSettings.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/SingleRaceLeaderboardSettings.java index 5c85a5d8a37..bb63bc0d991 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/SingleRaceLeaderboardSettings.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/SingleRaceLeaderboardSettings.java @@ -35,4 +35,15 @@ public class SingleRaceLeaderboardSettings extends LeaderboardSettings { super.addChildSettings(); showRaceRankColumn = new BooleanSetting("racerank", this, false); } + + /** + * Constructs a new {@link SingleRaceLeaderboardSettings} instance using defaults except the values for + * raceDetailsToShow which are set to the given values. + */ + public static SingleRaceLeaderboardSettings createDefaultSettingsWithRaceDetailValues( + final Iterable raceDetailsToShow) { + final SingleRaceLeaderboardSettings newSettings = new SingleRaceLeaderboardSettings(false); + newSettings.raceDetailsToShow.setValues(raceDetailsToShow); + return newSettings; + } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/RaceTimePanelLifecycle.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/RaceTimePanelLifecycle.java index 743f5b81fd5..76fe935da46 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/RaceTimePanelLifecycle.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/RaceTimePanelLifecycle.java @@ -39,14 +39,4 @@ public class RaceTimePanelLifecycle implements public boolean hasSettings() { return true; } - - @Override - public RaceTimePanelSettings extractUserSettings(RaceTimePanelSettings settings) { - return settings; - } - - @Override - public RaceTimePanelSettings extractDocumentSettings(RaceTimePanelSettings settings) { - return settings; - } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/MultiCompetitorRaceChartLifecycle.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/MultiCompetitorRaceChartLifecycle.java index 1dc76a966d1..02947cde7bb 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/MultiCompetitorRaceChartLifecycle.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/MultiCompetitorRaceChartLifecycle.java @@ -48,16 +48,6 @@ public class MultiCompetitorRaceChartLifecycle implements ComponentLifecycle getAllowedDetailTypes() { return allowedDetailTypes; } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/WindChartLifecycle.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/WindChartLifecycle.java index b36087f659a..4cc00df0667 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/WindChartLifecycle.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/WindChartLifecycle.java @@ -36,14 +36,4 @@ public class WindChartLifecycle implements ComponentLifecycle public String getComponentId() { return ID; } - - @Override - public WindChartSettings extractUserSettings(WindChartSettings settings) { - return settings; - } - - @Override - public WindChartSettings extractDocumentSettings(WindChartSettings settings) { - return settings; - } } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/maneuver/ManeuverTableLifecycle.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/maneuver/ManeuverTableLifecycle.java index bb443da6d15..a24617990fb 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/maneuver/ManeuverTableLifecycle.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/maneuver/ManeuverTableLifecycle.java @@ -36,16 +36,4 @@ public class ManeuverTableLifecycle implements ComponentLifecycle extends A final boolean wasEmptyRaceColumnSelection = Util .isEmpty(raceColumnSelection.getSelectedRaceColumns()); updateLeaderboard(result); + // This constructs a new settings object with juse the default for namesOfRaceColumnsToShow being adjusted. + // In case the namesOfRaceColumnsToShow setting isn't changed this will also cause the value to change. + // This causes in consequence potentiallyChangedSettings to not be equal to currentSettings anymore. + // We then apply the new settings to make all new race columns visible. + // TODO check if there is an easier way to get to know if we need to reapply the settings. LS potentiallyChangedSettings = overrideDefaultsForNamesOfRaceColumns(currentSettings, result); // reapply, when this is the first time we received the race columns or if columns have diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/MultiLeaderboardProxyPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/MultiLeaderboardProxyPanel.java index 359b3fa29fe..0f1225abc85 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/MultiLeaderboardProxyPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/MultiLeaderboardProxyPanel.java @@ -20,7 +20,6 @@ import com.google.gwt.user.client.ui.TabPanel; import com.google.gwt.user.client.ui.VerticalPanel; import com.google.gwt.user.client.ui.Widget; import com.sap.sailing.domain.common.DetailType; -import com.sap.sailing.gwt.settings.client.leaderboard.LeaderboardSettingsFactory; import com.sap.sailing.gwt.settings.client.leaderboard.MultiRaceLeaderboardSettings; import com.sap.sailing.gwt.settings.client.leaderboard.MultipleMultiLeaderboardPanelLifecycle; import com.sap.sailing.gwt.ui.client.CompetitorSelectionModel; @@ -235,11 +234,10 @@ public class MultiLeaderboardProxyPanel extends AbstractLazyComponent() { @Override public void onSettingsReloaded(SingleRaceLeaderboardSettings patchedSettings) { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/PlayerMode.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/PlayerMode.java index 5a2e1567d00..05376c3a592 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/PlayerMode.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/PlayerMode.java @@ -5,7 +5,6 @@ import java.util.Date; import java.util.List; import com.sap.sailing.domain.common.DetailType; -import com.sap.sailing.gwt.settings.client.leaderboard.LeaderboardSettingsFactory; import com.sap.sailing.gwt.settings.client.leaderboard.SingleRaceLeaderboardSettings; import com.sap.sailing.gwt.ui.leaderboard.SingleRaceLeaderboardPanel; import com.sap.sse.common.Duration; @@ -35,7 +34,8 @@ public class PlayerMode extends AbstractRaceBoardMode { raceDetailsToShow.add(DetailType.RACE_DISPLAY_LEGS); raceDetailsToShow.add(DetailType.RACE_CURRENT_SPEED_OVER_GROUND_IN_KNOTS); raceDetailsToShow.add(DetailType.RACE_GAP_TO_LEADER_IN_SECONDS); - final SingleRaceLeaderboardSettings additiveSettings = LeaderboardSettingsFactory.getInstance().createNewSettingsWithCustomRaceDetails(raceDetailsToShow); + final SingleRaceLeaderboardSettings additiveSettings = SingleRaceLeaderboardSettings + .createDefaultSettingsWithRaceDetailValues(raceDetailsToShow); ((RaceBoardComponentContext) leaderboardPanel.getComponentContext()).addModesPatching(leaderboardPanel, additiveSettings, new OnSettingsReloadedCallback() { @Override diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/SingleRaceLeaderboardPanelLifecycle.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/SingleRaceLeaderboardPanelLifecycle.java index 6e06ca8f3eb..42bf1ebbeaa 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/SingleRaceLeaderboardPanelLifecycle.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/SingleRaceLeaderboardPanelLifecycle.java @@ -52,38 +52,6 @@ public class SingleRaceLeaderboardPanelLifecycle extends LeaderboardPanelLifecyc return settings; } - @Override - public SingleRaceLeaderboardSettings extractDocumentSettings(SingleRaceLeaderboardSettings currentLeaderboardSettings) { - SingleRaceLeaderboardSettings defaultLeaderboardSettings = createDefaultSettings(); - SingleRaceLeaderboardSettings contextSpecificLeaderboardSettings = new SingleRaceLeaderboardSettings( - currentLeaderboardSettings.getManeuverDetailsToShow(), currentLeaderboardSettings.getLegDetailsToShow(), - currentLeaderboardSettings.getRaceDetailsToShow(), currentLeaderboardSettings.getOverallDetailsToShow(), - currentLeaderboardSettings.getDelayBetweenAutoAdvancesInMilliseconds(), - currentLeaderboardSettings.isShowAddedScores(), - currentLeaderboardSettings.isShowCompetitorShortNameColumn(), - currentLeaderboardSettings.isShowCompetitorFullNameColumn(), - currentLeaderboardSettings.isShowCompetitorBoatInfoColumn(), - currentLeaderboardSettings.isShowCompetitorNationality(), - currentLeaderboardSettings.isShowRaceRankColumn()); - return SettingsUtil.copyValues(contextSpecificLeaderboardSettings, defaultLeaderboardSettings); - } - - @Override - public SingleRaceLeaderboardSettings extractUserSettings(SingleRaceLeaderboardSettings currentLeaderboardSettings) { - SingleRaceLeaderboardSettings defaultLeaderboardSettings = createDefaultSettings(); - SingleRaceLeaderboardSettings globalLeaderboardSettings = new SingleRaceLeaderboardSettings( - currentLeaderboardSettings.getManeuverDetailsToShow(), currentLeaderboardSettings.getLegDetailsToShow(), - currentLeaderboardSettings.getRaceDetailsToShow(), currentLeaderboardSettings.getOverallDetailsToShow(), - currentLeaderboardSettings.getDelayBetweenAutoAdvancesInMilliseconds(), - currentLeaderboardSettings.isShowAddedScores(), - currentLeaderboardSettings.isShowCompetitorShortNameColumn(), - currentLeaderboardSettings.isShowCompetitorFullNameColumn(), - currentLeaderboardSettings.isShowCompetitorBoatInfoColumn(), - currentLeaderboardSettings.isShowCompetitorNationality(), - currentLeaderboardSettings.isShowRaceRankColumn()); - return SettingsUtil.copyValues(globalLeaderboardSettings, defaultLeaderboardSettings); - } - @Override public SingleRaceLeaderboardSettingsDialogComponent getSettingsDialogComponent(SingleRaceLeaderboardSettings settings) { return new SingleRaceLeaderboardSettingsDialogComponent(settings, stringMessages, availableDetailTypes); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/StartAnalysisMode.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/StartAnalysisMode.java index bfd1ccd3c8c..46882fe9220 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/StartAnalysisMode.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/StartAnalysisMode.java @@ -12,7 +12,6 @@ import com.google.gwt.maps.client.events.idle.IdleMapEvent; import com.google.gwt.maps.client.events.idle.IdleMapHandler; import com.sap.sailing.domain.common.DetailType; import com.sap.sailing.gwt.settings.client.leaderboard.LeaderboardSettings; -import com.sap.sailing.gwt.settings.client.leaderboard.LeaderboardSettingsFactory; import com.sap.sailing.gwt.settings.client.leaderboard.SingleRaceLeaderboardSettings; import com.sap.sailing.gwt.ui.client.shared.charts.ChartSettings; import com.sap.sailing.gwt.ui.client.shared.charts.MultiCompetitorRaceChart; @@ -187,7 +186,8 @@ public class StartAnalysisMode extends RaceBoardModeWithPerRaceCompetitors { raceDetailsToShow.add(DetailType.SPEED_OVER_GROUND_WHEN_PASSING_START); raceDetailsToShow.add(DetailType.START_TACK); raceDetailsToShow.add(DetailType.RACE_GAP_TO_LEADER_IN_SECONDS); - final SingleRaceLeaderboardSettings additiveSettings = LeaderboardSettingsFactory.getInstance().createNewSettingsWithCustomRaceDetails(raceDetailsToShow); + final SingleRaceLeaderboardSettings additiveSettings = SingleRaceLeaderboardSettings + .createDefaultSettingsWithRaceDetailValues(raceDetailsToShow); ((RaceBoardComponentContext) leaderboardPanel.getComponentContext()).addModesPatching(leaderboardPanel, additiveSettings, new OnSettingsReloadedCallback() { @Override diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/WinningLanesMode.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/WinningLanesMode.java index 4b0d76037bf..b8164fdda18 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/WinningLanesMode.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/WinningLanesMode.java @@ -6,7 +6,6 @@ import java.util.List; import com.sap.sailing.domain.common.DetailType; import com.sap.sailing.domain.common.dto.CompetitorDTO; -import com.sap.sailing.gwt.settings.client.leaderboard.LeaderboardSettingsFactory; import com.sap.sailing.gwt.settings.client.leaderboard.SingleRaceLeaderboardSettings; import com.sap.sailing.gwt.ui.client.shared.racemap.RaceMap; import com.sap.sailing.gwt.ui.client.shared.racemap.RaceMapSettings; @@ -47,7 +46,8 @@ public class WinningLanesMode extends RaceBoardModeWithPerRaceCompetitors { raceDetailsToShow.add(DetailType.RACE_AVERAGE_SIGNED_CROSS_TRACK_ERROR_IN_METERS); raceDetailsToShow.add(DetailType.RACE_DISTANCE_TRAVELED); raceDetailsToShow.add(DetailType.RACE_TIME_TRAVELED); - final SingleRaceLeaderboardSettings additiveSettings = LeaderboardSettingsFactory.getInstance().createNewSettingsWithCustomRaceDetails(raceDetailsToShow); + final SingleRaceLeaderboardSettings additiveSettings = SingleRaceLeaderboardSettings + .createDefaultSettingsWithRaceDetailValues(raceDetailsToShow); ((RaceBoardComponentContext) leaderboardPanel.getComponentContext()).addModesPatching(leaderboardPanel, additiveSettings, new OnSettingsReloadedCallback() { @Override public void onSettingsReloaded(SingleRaceLeaderboardSettings patchedSettings) { diff --git a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/shared/components/ComponentLifecycle.java b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/shared/components/ComponentLifecycle.java index 7f0b7f4920d..8d6b0180bb8 100644 --- a/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/shared/components/ComponentLifecycle.java +++ b/java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/shared/components/ComponentLifecycle.java @@ -40,7 +40,9 @@ public interface ComponentLifecycle { * @return User Settings extracted from the provided settings * @see ComponentContext */ - S extractUserSettings(S settings); + default S extractUserSettings(S settings) { + return settings; + } /** * Extracts Document Settings from provided {@link Settings}. @@ -49,6 +51,8 @@ public interface ComponentLifecycle { * @return Document Settings extracted from the provided settings * @see ComponentContext */ - S extractDocumentSettings(S settings); + default S extractDocumentSettings(S settings) { + return settings; + } } \ No newline at end of file