eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-26 23:46:36 +00:00
Code Activity

compare competitor ID's toString() representation instead of the UUID itself

Browse Source
This commit is contained in:
Axel Uhl
2012-03-21 14:24:19 +01:00
parent b81e4421ed
commit cba663b6ed
4 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/Leaderboard.java
+1 -1
View File
@@ -230,5 +230,5 @@ public interface Leaderboard extends Named {
public void setResultDiscardingRule(ThresholdBasedResultDiscardingRule discardingRule);
Competitor getCompetitorByID(Object id);
Competitor getCompetitorByIdAsString(String idAsString);
}
java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/LeaderboardImpl.java
+2 -2
View File
@@ -177,9 +177,9 @@ public class LeaderboardImpl implements Named, Leaderboard {
}
@Override
public Competitor getCompetitorByID(Object id) {
public Competitor getCompetitorByIdAsString(String idAsString) {
for (Competitor competitor : getCompetitors()) {
if (competitor.getId().equals(id)) {
if (competitor.getId().toString().equals(idAsString)) {
return competitor;
}
}
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java
+4 -4
View File
@@ -119,18 +119,18 @@ public interface SailingService extends RemoteService {
Pair<String, String> getEventAndRaceNameOfTrackedRaceConnectedToLeaderboardColumn(String leaderboardName, String raceColumnName);
void updateLeaderboardCarryValue(String leaderboardName, String competitorID, Integer carriedPoints);
void updateLeaderboardCarryValue(String leaderboardName, String competitorIdAsString, Integer carriedPoints);
/**
* @return the new net points in {@link Pair#getA()} and the new total points in {@link Pair#getB()}
*/
Pair<Integer, Integer> updateLeaderboardMaxPointsReason(String leaderboardName, String competitorID,
Pair<Integer, Integer> updateLeaderboardMaxPointsReason(String leaderboardName, String competitorIdAsString,
String raceColumnName, String maxPointsReasonAsString, Date date) throws NoWindException;
Pair<Integer, Integer> updateLeaderboardScoreCorrection(String leaderboardName, String competitorID,
Pair<Integer, Integer> updateLeaderboardScoreCorrection(String leaderboardName, String competitorIdAsString,
String raceName, Integer correctedScore, Date date) throws NoWindException;
void updateCompetitorDisplayNameInLeaderboard(String leaderboardName, String competitorID, String displayName);
void updateCompetitorDisplayNameInLeaderboard(String leaderboardName, String competitorIdAsString, String displayName);
void updateIsMedalRace(String leaderboardName, String columnName, boolean isMedalRace);
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
+11 -11
View File
@@ -1341,10 +1341,10 @@ public class SailingServiceImpl extends RemoteServiceServlet implements SailingS
}
@Override
public void updateLeaderboardCarryValue(String leaderboardName, String competitorID, Integer carriedPoints) {
public void updateLeaderboardCarryValue(String leaderboardName, String competitorIdAsString, Integer carriedPoints) {
Leaderboard leaderboard = getService().getLeaderboardByName(leaderboardName);
if (leaderboard != null) {
Competitor competitor = leaderboard.getCompetitorByID(competitorID);
Competitor competitor = leaderboard.getCompetitorByIdAsString(competitorIdAsString);
if (competitor != null) {
if (carriedPoints == null) {
leaderboard.unsetCarriedPoints(competitor);
@@ -1353,7 +1353,7 @@ public class SailingServiceImpl extends RemoteServiceServlet implements SailingS
}
getService().updateStoredLeaderboard(leaderboard);
} else {
throw new IllegalArgumentException("Didn't find competitor ID "+competitorID+" in leaderboard "+leaderboardName);
throw new IllegalArgumentException("Didn't find competitor ID "+competitorIdAsString+" in leaderboard "+leaderboardName);
}
} else {
throw new IllegalArgumentException("Didn't find leaderboard "+leaderboardName);
@@ -1361,12 +1361,12 @@ public class SailingServiceImpl extends RemoteServiceServlet implements SailingS
}
@Override
public Pair<Integer, Integer> updateLeaderboardMaxPointsReason(String leaderboardName, String competitorID, String raceColumnName,
public Pair<Integer, Integer> updateLeaderboardMaxPointsReason(String leaderboardName, String competitorIdAsString, String raceColumnName,
String maxPointsReasonAsString, Date date) throws NoWindException {
TimePoint timePoint = new MillisecondsTimePoint(date);
Leaderboard leaderboard = getService().getLeaderboardByName(leaderboardName);
if (leaderboard != null) {
Competitor competitor = leaderboard.getCompetitorByID(competitorID);
Competitor competitor = leaderboard.getCompetitorByIdAsString(competitorIdAsString);
if (competitor != null) {
RaceInLeaderboard raceColumn = leaderboard.getRaceColumnByName(raceColumnName);
if (raceColumn == null) {
@@ -1381,7 +1381,7 @@ public class SailingServiceImpl extends RemoteServiceServlet implements SailingS
Entry updatedEntry = leaderboard.getEntry(competitor, raceColumn, timePoint);
return new Pair<Integer, Integer>(updatedEntry.getNetPoints(), updatedEntry.getTotalPoints());
} else {
throw new IllegalArgumentException("Didn't find competitor with ID "+competitorID+" in leaderboard "+leaderboardName);
throw new IllegalArgumentException("Didn't find competitor with ID "+competitorIdAsString+" in leaderboard "+leaderboardName);
}
} else {
throw new IllegalArgumentException("Didn't find leaderboard "+leaderboardName);
@@ -1389,13 +1389,13 @@ public class SailingServiceImpl extends RemoteServiceServlet implements SailingS
}
@Override
public Pair<Integer, Integer> updateLeaderboardScoreCorrection(String leaderboardName, String competitorID, String raceName,
public Pair<Integer, Integer> updateLeaderboardScoreCorrection(String leaderboardName, String competitorIdAsString, String raceName,
Integer correctedScore, Date date) throws NoWindException {
Leaderboard leaderboard = getService().getLeaderboardByName(leaderboardName);
int newNetPoints;
int newTotalPoints;
if (leaderboard != null) {
Competitor competitor = leaderboard.getCompetitorByID(competitorID);
Competitor competitor = leaderboard.getCompetitorByIdAsString(competitorIdAsString);
if (competitor != null) {
MillisecondsTimePoint timePoint = new MillisecondsTimePoint(date);
RaceInLeaderboard raceColumn = leaderboard.getRaceColumnByName(raceName);
@@ -1411,7 +1411,7 @@ public class SailingServiceImpl extends RemoteServiceServlet implements SailingS
}
newTotalPoints = leaderboard.getEntry(competitor, raceColumn, timePoint).getTotalPoints();
} else {
throw new IllegalArgumentException("Didn't find competitor with ID "+competitorID+" in leaderboard "+leaderboardName);
throw new IllegalArgumentException("Didn't find competitor with ID "+competitorIdAsString+" in leaderboard "+leaderboardName);
}
} else {
throw new IllegalArgumentException("Didn't find leaderboard "+leaderboardName);
@@ -1421,9 +1421,9 @@ public class SailingServiceImpl extends RemoteServiceServlet implements SailingS
}
@Override
public void updateCompetitorDisplayNameInLeaderboard(String leaderboardName, String competitorID, String displayName) {
public void updateCompetitorDisplayNameInLeaderboard(String leaderboardName, String competitorIdAsString, String displayName) {
Leaderboard leaderboard = getService().getLeaderboardByName(leaderboardName);
Competitor competitor = leaderboard.getCompetitorByID(competitorID);
Competitor competitor = leaderboard.getCompetitorByIdAsString(competitorIdAsString);
if (competitor != null) {
leaderboard.setDisplayName(competitor, displayName);
getService().updateStoredLeaderboard(leaderboard);