eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-10 06:10:56 +00:00
Code Activity

fixing bug 749: discard thresholds must be filled from left to right

Browse Source
This commit is contained in:
Axel Uhl committed 2012-06-11 15:41:09 +02:00
1 parent 01022bcb76
commit 2b58081e38
1 file changed
+12 -5
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/LeaderboardDialog.java
+12 -5
View File
@@ -49,7 +49,9 @@ public abstract class LeaderboardDialog extends DataEntryDialog<StrippedLeaderbo
// TODO what are correct values for discarding Thresholds?
if (0 < leaderboardToValidate.discardThresholds.length){
discardThresholdsAscending = discardThresholdsAscending
&& leaderboardToValidate.discardThresholds[i - 1] < leaderboardToValidate.discardThresholds[i];
&& leaderboardToValidate.discardThresholds[i - 1] < leaderboardToValidate.discardThresholds[i]
// and if one box is empty, all subsequent boxes need to be empty too
&& (leaderboardToValidate.discardThresholds[i] == 0 || leaderboardToValidate.discardThresholds[i-1] > 0);
}
}
@@ -85,10 +87,15 @@ public abstract class LeaderboardDialog extends DataEntryDialog<StrippedLeaderbo
@Override
protected StrippedLeaderboardDTO getResult() {
List<Integer> discardThresholds = new ArrayList<Integer>();
for (int i = 0; i < discardThresholdBoxes.length; i++) {
if (discardThresholdBoxes[i].getValue() != null
&& discardThresholdBoxes[i].getValue().toString().length() > 0) {
discardThresholds.add(discardThresholdBoxes[i].getValue().intValue());
// go backwards; starting from first non-zero element, add them; take over leading zeroes which validator shall discard
for (int i = discardThresholdBoxes.length-1; i>=0; i--) {
if ((discardThresholdBoxes[i].getValue() != null
&& discardThresholdBoxes[i].getValue().toString().length() > 0) || !discardThresholds.isEmpty()) {
if (discardThresholdBoxes[i].getValue() == null) {
discardThresholds.add(0, 0);
} else {
discardThresholds.add(0, discardThresholdBoxes[i].getValue().intValue());
}
}
}
int[] discardThresholdsBoxContents = new int[discardThresholds.size()];