eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-15 14:56:41 +00:00
Code Activity

fixed inconsistent name and parameter type of method TrackedRace.getBoatOfCompetitor(Serializable competitorId) to be

Browse Source 
TrackedRace.getBoatOfCompetitor(Competitor competitor)
This commit is contained in:
Frank Mittag committed 2017-06-22 13:41:41 +02:00
1 parent 244908246d
commit 69ea00be97
11 files changed
+19 -15
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java
+1 -1
View File
@@ -1151,7 +1151,7 @@ public class MockedTrackedRace implements DynamicTrackedRace {
}
@Override
public Boat getBoatOfCompetitor(Serializable competitorId) {
public Boat getBoatOfCompetitor(Competitor competitor) {
return null;
}
}
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRaceWithStartTimeAndRanks.java
+1 -1
View File
@@ -705,7 +705,7 @@ public class MockedTrackedRaceWithStartTimeAndRanks implements TrackedRace {
}
@Override
public Boat getBoatOfCompetitor(Serializable competitorId) {
public Boat getBoatOfCompetitor(Competitor competitor) {
return null;
}
}
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRace.java
+1 -1
View File
@@ -710,7 +710,7 @@ public interface TrackedRace extends Serializable, IsManagedByCache<SharedDomain
Competitor getOverallLeader(TimePoint timePoint, WindLegTypeAndLegBearingCache cache);
Boat getBoatOfCompetitor(Serializable competitorId);
Boat getBoatOfCompetitor(Competitor competitor);
/**
* Returns the competitors of this tracked race, according to their ranking. Competitors whose
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegImpl.java
+1 -1
View File
@@ -71,7 +71,7 @@ public class TrackedLegImpl implements TrackedLeg {
this.trackedRace = trackedRace;
trackedLegsOfCompetitors = new HashMap<Competitor, TrackedLegOfCompetitor>();
for (Competitor competitor : competitors) {
trackedLegsOfCompetitors.put(competitor, new TrackedLegOfCompetitorImpl(this, competitor, trackedRace.getBoatOfCompetitor(competitor.getId())));
trackedLegsOfCompetitors.put(competitor, new TrackedLegOfCompetitorImpl(this, competitor, trackedRace.getBoatOfCompetitor(competitor)));
}
trackedRace.addListener(new CacheClearingRaceChangeListener());
competitorTracksOrderedByRank = new ConcurrentHashMap<>();
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
+2 -2
View File
@@ -1416,8 +1416,8 @@ public abstract class TrackedRaceImpl extends TrackedRaceWithWindEssentials impl
}
@Override
public Boat getBoatOfCompetitor(Serializable competitorId) {
return getRace().getBoatOfCompetitorById(competitorId);
public Boat getBoatOfCompetitor(Competitor competitor) {
return getRace().getBoatOfCompetitorById(competitor.getId());
}
@Override
java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java
+1 -1
View File
@@ -873,7 +873,7 @@ public class MockedTrackedRace implements DynamicTrackedRace {
}
@Override
public Boat getBoatOfCompetitor(Serializable competitorId) {
public Boat getBoatOfCompetitor(Competitor competitor) {
return null;
}
}
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java
+3 -3
View File
@@ -281,7 +281,7 @@ public class RegattasResource extends AbstractSailingServerResource {
JSONObject jsonCompetitor = new JSONObject();
jsonCompetitor.put("id", competitor.getId() != null ? competitor.getId().toString() : null);
jsonCompetitor.put("name", competitor.getName());
jsonCompetitor.put("sailNumber", trackedRace.getBoatOfCompetitor(competitor.getId()).getSailID());
jsonCompetitor.put("sailNumber", trackedRace.getBoatOfCompetitor(competitor).getSailID());
jsonCompetitor.put("color", competitor.getColor() != null ? competitor.getColor().getAsHtml() : null);
if(competitor.getFlagImage() != null) {
jsonCompetitor.put("flagImage", competitor.getFlagImage().toString());
@@ -933,7 +933,7 @@ public class RegattasResource extends AbstractSailingServerResource {
CompetitorWithBoatJsonSerializer serializer = new CompetitorWithBoatJsonSerializer();
JSONArray result = new JSONArray();
for (final Competitor c : competitors) {
Boat boat = trackedRace.getBoatOfCompetitor(c.getId());
Boat boat = trackedRace.getBoatOfCompetitor(c);
JSONObject jsonCompetitor = serializer.serialize(new CompetitorAndBoatImpl(c, boat));
result.add(jsonCompetitor);
}
@@ -1206,7 +1206,7 @@ public class RegattasResource extends AbstractSailingServerResource {
}
jsonCompetitorInLeg.put("id", competitor.getId() != null ? competitor.getId().toString() : null);
jsonCompetitorInLeg.put("name", competitor.getName());
jsonCompetitorInLeg.put("sailNumber", trackedRace.getBoatOfCompetitor(competitor.getId()).getSailID());
jsonCompetitorInLeg.put("sailNumber", trackedRace.getBoatOfCompetitor(competitor).getSailID());
jsonCompetitorInLeg.put("color", competitor.getColor() != null ? competitor.getColor().getAsHtml()
: null);
jsonCompetitorInLeg.put("rank", rank++);
java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackRaceBoatCompetitorMetadataReplicationTest.java
+1 -1
View File
@@ -125,7 +125,7 @@ public class TrackRaceBoatCompetitorMetadataReplicationTest extends AbstractServ
for (Competitor competitor : masterCompetitors) {
Competitor replicaCompetitor = findCompetitor(replicaCompetitors, competitor);
Boat competitorBoat = masterTrackedRace.getBoatOfCompetitor(competitor.getId());
Boat competitorBoat = masterTrackedRace.getBoatOfCompetitor(competitor);
switch (competitorBoat.getSailID()) {
case boat1CompetitorName:
compareBoatOfCompetitors(masterTrackedRace.getRace().getBoatOfCompetitorById(competitor.getId()),
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/PersistentCompetitorStore.java
+6 -2
View File
@@ -4,6 +4,7 @@ import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.Serializable;
import java.net.URI;
import java.util.Collection;
import com.sap.sailing.domain.abstractlog.race.analyzing.impl.RaceLogResolver;
import com.sap.sailing.domain.base.Boat;
@@ -52,10 +53,13 @@ public class PersistentCompetitorStore extends TransientCompetitorStoreImpl impl
storeTo.removeAllCompetitors();
storeTo.removeAllBoats();
} else {
for (Competitor competitor : loadFrom.loadAllCompetitors()) {
// TODO bug2822: How to migrate the competitors with contained boats to competitors with separate boat
Collection<Competitor> allCompetitors = loadFrom.loadAllCompetitors();
for (Competitor competitor : allCompetitors) {
addCompetitorToTransientStore(competitor.getId(), competitor);
}
for (Boat boat: loadFrom.loadAllBoats()) {
Collection<Boat> allBoats = loadFrom.loadAllBoats();
for (Boat boat: allBoats) {
addBoatToTransientStore(boat.getId(), boat);
}
}
java/com.sap.sailing.server/src/com/sap/sailing/server/masterdata/DummyTrackedRace.java
+1 -1
View File
@@ -624,7 +624,7 @@ public class DummyTrackedRace extends TrackedRaceWithWindEssentials {
}
@Override
public Boat getBoatOfCompetitor(Serializable competitorId) {
public Boat getBoatOfCompetitor(Competitor competitor) {
return null;
}
java/com.sap.sailing.xmlexport/src/com/sap/sailing/xmlexport/FoilingData.java
+1 -1
View File
@@ -139,7 +139,7 @@ public class FoilingData {
result.append("UNKNOWN").append(";");
}
result.append(competitor.getName()).append(";");
result.append(trackedRace.getBoatOfCompetitor(competitor.getId()).getSailID()).append(";");
result.append(trackedRace.getBoatOfCompetitor(competitor).getSailID()).append(";");
result.append(competitor.getId()).append(";");
result.append(speedOfCompetitor != null ? speedOfCompetitor.getKnots() : "0.0").append(";");
result.append(rideHeight).append(";");