From f5cc992d45000dbdef69937ffeb8ab890467fcc6 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Fri, 2 Oct 2015 18:08:59 +0200 Subject: [PATCH] remove a number of now unnecessary NoWindException declarations --- .../sap/sailing/domain/leaderboard/Leaderboard.java | 2 +- .../leaderboard/impl/AbstractScoringSchemeImpl.java | 4 +--- .../impl/AbstractSimpleLeaderboardImpl.java | 10 +++------- .../impl/HighPointExtremeSailingSeriesOverall.java | 3 +-- 4 files changed, 6 insertions(+), 13 deletions(-) diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/Leaderboard.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/Leaderboard.java index b423bce0676..6d6c6c4264b 100644 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/Leaderboard.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/Leaderboard.java @@ -263,7 +263,7 @@ public interface Leaderboard extends LeaderboardBase, HasRaceColumns { * Sums up the {@link #getTotalPoints(Competitor, TrackedRace, TimePoint) total points} of competitor * across all races tracked by this leaderboard, respecting the {@link RaceColumn#isStartsWithZeroScore()} property. */ - Double getTotalPoints(Competitor competitor, TimePoint timePoint) throws NoWindException; + Double getTotalPoints(Competitor competitor, TimePoint timePoint); /** * Sums up the {@link #getTotalPoints(Competitor, RaceColumn, TimePoint) total points} of competitor diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractScoringSchemeImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractScoringSchemeImpl.java index baa13882aa3..0b5871d5f8b 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractScoringSchemeImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractScoringSchemeImpl.java @@ -12,7 +12,6 @@ import java.util.Set; import com.sap.sailing.domain.base.Competitor; import com.sap.sailing.domain.base.Fleet; import com.sap.sailing.domain.base.RaceColumn; -import com.sap.sailing.domain.common.NoWindException; import com.sap.sailing.domain.leaderboard.Leaderboard; import com.sap.sailing.domain.leaderboard.ScoringScheme; import com.sap.sailing.domain.tracking.TrackedRace; @@ -182,8 +181,7 @@ public abstract class AbstractScoringSchemeImpl implements ScoringScheme { } @Override - public int compareByLatestRegattaInMetaLeaderboard(Leaderboard leaderboard, Competitor o1, Competitor o2, - TimePoint timePoint) throws NoWindException { + public int compareByLatestRegattaInMetaLeaderboard(Leaderboard leaderboard, Competitor o1, Competitor o2, TimePoint timePoint) { return 0; } } diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java index 1f36ec0afee..0293355a26c 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java @@ -517,13 +517,13 @@ public abstract class AbstractSimpleLeaderboardImpl implements Leaderboard, Race } @Override - public Double getTotalPoints(Competitor competitor, TimePoint timePoint) throws NoWindException { + public Double getTotalPoints(Competitor competitor, TimePoint timePoint) { return getTotalPoints(competitor, getRaceColumns(), timePoint); } @Override public Double getTotalPoints(Competitor competitor, final Iterable raceColumnsToConsider, - TimePoint timePoint) throws NoWindException { + TimePoint timePoint) { // when a column with isStartsWithZeroScore() is found, only reset score if the competitor scored in any race from there on boolean needToResetScoreUponNextNonEmptyEntry = false; double result = getCarriedPoints(competitor); @@ -721,11 +721,7 @@ public abstract class AbstractSimpleLeaderboardImpl implements Leaderboard, Race public Map call() { Map totalPointsSumPerCompetitorInColumn = new HashMap<>(); for (Competitor competitor : getCompetitors()) { - try { - totalPointsSumPerCompetitorInColumn.put(competitor, getTotalPoints(competitor, finalRaceColumnsToConsider, timePoint)); - } catch (NoWindException e) { - throw new NoWindError(e); - } + totalPointsSumPerCompetitorInColumn.put(competitor, getTotalPoints(competitor, finalRaceColumnsToConsider, timePoint)); } synchronized (result) { return totalPointsSumPerCompetitorInColumn; diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/HighPointExtremeSailingSeriesOverall.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/HighPointExtremeSailingSeriesOverall.java index 3474fe84072..badf4434478 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/HighPointExtremeSailingSeriesOverall.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/HighPointExtremeSailingSeriesOverall.java @@ -107,8 +107,7 @@ public class HighPointExtremeSailingSeriesOverall extends HighPoint { * @throws NoWindException */ @Override - public int compareByLatestRegattaInMetaLeaderboard(Leaderboard leaderboard, - Competitor o1, Competitor o2, TimePoint timePoint) throws NoWindException { + public int compareByLatestRegattaInMetaLeaderboard(Leaderboard leaderboard, Competitor o1, Competitor o2, TimePoint timePoint) { assert leaderboard instanceof MetaLeaderboard; // compare by last regatta if this leaderboard is a meta leaderboard final int result;