mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-10-23 12:33:53 +00:00
Removed unused code
This commit is contained in:
Steffen Schaefer committed
1 parent
1c159749b2
commit
4c6d70dca9
2 files changed
-225
No files matched your search
-81
@@ -3,7 +3,6 @@ package com.sap.sailing.gwt.ui.leaderboard;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import com.sap.sailing.domain.common.DetailType;
|
||||
import com.sap.sailing.gwt.common.settings.converter.DetailTypeStringToEnumConverter;
|
||||
@@ -307,86 +306,6 @@ public class LeaderboardSettings extends AbstractGenericSerializableSettings {
|
||||
return showOverallColumnWithNumberOfRacesCompletedPerCompetitor.getValue();
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructs {@link LeaderboardSettings} from the URL parameters found
|
||||
*/
|
||||
public static LeaderboardSettings createLeaderboardSettingsFromURLParameters(Map<String, List<String>> parameterMap) {
|
||||
LeaderboardSettings result;
|
||||
Long refreshIntervalMillis = parameterMap.containsKey(PARAM_REFRESH_INTERVAL_MILLIS) ? Long
|
||||
.valueOf(parameterMap.get(PARAM_REFRESH_INTERVAL_MILLIS).get(0)) : null;
|
||||
RaceColumnSelectionStrategies raceColumnSelectionStrategy;
|
||||
final Integer numberOfLastRacesToShow;
|
||||
if (parameterMap.containsKey(PARAM_NAME_LAST_N)) {
|
||||
raceColumnSelectionStrategy = RaceColumnSelectionStrategies.LAST_N;
|
||||
numberOfLastRacesToShow = Integer.valueOf(parameterMap.get(PARAM_NAME_LAST_N).get(0));
|
||||
} else {
|
||||
raceColumnSelectionStrategy = RaceColumnSelectionStrategies.EXPLICIT;
|
||||
numberOfLastRacesToShow = null;
|
||||
}
|
||||
if (parameterMap.containsKey(PARAM_RACE_NAME) || parameterMap.containsKey(PARAM_RACE_DETAIL) ||
|
||||
parameterMap.containsKey(PARAM_LEG_DETAIL) || parameterMap.containsKey(PARAM_MANEUVER_DETAIL) ||
|
||||
parameterMap.containsKey(PARAM_OVERALL_DETAIL) || parameterMap.containsKey(PARAM_SHOW_ADDED_SCORES) ||
|
||||
parameterMap.containsKey(PARAM_SHOW_OVERALL_COLUMN_WITH_NUMBER_OF_RACES_COMPLETED)) {
|
||||
List<DetailType> maneuverDetails = getDetailTypeListFromParamValue(parameterMap.get(PARAM_MANEUVER_DETAIL));
|
||||
List<DetailType> raceDetails = getDetailTypeListFromParamValue(parameterMap.get(PARAM_RACE_DETAIL));
|
||||
List<DetailType> overallDetails = getDetailTypeListFromParamValue(parameterMap.get(PARAM_OVERALL_DETAIL));
|
||||
List<DetailType> legDetails = getDetailTypeListFromParamValue(parameterMap.get(PARAM_LEG_DETAIL));
|
||||
List<String> namesOfRacesToShow = getStringListFromParamValue(parameterMap.get(PARAM_RACE_NAME));
|
||||
boolean showAddedScores = parameterMap.containsKey(PARAM_SHOW_ADDED_SCORES) ?
|
||||
Boolean.valueOf(parameterMap.get(PARAM_SHOW_ADDED_SCORES).get(0)) : false;
|
||||
boolean showOverallColumnWithNumberOfRacesSailedPerCompetitor = parameterMap.containsKey(PARAM_SHOW_OVERALL_COLUMN_WITH_NUMBER_OF_RACES_COMPLETED) ?
|
||||
Boolean.valueOf(parameterMap.get(PARAM_SHOW_OVERALL_COLUMN_WITH_NUMBER_OF_RACES_COMPLETED).get(0)) : false;
|
||||
boolean autoExpandPreSelectedRace = parameterMap.containsKey(PARAM_AUTO_EXPAND_PRESELECTED_RACE) ?
|
||||
Boolean.valueOf(parameterMap.get(PARAM_AUTO_EXPAND_PRESELECTED_RACE).get(0)) :
|
||||
(namesOfRacesToShow != null && namesOfRacesToShow.size() == 1);
|
||||
boolean showCompetitorSailIdColumn = true;
|
||||
boolean showCompetitorFullNameColumn = true;
|
||||
if (parameterMap.containsKey(LeaderboardUrlSettings.PARAM_SHOW_COMPETITOR_NAME_COLUMNS)) {
|
||||
String value = parameterMap.get(LeaderboardUrlSettings.PARAM_SHOW_COMPETITOR_NAME_COLUMNS).get(0);
|
||||
if (value.equals(LeaderboardUrlSettings.COMPETITOR_NAME_COLUMN_FULL_NAME)) {
|
||||
showCompetitorSailIdColumn = false;
|
||||
} else if (value.equals(LeaderboardUrlSettings.COMPETITOR_NAME_COLUMN_SAIL_ID)) {
|
||||
showCompetitorFullNameColumn = false;
|
||||
} else if (value.trim().equals("")) {
|
||||
showCompetitorFullNameColumn = false;
|
||||
showCompetitorSailIdColumn = false;
|
||||
}
|
||||
}
|
||||
result = new LeaderboardSettings(maneuverDetails, legDetails, raceDetails, overallDetails,
|
||||
/* namesOfRaceColumnsToShow */ null,
|
||||
namesOfRacesToShow, numberOfLastRacesToShow,
|
||||
autoExpandPreSelectedRace, refreshIntervalMillis, /* sort by column */ (namesOfRacesToShow != null && !namesOfRacesToShow.isEmpty()) ?
|
||||
namesOfRacesToShow.get(0) : null,
|
||||
/* ascending */ true, /* updateUponPlayStateChange */ raceDetails.isEmpty() && legDetails.isEmpty(),
|
||||
raceColumnSelectionStrategy, showAddedScores, showOverallColumnWithNumberOfRacesSailedPerCompetitor,
|
||||
showCompetitorSailIdColumn, showCompetitorFullNameColumn);
|
||||
} else {
|
||||
return new LeaderboardSettings(refreshIntervalMillis, numberOfLastRacesToShow, raceColumnSelectionStrategy);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
private static List<DetailType> getDetailTypeListFromParamValue(List<String> list) {
|
||||
List<DetailType> result = new ArrayList<DetailType>();
|
||||
if (list != null) {
|
||||
for (String entry : list) {
|
||||
try {
|
||||
result.add(DetailType.valueOf(entry));
|
||||
} catch (IllegalArgumentException e) {
|
||||
}
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
private static List<String> getStringListFromParamValue(List<String> list) {
|
||||
List<String> result = new ArrayList<String>();
|
||||
if (list != null) {
|
||||
result.addAll(list);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
public boolean isShowCompetitorSailIdColumn() {
|
||||
return showCompetitorSailIdColumn.getValue();
|
||||
}
|
||||
|
||||
-144
@@ -1,9 +1,6 @@
|
||||
package com.sap.sailing.gwt.ui.leaderboard;
|
||||
|
||||
import com.google.gwt.user.client.Window;
|
||||
import com.sap.sailing.domain.common.DetailType;
|
||||
import com.sap.sse.common.settings.AbstractSettings;
|
||||
import com.sap.sse.gwt.client.URLEncoder;
|
||||
|
||||
public class LeaderboardUrlSettings extends AbstractSettings {
|
||||
public static final String PARAM_LEADERBOARD_GROUP_NAME = "leaderboardGroupName";
|
||||
@@ -53,146 +50,5 @@ public class LeaderboardUrlSettings extends AbstractSettings {
|
||||
* number specified by the parameter.
|
||||
*/
|
||||
public static final String PARAM_NAME_LAST_N = "lastN";
|
||||
|
||||
private final LeaderboardSettings leaderboardSettings;
|
||||
private final boolean embedded;
|
||||
private final boolean hideToolbar;
|
||||
private final boolean showRaceDetails;
|
||||
private final boolean autoExpandLastRaceColumn;
|
||||
private final boolean autoRefresh;
|
||||
private final boolean showCharts;
|
||||
private final DetailType chartDetail;
|
||||
private final boolean showOverallLeaderboard;
|
||||
private final boolean showSeriesLeaderboards;
|
||||
|
||||
public LeaderboardUrlSettings(LeaderboardSettings leaderboardSettings, boolean embedded,
|
||||
boolean hideToolbar, boolean showRaceDetails, boolean autoRefresh, boolean autoExpandLastRaceColumn,
|
||||
boolean showCharts, DetailType chartDetail, boolean showOverallLeaderboard, boolean showSeriesLeaderboards) {
|
||||
super();
|
||||
this.leaderboardSettings = leaderboardSettings;
|
||||
this.embedded = embedded;
|
||||
this.hideToolbar = hideToolbar;
|
||||
this.showRaceDetails = showRaceDetails;
|
||||
this.autoRefresh = autoRefresh;
|
||||
this.autoExpandLastRaceColumn = autoExpandLastRaceColumn;
|
||||
this.showCharts = showCharts;
|
||||
this.chartDetail = chartDetail;
|
||||
this.showOverallLeaderboard = showOverallLeaderboard;
|
||||
this.showSeriesLeaderboards = showSeriesLeaderboards;
|
||||
}
|
||||
|
||||
public LeaderboardSettings getLeaderboardSettings() {
|
||||
return leaderboardSettings;
|
||||
}
|
||||
|
||||
public boolean isEmbedded() {
|
||||
return embedded;
|
||||
}
|
||||
|
||||
public boolean isShowRaceDetails() {
|
||||
return showRaceDetails;
|
||||
}
|
||||
|
||||
public boolean isAutoRefresh() {
|
||||
return autoRefresh;
|
||||
}
|
||||
|
||||
public boolean isAutoExpandLastRaceColumn() {
|
||||
return autoExpandLastRaceColumn;
|
||||
}
|
||||
|
||||
public boolean isHideToolbar() {
|
||||
return hideToolbar;
|
||||
}
|
||||
|
||||
public boolean isShowCharts() {
|
||||
return showCharts;
|
||||
}
|
||||
|
||||
public DetailType getChartDetail() {
|
||||
return chartDetail;
|
||||
}
|
||||
|
||||
public boolean isShowOverallLeaderboard() {
|
||||
return showOverallLeaderboard;
|
||||
}
|
||||
|
||||
public boolean isShowSeriesLeaderboards() {
|
||||
return showSeriesLeaderboards;
|
||||
}
|
||||
|
||||
/**
|
||||
* Assembles a URL for a leaderboard that displays with the <code>settings</code> and <code>embedded</code> mode
|
||||
* as specified by the parameters.
|
||||
*/
|
||||
public static String getUrl(String leaderboardName, String leaderboardDisplayName, LeaderboardUrlSettings settings) {
|
||||
StringBuilder overallDetails = new StringBuilder();
|
||||
for (DetailType overallDetail : settings.getLeaderboardSettings().getOverallDetailsToShow()) {
|
||||
overallDetails.append('&');
|
||||
overallDetails.append(LeaderboardUrlSettings.PARAM_OVERALL_DETAIL);
|
||||
overallDetails.append('=');
|
||||
overallDetails.append(overallDetail.name());
|
||||
}
|
||||
StringBuilder legDetails = new StringBuilder();
|
||||
for (DetailType legDetail : settings.getLeaderboardSettings().getLegDetailsToShow()) {
|
||||
legDetails.append('&');
|
||||
legDetails.append(LeaderboardUrlSettings.PARAM_LEG_DETAIL);
|
||||
legDetails.append('=');
|
||||
legDetails.append(legDetail.name());
|
||||
}
|
||||
StringBuilder raceDetails = new StringBuilder();
|
||||
for (DetailType raceDetail : settings.getLeaderboardSettings().getRaceDetailsToShow()) {
|
||||
raceDetails.append('&');
|
||||
raceDetails.append(LeaderboardUrlSettings.PARAM_RACE_DETAIL);
|
||||
raceDetails.append('=');
|
||||
raceDetails.append(raceDetail.name());
|
||||
}
|
||||
StringBuilder maneuverDetails = new StringBuilder();
|
||||
for (DetailType maneuverDetail : settings.getLeaderboardSettings().getManeuverDetailsToShow()) {
|
||||
maneuverDetails.append('&');
|
||||
maneuverDetails.append(LeaderboardUrlSettings.PARAM_MANEUVER_DETAIL);
|
||||
maneuverDetails.append('=');
|
||||
maneuverDetails.append(maneuverDetail.name());
|
||||
}
|
||||
StringBuilder additionalOverallParams = new StringBuilder();
|
||||
additionalOverallParams.append('&');
|
||||
additionalOverallParams.append(LeaderboardUrlSettings.PARAM_SHOW_ADDED_SCORES);
|
||||
additionalOverallParams.append('=');
|
||||
additionalOverallParams.append(settings.getLeaderboardSettings().isShowAddedScores());
|
||||
if (!settings.getLeaderboardSettings().isShowCompetitorSailIdColumn() || !settings.getLeaderboardSettings().isShowCompetitorFullNameColumn()) {
|
||||
additionalOverallParams.append('&');
|
||||
additionalOverallParams.append(LeaderboardUrlSettings.PARAM_SHOW_COMPETITOR_NAME_COLUMNS);
|
||||
additionalOverallParams.append('=');
|
||||
if (settings.getLeaderboardSettings().isShowCompetitorSailIdColumn()) {
|
||||
additionalOverallParams.append(LeaderboardUrlSettings.COMPETITOR_NAME_COLUMN_SAIL_ID);
|
||||
} else if (settings.getLeaderboardSettings().isShowCompetitorFullNameColumn()) {
|
||||
additionalOverallParams.append(LeaderboardUrlSettings.COMPETITOR_NAME_COLUMN_FULL_NAME);
|
||||
}
|
||||
}
|
||||
|
||||
String debugParam = Window.Location.getParameter("gwt.codesvr");
|
||||
String link = URLEncoder.encode("/gwt/Leaderboard.html?name=" + leaderboardName
|
||||
+ (settings.isShowRaceDetails() ? "&"+LeaderboardUrlSettings.PARAM_SHOW_RACE_DETAILS+"=true" : "")
|
||||
+ (leaderboardDisplayName != null ? "&displayName="+leaderboardDisplayName : "")
|
||||
+ (settings.isEmbedded() ? "&"+LeaderboardUrlSettings.PARAM_EMBEDDED+"=true" : "")
|
||||
+ (settings.isHideToolbar() ? "&"+LeaderboardUrlSettings.PARAM_HIDE_TOOLBAR+"=true" : "")
|
||||
+ (settings.isShowCharts() ? "&"+LeaderboardUrlSettings.PARAM_SHOW_CHARTS+"=true" : "")
|
||||
+ (settings.isShowCharts() ? "&"+LeaderboardUrlSettings.PARAM_CHART_DETAIL+"="+settings.getChartDetail().name() : "")
|
||||
+ (settings.isShowOverallLeaderboard() ? "&"+LeaderboardUrlSettings.PARAM_SHOW_OVERALL_LEADERBOARD+"=true" : "")
|
||||
+ (settings.isShowSeriesLeaderboards() ? "&"+LeaderboardUrlSettings.PARAM_SHOW_SERIES_LEADERBOARDS+"=true" : "")
|
||||
+ (!settings.isAutoRefresh() || (settings.getLeaderboardSettings().getDelayBetweenAutoAdvancesInMilliseconds() == null &&
|
||||
settings.getLeaderboardSettings().getDelayBetweenAutoAdvancesInMilliseconds() != 0) ? "" :
|
||||
"&"+LeaderboardUrlSettings.PARAM_REFRESH_INTERVAL_MILLIS+"="+settings.getLeaderboardSettings().getDelayBetweenAutoAdvancesInMilliseconds())
|
||||
+ legDetails.toString()
|
||||
+ raceDetails.toString()
|
||||
+ overallDetails.toString()
|
||||
+ maneuverDetails.toString()
|
||||
+ (settings.isAutoExpandLastRaceColumn() ? "&"+LeaderboardUrlSettings.PARAM_AUTO_EXPAND_LAST_RACE_COLUMN+"=true" : "")
|
||||
+ (settings.getLeaderboardSettings().getNumberOfLastRacesToShow() == null ? "" :
|
||||
"&"+LeaderboardUrlSettings.PARAM_NAME_LAST_N+"="+settings.getLeaderboardSettings().getNumberOfLastRacesToShow())
|
||||
+ additionalOverallParams.toString()
|
||||
+ (debugParam != null && !debugParam.isEmpty() ? "&gwt.codesvr=" + debugParam : ""));
|
||||
return link;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user