From 728d231fafa008b8944eb084bbecbb213db92164 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Sat, 23 Dec 2023 12:19:14 +0100 Subject: [PATCH] bug5927: introduce constant for "none"; renamed action to COLORED_TAILS --- .../sailing/domain/common/security/SecuredDomainType.java | 2 +- .../sailing/domain/common/subscription/PremiumRole.java | 2 +- .../sap/sailing/gwt/ui/client/shared/racemap/RaceMap.java | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/security/SecuredDomainType.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/security/SecuredDomainType.java index aca3e1e604b..f812bbdb880 100644 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/security/SecuredDomainType.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/security/SecuredDomainType.java @@ -67,7 +67,7 @@ public class SecuredDomainType extends HasPermissionsImpl { SIMULATOR, VIEWSTREAMLETS, VIEWANALYSISCHARTS, - DETAILTYPES; + COLORED_TAILS; private static final Action[] ALL_ACTIONS = DefaultActions.plus(TrackedRaceActions.values()); diff --git a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/subscription/PremiumRole.java b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/subscription/PremiumRole.java index 10346154529..06f27ea1aa5 100644 --- a/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/subscription/PremiumRole.java +++ b/java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/subscription/PremiumRole.java @@ -29,7 +29,7 @@ public class PremiumRole extends RolePrototype { WildcardPermission.builder().withTypes(SecuredDomainType.TRACKED_RACE) .withActions(SecuredDomainType.TrackedRaceActions.VIEWANALYSISCHARTS).build(), WildcardPermission.builder().withTypes(SecuredDomainType.TRACKED_RACE) - .withActions(SecuredDomainType.TrackedRaceActions.DETAILTYPES).build(), + .withActions(SecuredDomainType.TrackedRaceActions.COLORED_TAILS).build(), WildcardPermission.builder().withTypes(SecuredDomainType.LEADERBOARD) .withActions(SecuredDomainType.LeaderboardActions.PREMIUM_LEADERBOARD_INFORMATION).build()); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.java index 0b6a853d1f2..fd71acd288c 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.java @@ -2888,8 +2888,9 @@ public class RaceMap extends AbstractCompositeComponent impleme selectedDetailType = null; metricOverlay.setVisible(false); // create new premium list box - SailingPremiumListBox lb = new SailingPremiumListBox(stringMessages.none(), "none", - TrackedRaceActions.DETAILTYPES, paywallResolver, raceMapLifecycle.getRaceDTO()); + final String EMPTY_VALUE = "none"; + SailingPremiumListBox lb = new SailingPremiumListBox(stringMessages.none(), EMPTY_VALUE, + TrackedRaceActions.COLORED_TAILS, paywallResolver, raceMapLifecycle.getRaceDTO()); fillItemsFromAvailableDetailTypes(lb); lb.setVisibleItemCount(1); lb.addChangeHandler(new ChangeHandler() { @@ -2897,7 +2898,7 @@ public class RaceMap extends AbstractCompositeComponent impleme public void onChange(ChangeEvent event) { String value = lb.getSelectedValue(); DetailType previous = selectedDetailType; - if (value == null || value.equals("none")) { + if (value == null || value.equals(EMPTY_VALUE)) { selectedDetailType = null; metricOverlay.setVisible(false); } else {