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

removed LeaderboardNameAndRaceColumn race identifier

Browse Source
This commit is contained in:
fmittag committed 2012-01-20 14:59:14 +01:00
1 parent 48d9410dd5
commit 26f621faf8
7 files changed
+21 -122
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/TrackedEventsComposite.java
+1
View File
@@ -108,6 +108,7 @@ public class TrackedEventsComposite extends FormPanel implements EventDisplayer,
HorizontalPanel filterPanel = new HorizontalPanel();
panel.add(filterPanel);
Label lblFilterEvents = new Label(stringConstants.filterRacesByName() + ":");
lblFilterEvents.setWordWrap(false);
filterPanel.setSpacing(5);
filterPanel.add(lblFilterEvents);
filterPanel.setCellVerticalAlignment(lblFilterEvents, HasVerticalAlignment.ALIGN_MIDDLE);
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java
+3 -3
View File
@@ -58,7 +58,7 @@ import com.sap.sailing.gwt.ui.shared.components.Component;
import com.sap.sailing.gwt.ui.shared.components.SettingsDialog;
import com.sap.sailing.gwt.ui.shared.components.SettingsDialogComponent;
import com.sap.sailing.server.api.DetailType;
import com.sap.sailing.server.api.LeaderboardNameAndRaceColumnName;
import com.sap.sailing.server.api.EventNameAndRaceName;
import com.sap.sailing.server.api.RaceIdentifier;
/**
@@ -1306,11 +1306,11 @@ public class LeaderboardPanel extends FormPanel implements TimeListener, PlaySta
List<RaceIdentifier> races = new ArrayList<RaceIdentifier>();
for (RaceInLeaderboardDTO race : getLeaderboard().getRaceList()) {
if (race.isTrackedRace()){
races.add(new LeaderboardNameAndRaceColumnName(leaderboardName, race.getRaceColumnName()));
races.add(race.getRaceIdentifier());
}
}
CompareCompetitorsChartDialog chartDialog = new CompareCompetitorsChartDialog(sailingService, competitorSelectionProvider,
races.toArray(new LeaderboardNameAndRaceColumnName[0]), stringConstants, errorReporter);
races.toArray(new EventNameAndRaceName[0]), stringConstants, errorReporter);
chartDialog.show();
}
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
+12 -37
View File
@@ -122,7 +122,6 @@ import com.sap.sailing.server.api.EventFetcher;
import com.sap.sailing.server.api.EventIdentifier;
import com.sap.sailing.server.api.EventName;
import com.sap.sailing.server.api.EventNameAndRaceName;
import com.sap.sailing.server.api.LeaderboardNameAndRaceColumnName;
import com.sap.sailing.server.api.RaceFetcher;
import com.sap.sailing.server.api.RaceIdentifier;
@@ -189,7 +188,12 @@ public class SailingServiceImpl extends RemoteServiceServlet implements SailingS
result.name = leaderboard.getName();
result.competitorDisplayNames = new HashMap<CompetitorDTO, String>();
for (RaceInLeaderboard raceColumn : leaderboard.getRaceColumns()) {
result.addRace(raceColumn.getName(), raceColumn.isMedalRace(), raceColumn.getTrackedRace());
RaceIdentifier raceIdentifier = null;
if(raceColumn.getTrackedRace() != null) {
raceIdentifier = new EventNameAndRaceName(raceColumn.getTrackedRace().getTrackedEvent().getEvent().getName(),
raceColumn.getTrackedRace().getRace().getName());
}
result.addRace(raceColumn.getName(), raceColumn.isMedalRace(), raceIdentifier);
}
result.rows = new HashMap<CompetitorDTO, LeaderboardRowDTO>();
result.hasCarriedPoints = leaderboard.hasCarriedPoints();
@@ -891,7 +895,12 @@ public class SailingServiceImpl extends RemoteServiceServlet implements SailingS
dao.name = leaderboard.getName();
dao.competitorDisplayNames = new HashMap<CompetitorDTO, String>();
for (RaceInLeaderboard raceColumn : leaderboard.getRaceColumns()) {
dao.addRace(raceColumn.getName(), raceColumn.isMedalRace(), raceColumn.getTrackedRace());
RaceIdentifier raceIdentifier = null;
if(raceColumn.getTrackedRace() != null) {
raceIdentifier = new EventNameAndRaceName(raceColumn.getTrackedRace().getTrackedEvent().getEvent().getName(),
raceColumn.getTrackedRace().getRace().getName());
}
dao.addRace(raceColumn.getName(), raceColumn.isMedalRace(), raceIdentifier);
}
dao.hasCarriedPoints = leaderboard.hasCarriedPoints();
dao.discardThresholds = leaderboard.getResultDiscardingRule().getDiscardIndexResultsStartingWithHowManyRaces();
@@ -1487,40 +1496,6 @@ public class SailingServiceImpl extends RemoteServiceServlet implements SailingS
return trackedRace;
}
@Override
public RaceDefinition getRace(LeaderboardNameAndRaceColumnName leaderboardNameAndRaceColumnName) {
RaceDefinition result = null;
Leaderboard leaderboard = getService().getLeaderboardByName(leaderboardNameAndRaceColumnName.getLeaderboardName());
if (leaderboard != null) {
RaceInLeaderboard raceColumn = leaderboard.getRaceColumnByName(leaderboardNameAndRaceColumnName
.getRaceColumnName());
if (raceColumn != null && raceColumn.getTrackedRace() != null) {
result = raceColumn.getTrackedRace().getRace();
}
}
return result;
}
@Override
public TrackedRace getTrackedRace(LeaderboardNameAndRaceColumnName leaderboardNameAndRaceColumnName) {
TrackedRace result = null;
Leaderboard leaderboard = getService().getLeaderboardByName(
leaderboardNameAndRaceColumnName.getLeaderboardName());
if (leaderboard != null) {
RaceInLeaderboard raceColumn = leaderboard.getRaceColumnByName(leaderboardNameAndRaceColumnName
.getRaceColumnName());
if (raceColumn != null) {
result = raceColumn.getTrackedRace();
}
}
return result;
}
@Override
public TrackedRace getExistingTrackedRace(LeaderboardNameAndRaceColumnName leaderboardNameAndRaceColumnName) {
return getTrackedRace(leaderboardNameAndRaceColumnName);
}
@Override
public TrackedRace getExistingTrackedRace(EventNameAndRaceName eventNameAndRaceName) {
Event event = getService().getEventByName(eventNameAndRaceName.getEventName());
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/LeaderboardDTO.java
+5 -15
View File
@@ -7,8 +7,6 @@ import java.util.List;
import java.util.Map;
import com.google.gwt.user.client.rpc.IsSerializable;
import com.sap.sailing.domain.tracking.TrackedRace;
import com.sap.sailing.server.api.EventNameAndRaceName;
import com.sap.sailing.server.api.RaceIdentifier;
/**
@@ -17,7 +15,7 @@ import com.sap.sailing.server.api.RaceIdentifier;
* (DNS, DNF, DSQ).
*
* @author Axel Uhl (d043530)
*
*
*/
public class LeaderboardDTO implements IsSerializable {
public String name;
@@ -269,27 +267,19 @@ public class LeaderboardDTO implements IsSerializable {
return getRaceInLeaderboardByName(raceColumnName).isMedalRace();
}
public void addRace(String raceColumnName, boolean medalRace, TrackedRace trackedRace) {
public void addRace(String raceColumnName, boolean medalRace, RaceIdentifier trackedRaceIdentifier) {
RaceInLeaderboardDTO raceInLeaderboardDTO = new RaceInLeaderboardDTO();
raceInLeaderboardDTO.setRaceColumnName(raceColumnName);
raceInLeaderboardDTO.setMedalRace(medalRace);
if (trackedRace != null) {
RaceIdentifier raceIdentifier = new EventNameAndRaceName(
trackedRace.getTrackedEvent().getEvent().getName(), trackedRace.getRace().getName());
raceInLeaderboardDTO.setRaceIdentifier(raceIdentifier);
}
raceInLeaderboardDTO.setRaceIdentifier(trackedRaceIdentifier);
races.add(raceInLeaderboardDTO);
}
public void addRaceAt(String raceColumnName, boolean medalRace, TrackedRace trackedRace, int index) {
public void addRaceAt(String raceColumnName, boolean medalRace, RaceIdentifier trackedRaceIdentifier, int index) {
RaceInLeaderboardDTO raceInLeaderboardDTO = new RaceInLeaderboardDTO();
raceInLeaderboardDTO.setRaceColumnName(raceColumnName);
raceInLeaderboardDTO.setMedalRace(medalRace);
if (trackedRace != null) {
RaceIdentifier raceIdentifier = new EventNameAndRaceName(
trackedRace.getTrackedEvent().getEvent().getName(), trackedRace.getRace().getName());
raceInLeaderboardDTO.setRaceIdentifier(raceIdentifier);
}
raceInLeaderboardDTO.setRaceIdentifier(trackedRaceIdentifier);
races.add(index, raceInLeaderboardDTO);
}
java/com.sap.sailing.server.api/src/com/sap/sailing/server/api/LeaderboardNameAndRaceColumnName.java
-42
View File
@@ -1,42 +0,0 @@
package com.sap.sailing.server.api;
public class LeaderboardNameAndRaceColumnName implements RaceIdentifier {
private static final long serialVersionUID = 6290279076772313524L;
private String leaderboardName;
private String raceColumnName;
LeaderboardNameAndRaceColumnName() {}
public LeaderboardNameAndRaceColumnName(String leaderboardName, String raceColumnName) {
super();
this.leaderboardName = leaderboardName;
this.raceColumnName = raceColumnName;
}
public String getLeaderboardName() {
return leaderboardName;
}
public String getRaceColumnName() {
return raceColumnName;
}
@Override
public Object getRace(RaceFetcher raceFetcher) {
return raceFetcher.getRace(this);
}
@Override
public Object getTrackedRace(RaceFetcher raceFetcher) {
return raceFetcher.getTrackedRace(this);
}
@Override
public Object getExistingTrackedRace(RaceFetcher raceFetcher) {
return raceFetcher.getExistingTrackedRace(this);
}
@Override
public String toString() {
return raceColumnName;
}
}
java/com.sap.sailing.server.api/src/com/sap/sailing/server/api/RaceFetcher.java
-6
View File
@@ -11,11 +11,5 @@ public interface RaceFetcher {
*/
Object getTrackedRace(EventNameAndRaceName eventNameAndRaceName);
Object getRace(LeaderboardNameAndRaceColumnName leaderboardNameAndRaceColumnName);
Object getTrackedRace(LeaderboardNameAndRaceColumnName leaderboardNameAndRaceColumnName);
Object getExistingTrackedRace(LeaderboardNameAndRaceColumnName leaderboardNameAndRaceColumnName);
Object getExistingTrackedRace(EventNameAndRaceName eventNameAndRaceName);
}
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
-19
View File
@@ -64,7 +64,6 @@ import com.sap.sailing.server.api.EventFetcher;
import com.sap.sailing.server.api.EventIdentifier;
import com.sap.sailing.server.api.EventName;
import com.sap.sailing.server.api.EventNameAndRaceName;
import com.sap.sailing.server.api.LeaderboardNameAndRaceColumnName;
import com.sap.sailing.server.api.RaceFetcher;
import com.sap.sailing.server.api.RaceIdentifier;
@@ -635,24 +634,6 @@ public class RacingEventServiceImpl implements RacingEventService, EventFetcher,
return null;
}
@Override
public RaceDefinition getRace(LeaderboardNameAndRaceColumnName leaderboardNameAndRaceColumnName) {
// TODO Auto-generated method stub
return null;
}
@Override
public TrackedRace getTrackedRace(LeaderboardNameAndRaceColumnName leaderboardNameAndRaceColumnName) {
// TODO Auto-generated method stub
return null;
}
@Override
public TrackedRace getExistingTrackedRace(LeaderboardNameAndRaceColumnName leaderboardNameAndRaceColumnName) {
// TODO Auto-generated method stub
return null;
}
@Override
public TrackedRace getExistingTrackedRace(EventNameAndRaceName eventNameAndRaceName) {
// TODO Auto-generated method stub