eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-04 10:09:42 +00:00
Code Activity

fixing incorrect veto of race column addition in race execution order listener

Browse Source
This commit is contained in:
Axel Uhl committed 2015-05-21 09:39:01 +02:00
1 parent 1fc692e4d3
commit 3069a2d70d
6 files changed
+16 -39
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/base/RaceColumnListener.java
+3 -1
View File
@@ -20,7 +20,9 @@ public interface RaceColumnListener extends Serializable {
void hasSplitFleetContiguousScoringChanged(RaceColumn raceColumn, boolean hasSplitFleetContiguousScoring);
boolean canAddRaceColumnToContainer(RaceColumn raceColumn);
default boolean canAddRaceColumnToContainer(RaceColumn raceColumn) {
return true;
}
void raceColumnAddedToContainer(RaceColumn raceColumn);
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/AbstractRaceColumnListener.java
+1 -6
View File
@@ -18,7 +18,7 @@ import com.sap.sailing.domain.tracking.TrackedRace;
* @author Alexander Ries (D062114)
*
*/
public abstract class AbstractRaceColumnListener implements RaceColumnListener{
public abstract class AbstractRaceColumnListener implements RaceColumnListener {
private static final long serialVersionUID = -6210815580399401162L;
@@ -63,11 +63,6 @@ public abstract class AbstractRaceColumnListener implements RaceColumnListener{
defaultAction();
}
@Override
public boolean canAddRaceColumnToContainer(RaceColumn raceColumn) {
return false;
}
@Override
public void raceColumnAddedToContainer(RaceColumn raceColumn) {
defaultAction();
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/SeriesImpl.java
+12 -17
View File
@@ -25,6 +25,11 @@ import com.sap.sailing.domain.tracking.TrackedRegattaRegistry;
import com.sap.sailing.util.impl.RaceColumnListeners;
import com.sap.sse.common.Util;
/**
* A series listens on its columns; however, a veto for column addition isn't done here but in a {@link RegattaLeaderboard}.
*
* @see #addRaceColumn(String, TrackedRegattaRegistry)
*/
public class SeriesImpl extends RenamableImpl implements Series, RaceColumnListener {
private static final long serialVersionUID = -1640404303144907381L;
private final Map<String, Fleet> fleetsByName;
@@ -164,21 +169,21 @@ public class SeriesImpl extends RenamableImpl implements Series, RaceColumnListe
}
private void attachRaceExecutionOrderProviderToTrackedRacesInRaceCollumns(){
for(RaceColumnInSeries raceColumnInSeries : raceColumns){
for(Fleet fleet : raceColumnInSeries.getFleets()){
for (RaceColumnInSeries raceColumnInSeries : raceColumns) {
for (Fleet fleet : raceColumnInSeries.getFleets()) {
TrackedRace trackedRace = raceColumnInSeries.getTrackedRace(fleet);
if(trackedRace != null && regatta != null){
if (trackedRace != null && regatta != null) {
trackedRace.attachRaceExecutionProvider(regatta.getRaceExecutionOrderProvider());
}
}
}
}
private void detachRaceExecutionOrderProviderFromTrackedRacesInRaceCollumns(){
for(RaceColumnInSeries raceColumnInSeries : raceColumns){
for(Fleet fleet : raceColumnInSeries.getFleets()){
private void detachRaceExecutionOrderProviderFromTrackedRacesInRaceCollumns() {
for (RaceColumnInSeries raceColumnInSeries : raceColumns) {
for (Fleet fleet : raceColumnInSeries.getFleets()) {
TrackedRace trackedRace = raceColumnInSeries.getTrackedRace(fleet);
if(trackedRace != null && regatta != null && regatta.getRaceExecutionOrderProvider() != null){
if (trackedRace != null && regatta != null && regatta.getRaceExecutionOrderProvider() != null) {
trackedRace.detachRaceExecutionOrderProvider(regatta.getRaceExecutionOrderProvider().getId());
}
}
@@ -302,16 +307,6 @@ public class SeriesImpl extends RenamableImpl implements Series, RaceColumnListe
raceColumnListeners.notifyListenersAboutIsFirstColumnIsNonDiscardableCarryForwardChanged(raceColumn, firstColumnIsNonDiscardableCarryForward);
}
/**
* A series listens on its columns; individual columns, however, don't ask whether they can be added; the series itself does.
*
* @see #addRaceColumn(String, TrackedRegattaRegistry)
*/
@Override
public boolean canAddRaceColumnToContainer(RaceColumn raceColumn) {
return true;
}
@Override
public void raceColumnAddedToContainer(RaceColumn raceColumn) {
raceColumnListeners.notifyListenersAboutRaceColumnAddedToContainer(raceColumn);
java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/LeaderboardCacheManager.java
-5
View File
@@ -293,11 +293,6 @@ public class LeaderboardCacheManager {
removeFromCache(leaderboard);
}
@Override
public boolean canAddRaceColumnToContainer(RaceColumn raceColumn) {
return true;
}
@Override
public void raceColumnAddedToContainer(RaceColumn raceColumn) {
removeFromCache(leaderboard);
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RaceLogReplicator.java
-5
View File
@@ -90,11 +90,6 @@ public class RaceLogReplicator implements RaceColumnListener {
public void hasSplitFleetContiguousScoringChanged(RaceColumn raceColumn, boolean hasSplitFleetContiguousScoring) {
}
@Override
public boolean canAddRaceColumnToContainer(RaceColumn raceColumn) {
return true;
}
@Override
public void raceColumnAddedToContainer(RaceColumn raceColumn) {
}
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RaceLogScoringReplicator.java
-5
View File
@@ -62,11 +62,6 @@ public class RaceLogScoringReplicator implements RaceColumnListener {
public void isFirstColumnIsNonDiscardableCarryForwardChanged(RaceColumn raceColumn, boolean firstColumnIsNonDiscardableCarryForward) {
}
@Override
public boolean canAddRaceColumnToContainer(RaceColumn raceColumn) {
return true;
}
@Override
public void raceColumnAddedToContainer(RaceColumn raceColumn) {
}