Merge branch 'bug4702'

This commit is contained in:
Benjamin Barth committed 2018-09-05 16:27:59 +02:00
commit 2aa0218047
23 files changed
+135 -294

No files matched your search

@@ -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<T extends AbstractEventReg
public SharedLeaderboardRegattaTabView() {
}
public void createSharedLeaderboardPanel(String leaderboardName, RegattaAnalyticsDataManager regattaAnalyticsManager, UserService userService,
String placeToken, final Consumer<MultiRaceLeaderboardPanel> consumer, Iterable<DetailType> availableDetailTypes) {
public void createSharedLeaderboardPanel(String leaderboardName,
RegattaAnalyticsDataManager regattaAnalyticsManager, UserService userService, String placeToken,
final Consumer<MultiRaceLeaderboardPanel> consumer, Iterable<DetailType> availableDetailTypes) {
// FIXME remove
boolean autoExpandLastRaceColumn = GwtHttpRequestUtils.getBooleanParameter(
LeaderboardUrlSettings.PARAM_AUTO_EXPAND_LAST_RACE_COLUMN, false);
final PlaceBasedComponentContextWithSettingsStorage<MultiRaceLeaderboardSettings> componentContext = createLeaderboardComponentContext(leaderboardName, userService,
placeToken, availableDetailTypes);
boolean autoExpandLastRaceColumn = GwtHttpRequestUtils
.getBooleanParameter(LeaderboardUrlSettings.PARAM_AUTO_EXPAND_LAST_RACE_COLUMN, false);
final PlaceBasedComponentContextWithSettingsStorage<MultiRaceLeaderboardSettings> componentContext = createLeaderboardComponentContext(
leaderboardName, userService, placeToken, availableDetailTypes);
componentContext.getInitialSettings(new DefaultOnSettingsLoadedCallback<MultiRaceLeaderboardSettings>() {
@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<T extends AbstractEventReg
initialLeaderboardSizeCalculated = true;
if (newWidth > 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<MultiRaceLeaderboardSettings>() {
@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);
@@ -160,7 +160,7 @@ public class EventSeriesLeaderboardsTabView extends Composite implements SeriesT
private ComponentContext<MultiRaceLeaderboardSettings> createLeaderboardComponentContext(String leaderboardName, UserService userService,
String placeToken, Iterable<DetailType> 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<MultiRaceLeaderboardSettings> componentContext = new PlaceBasedComponentContextWithSettingsStorage<>(
@@ -60,9 +60,4 @@ public class RegattaRaceStatesComponentLifecycle implements ComponentLifecycle<R
return settings.createInstanceWithSettings(null, null, settings.isShowOnlyRacesOfSameDay(),
settings.isShowOnlyCurrentlyRunningRaces());
}
@Override
public RegattaRaceStatesSettings extractDocumentSettings(RegattaRaceStatesSettings settings) {
return settings;
}
}
@@ -1,87 +0,0 @@
package com.sap.sailing.gwt.settings.client.leaderboard;
import java.util.Collection;
import java.util.List;
import com.sap.sailing.domain.common.DetailType;
import com.sap.sse.common.settings.generic.support.SettingsUtil;
/**
* A factory class creating leaderboard settings for different contexts (user role, live or replay mode, etc.
*/
public class LeaderboardSettingsFactory {
private static LeaderboardSettingsFactory instance;
public static LeaderboardSettingsFactory getInstance() {
if (instance == null) {
instance = new LeaderboardSettingsFactory();
}
return instance;
}
public MultiRaceLeaderboardSettings createNewDefaultSettingsWithRaceColumns(List<String> 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<DetailType> 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<DetailType> maneuverDetails = settingsWithDetails.getManeuverDetailsToShow();
Collection<DetailType> legDetails = settingsWithDetails.getLegDetailsToShow();
Collection<DetailType> raceDetails = settingsWithDetails.getRaceDetailsToShow();
Collection<DetailType> overallDetailsToShow = settingsWithDetails.getOverallDetailsToShow();
Long refreshIntervalInMs = settingsWithDetails.getDelayBetweenAutoAdvancesInMilliseconds();
RaceColumnSelectionStrategies strategy = settingsWithRaceSelection.getActiveRaceColumnSelectionStrategy();
List<String> 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());
}
}
@@ -12,7 +12,7 @@ public class MetaLeaderboardPerspectiveLifecycle extends AbstractLeaderboardPers
public MetaLeaderboardPerspectiveLifecycle(StringMessages stringMessages, AbstractLeaderboardDTO leaderboard, Iterable<DetailType> availableDetailTypes) {
super(stringMessages, leaderboard, true, availableDetailTypes);
multiLeaderboardPanelLifecycle = new MultipleMultiLeaderboardPanelLifecycle(null, stringMessages, availableDetailTypes);
multiLeaderboardPanelLifecycle = new MultipleMultiLeaderboardPanelLifecycle(stringMessages, availableDetailTypes);
addLifeCycle(multiLeaderboardPanelLifecycle);
}
@@ -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;
}
}
@@ -15,44 +15,22 @@ public class MultiRaceLeaderboardPanelLifecycle extends LeaderboardPanelLifecycl
public MultiRaceLeaderboardPanelLifecycle(AbstractLeaderboardDTO leaderboard, StringMessages stringMessages,
Iterable<DetailType> availableDetailTypes) {
super(stringMessages, availableDetailTypes);
this.namesOfRaceColumns = leaderboard != null ? leaderboard.getNamesOfRaceColumns() : new ArrayList<String>();
this.canBoatInfoBeShown = leaderboard != null ? !leaderboard.canBoatsOfCompetitorsChangePerRace : false;
this(leaderboard != null ? leaderboard.getNamesOfRaceColumns() : new ArrayList<String>(),
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<String> namesOfRaceColumns, boolean canBoatInfoBeShown, StringMessages stringMessages,
Iterable<DetailType> 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;
}
}
@@ -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<String> namesOfRaceColumnsToShow) {
super(false);
this.namesOfRaceColumnsToShow.setValues(namesOfRaceColumnsToShow);
this.namesOfRaceColumnsToShow.setValues(namesOfRaceColumnsToShow);
}
public MultiRaceLeaderboardSettings overrideDefaultsForNamesOfRaceColumns(List<String> 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<String> 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<String> 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;
}
}
@@ -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<DetailType> availableDetailTypes) {
super(leaderboard, stringMessages, availableDetailTypes);
public MultipleMultiLeaderboardPanelLifecycle(StringMessages stringMessages, Iterable<DetailType> 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
@@ -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<DetailType> raceDetailsToShow) {
final SingleRaceLeaderboardSettings newSettings = new SingleRaceLeaderboardSettings(false);
newSettings.raceDetailsToShow.setValues(raceDetailsToShow);
return newSettings;
}
}
@@ -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;
}
}
@@ -48,16 +48,6 @@ public class MultiCompetitorRaceChartLifecycle implements ComponentLifecycle<Mul
return true;
}
@Override
public MultiCompetitorRaceChartSettings extractUserSettings(MultiCompetitorRaceChartSettings settings) {
return settings;
}
@Override
public MultiCompetitorRaceChartSettings extractDocumentSettings(MultiCompetitorRaceChartSettings settings) {
return settings;
}
public Iterable<DetailType> getAllowedDetailTypes() {
return allowedDetailTypes;
}
@@ -36,14 +36,4 @@ public class WindChartLifecycle implements ComponentLifecycle<WindChartSettings>
public String getComponentId() {
return ID;
}
@Override
public WindChartSettings extractUserSettings(WindChartSettings settings) {
return settings;
}
@Override
public WindChartSettings extractDocumentSettings(WindChartSettings settings) {
return settings;
}
}
@@ -36,16 +36,4 @@ public class ManeuverTableLifecycle implements ComponentLifecycle<ManeuverTableS
public String getComponentId() {
return ID;
}
@Override
public ManeuverTableSettings extractUserSettings(ManeuverTableSettings settings) {
//TODO
return settings;
}
@Override
public ManeuverTableSettings extractDocumentSettings(ManeuverTableSettings settings) {
//TODO
return settings;
}
}
@@ -2465,6 +2465,11 @@ public abstract class LeaderboardPanel<LS extends LeaderboardSettings> 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
@@ -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<MultiRaceL
MultiRaceLeaderboardSettings toMerge = contextStore.get(newSelectedLeaderboardName);
if (toMerge != null) {
toMerge = mergeContext(loadedSettings, toMerge);
toMerge = loadedSettings.withRaceColumnSelectionValuesFrom(toMerge);
} else {
toMerge = loadedSettings;
}
MultiRaceLeaderboardPanel newSelectedLeaderboardPanel = new MultiRaceLeaderboardPanel(this, getComponentContext(),
sailingServiceFactory.apply(newSelectedLeaderboardName),
@@ -266,10 +264,6 @@ public class MultiLeaderboardProxyPanel extends AbstractLazyComponent<MultiRaceL
this.selectedLeaderboardName = newSelectedLeaderboardName;
}
private MultiRaceLeaderboardSettings mergeContext(MultiRaceLeaderboardSettings settings, MultiRaceLeaderboardSettings toMerge) {
return LeaderboardSettingsFactory.getInstance().mergeLeaderboardSettings(toMerge, settings);
}
@Override
public void setVisible(boolean visible) {
super.setVisible(visible);
@@ -111,7 +111,7 @@ public class MultiRaceLeaderboardPanel extends LeaderboardPanel<MultiRaceLeaderb
@Override
protected MultiRaceLeaderboardSettings overrideDefaultsForNamesOfRaceColumns(
MultiRaceLeaderboardSettings currentSettings, LeaderboardDTO result) {
return currentSettings.overrideDefaultsForNamesOfRaceColumns(result.getNamesOfRaceColumns());
return currentSettings.withNamesOfRaceColumnsToShowDefaults(result.getNamesOfRaceColumns());
}
@Override
@@ -4,7 +4,6 @@ import java.util.ArrayList;
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.impl.MillisecondsTimePoint;
@@ -53,7 +52,8 @@ public class FullAnalysisMode extends AbstractRaceBoardMode {
raceDetailsToShow.add(DetailType.RACE_AVERAGE_SPEED_OVER_GROUND_IN_KNOTS);
raceDetailsToShow.add(DetailType.RACE_DISTANCE_TRAVELED);
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<SingleRaceLeaderboardSettings>() {
@Override
public void onSettingsReloaded(SingleRaceLeaderboardSettings patchedSettings) {
@@ -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<SingleRaceLeaderboardSettings>() {
@Override
@@ -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);
@@ -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<SingleRaceLeaderboardSettings>() {
@Override
@@ -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<SingleRaceLeaderboardSettings>() {
@Override
public void onSettingsReloaded(SingleRaceLeaderboardSettings patchedSettings) {
@@ -40,7 +40,9 @@ public interface ComponentLifecycle<S extends Settings> {
* @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<S extends Settings> {
* @return Document Settings extracted from the provided settings
* @see ComponentContext
*/
S extractDocumentSettings(S settings);
default S extractDocumentSettings(S settings) {
return settings;
}
}