refactored stopTracking for events and races; several fixes for race table sorting/filtering

This commit is contained in:
Axel Uhl committed 2011-12-09 11:57:10 +01:00
1 parent 2bfe7a4853
commit 2bd6d817c6
14 files changed
+172 -149

No files matched your search

@@ -200,7 +200,7 @@ public interface Leaderboard extends Named {
boolean hasCarriedPoints(Competitor competitor);
void removeRaceColumn(String name);
void removeRaceColumn(String columnName);
SettableScoreCorrection getScoreCorrection();
@@ -106,8 +106,8 @@ public class LeaderboardImpl implements Named, Leaderboard {
}
@Override
public void removeRaceColumn(String name) {
races.remove(getRaceColumnByName(name));
public void removeRaceColumn(String columnName) {
races.remove(getRaceColumnByName(columnName));
}
@Override
@@ -35,7 +35,7 @@ public abstract class AbstractRaceTrackerImpl implements RaceTracker {
for (RaceDefinition race : races) {
TrackedRace trackedRace = trackedEvent.getExistingTrackedRace(race);
if (trackedRace != null) {
trackedEvent.removedTrackedRace(trackedRace);
trackedEvent.removeTrackedRace(trackedRace);
}
}
if (Util.isEmpty(trackedEvent.getTrackedRaces())) {
@@ -9,7 +9,7 @@ import com.sap.sailing.domain.base.RaceDefinition;
public interface RaceTracker {
/**
* Stops tracking the race and removes the {@link TrackedRace} object one gets from calling
* Stops tracking the races and removes the {@link TrackedRace} object one gets from calling
* {@link #getTrackedEvent()}.{@link TrackedEvent#getTrackedRace(RaceDefinition) getTrackedRace(}{@link #getRaces() getRaces())}
* from the {@link #getTrackedEvent() tracked event}.
*/
@@ -24,7 +24,6 @@ public interface RaceTracker {
*/
Set<RaceDefinition> getRaces();
// TODO this is inconsistent with getRaces() which can return more than one race
RacesHandle getRaceHandle();
DynamicTrackedEvent getTrackedEvent();
@@ -45,7 +45,7 @@ public interface TrackedEvent {
void addTrackedRace(TrackedRace trackedRace);
void removedTrackedRace(TrackedRace trackedRace);
void removeTrackedRace(TrackedRace trackedRace);
/**
* Listener will be notified when {@link #addTrackedRace(TrackedRace)} is called and
@@ -62,7 +62,7 @@ public class TrackedEventImpl implements TrackedEvent {
}
@Override
public void removedTrackedRace(TrackedRace trackedRace) {
public void removeTrackedRace(TrackedRace trackedRace) {
synchronized (trackedRaces) {
trackedRaces.remove(trackedRace.getRace());
Collection<TrackedRace> trbbc = trackedRacesByBoatClass.get(trackedRace.getRace().getBoatClass());