eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-29 08:56:43 +00:00
Code Activity

fix for bug 1222 by extending the LeaderboardDescriptor constructor

Browse Source
This commit is contained in:
Axel Uhl
2013-02-21 00:38:27 +01:00
parent 80e4f034d9
commit 77febd205d
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardConfigPanel.java
+8 -8
View File
@@ -256,7 +256,7 @@ public class LeaderboardConfigPanel extends FormPanel implements RegattaDisplaye
} else {
if (leaderboardDTO.isRegattaLeaderboard) {
LeaderboardDescriptor descriptor = new LeaderboardDescriptor(leaderboardDTO.name,
null, leaderboardDTO.discardThresholds, leaderboardDTO.regattaName);
leaderboardDTO.displayName, null, leaderboardDTO.discardThresholds, leaderboardDTO.regattaName);
AbstractLeaderboardDialog dialog = new RegattaLeaderboardEditDialog(Collections
.unmodifiableCollection(otherExistingLeaderboard), Collections.unmodifiableCollection(allRegattas),
descriptor, stringMessages, errorReporter,
@@ -272,7 +272,7 @@ public class LeaderboardConfigPanel extends FormPanel implements RegattaDisplaye
});
dialog.show();
} else {
LeaderboardDescriptor descriptor = new LeaderboardDescriptor(leaderboardDTO.name, leaderboardDTO.scoringScheme, leaderboardDTO.discardThresholds);
LeaderboardDescriptor descriptor = new LeaderboardDescriptor(leaderboardDTO.name, leaderboardDTO.displayName, leaderboardDTO.scoringScheme, leaderboardDTO.discardThresholds);
FlexibleLeaderboardEditDialog dialog = new FlexibleLeaderboardEditDialog(Collections
.unmodifiableCollection(otherExistingLeaderboard),
descriptor, stringMessages, errorReporter,
@@ -954,9 +954,9 @@ public class LeaderboardConfigPanel extends FormPanel implements RegattaDisplaye
leaderboardSelectionChanged();
}
private void updateLeaderboard(final String oldLeaderboardName, final LeaderboardDescriptor leaderboardToUdate) {
sailingService.updateLeaderboard(oldLeaderboardName, leaderboardToUdate.getName(), leaderboardToUdate.getDisplayName(),
leaderboardToUdate.getDiscardThresholds(), new AsyncCallback<Void>() {
private void updateLeaderboard(final String oldLeaderboardName, final LeaderboardDescriptor leaderboardToUpdate) {
sailingService.updateLeaderboard(oldLeaderboardName, leaderboardToUpdate.getName(), leaderboardToUpdate.getDisplayName(),
leaderboardToUpdate.getDiscardThresholds(), new AsyncCallback<Void>() {
@Override
public void onFailure(Throwable t) {
errorReporter.reportError("Error trying to update leaderboard " + oldLeaderboardName + ": "
@@ -968,9 +968,9 @@ public class LeaderboardConfigPanel extends FormPanel implements RegattaDisplaye
for (int i = 0; i < leaderboardList.getList().size(); i++) {
StrippedLeaderboardDTO dao = leaderboardList.getList().get(i);
if (dao.name.equals(oldLeaderboardName)) {
dao.name = leaderboardToUdate.getName();
dao.displayName = leaderboardToUdate.getDisplayName();
dao.discardThresholds = leaderboardToUdate.getDiscardThresholds();
dao.name = leaderboardToUpdate.getName();
dao.displayName = leaderboardToUpdate.getDisplayName();
dao.discardThresholds = leaderboardToUpdate.getDiscardThresholds();
break;
}
}
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardDescriptor.java
+4 -2
View File
@@ -25,15 +25,17 @@ public class LeaderboardDescriptor {
public LeaderboardDescriptor() {
}
public LeaderboardDescriptor(String name, ScoringSchemeType scoringScheme, int[] discardThresholds, String regattaName) {
public LeaderboardDescriptor(String name, String displayName, ScoringSchemeType scoringScheme, int[] discardThresholds, String regattaName) {
this.name = name;
this.displayName = displayName;
this.scoringScheme = scoringScheme;
this.discardThresholds = discardThresholds;
this.regattaName = regattaName;
}
public LeaderboardDescriptor(String name, ScoringSchemeType scoringScheme, int[] discardThresholds) {
public LeaderboardDescriptor(String name, String displayName, ScoringSchemeType scoringScheme, int[] discardThresholds) {
this.name = name;
this.displayName = displayName;
this.scoringScheme = scoringScheme;
this.discardThresholds = discardThresholds;
}
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardGroupDialog.java
+1 -1
View File
@@ -107,9 +107,9 @@ public class LeaderboardGroupDialog extends DataEntryDialog<LeaderboardGroupDial
final List<StrippedLeaderboardDTO> emptyStrippedLeaderboardDTOList = Collections.emptyList();
errorMessage = new FlexibleLeaderboardDialog.LeaderboardParameterValidator(stringMessages,
emptyStrippedLeaderboardDTOList).getErrorMessage(new LeaderboardDescriptor("Overall",
/* displayName */ null,
groupToValidate.getOverallLeaderboardScoringSchemeType(),
groupToValidate.getOverallLeaderboardDiscardThresholds()));
;
}
return errorMessage;
}