eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-08 13:20:57 +00:00
Code Activity

always create a valid ResultDiscardingRule object, never null, during master data import for overall leaderboard

Browse Source
This commit is contained in:
Axel Uhl committed 2013-08-12 21:03:00 +02:00
1 parent 9fec6e2b98
commit c21ef94736
2 files changed
+7 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.domain/src/com/sap/sailing/domain/masterdataimport/LeaderboardGroupMasterData.java
+5 -2
View File
@@ -4,6 +4,8 @@ import java.util.Set;
import com.sap.sailing.domain.base.LeaderboardMasterData;
import com.sap.sailing.domain.leaderboard.ScoringScheme;
import com.sap.sailing.domain.leaderboard.ThresholdBasedResultDiscardingRule;
import com.sap.sailing.domain.leaderboard.impl.ThresholdBasedResultDiscardingRuleImpl;
/**
* Holds leaderboard group object AND its leaderboards, etc
@@ -56,8 +58,9 @@ public class LeaderboardGroupMasterData {
return overallLeaderboardScoringScheme;
}
public int[] getOverallLeaderboardDiscardingRule() {
return overallLeaderboardDiscardingRule;
public ThresholdBasedResultDiscardingRule getOverallLeaderboardDiscardingRule() {
return overallLeaderboardDiscardingRule == null ? new ThresholdBasedResultDiscardingRuleImpl(new int[0]) :
new ThresholdBasedResultDiscardingRuleImpl(overallLeaderboardDiscardingRule);
}
public Iterable<LeaderboardMasterData> getLeaderboards() {
java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/ImportMasterDataOperation.java
+2 -3
View File
@@ -153,9 +153,8 @@ public class ImportMasterDataOperation extends
// remove old overall leaderboard if it existed
toState.removeLeaderboard(existingLeaderboardGroup.getOverallLeaderboard().getName());
}
LeaderboardGroupMetaLeaderboard overallLeaderboard = new LeaderboardGroupMetaLeaderboard(leaderboardGroup, masterData.getOverallLeaderboardScoringScheme(),
masterData.getOverallLeaderboardDiscardingRule()==null?null:
new ThresholdBasedResultDiscardingRuleImpl(masterData.getOverallLeaderboardDiscardingRule()));
LeaderboardGroupMetaLeaderboard overallLeaderboard = new LeaderboardGroupMetaLeaderboard(
leaderboardGroup, masterData.getOverallLeaderboardScoringScheme(), masterData.getOverallLeaderboardDiscardingRule());
leaderboardGroup.setOverallLeaderboard(overallLeaderboard);
toState.addLeaderboard(overallLeaderboard);
}