diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/TrackedEventsComposite.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/TrackedEventsComposite.java index 1beb371677c..15b85f8b3be 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/TrackedEventsComposite.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/TrackedEventsComposite.java @@ -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); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java index f86d3545e7e..8940d27eaaf 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java @@ -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 races = new ArrayList(); 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(); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java index 26c70b212f6..c7686f73f09 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java @@ -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(); 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(); result.hasCarriedPoints = leaderboard.hasCarriedPoints(); @@ -891,7 +895,12 @@ public class SailingServiceImpl extends RemoteServiceServlet implements SailingS dao.name = leaderboard.getName(); dao.competitorDisplayNames = new HashMap(); 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()); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/LeaderboardDTO.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/LeaderboardDTO.java index 6ec32c1ff68..15acec744b7 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/LeaderboardDTO.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/LeaderboardDTO.java @@ -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); } diff --git a/java/com.sap.sailing.server.api/src/com/sap/sailing/server/api/LeaderboardNameAndRaceColumnName.java b/java/com.sap.sailing.server.api/src/com/sap/sailing/server/api/LeaderboardNameAndRaceColumnName.java deleted file mode 100755 index 0b5e929b6b3..00000000000 --- a/java/com.sap.sailing.server.api/src/com/sap/sailing/server/api/LeaderboardNameAndRaceColumnName.java +++ /dev/null @@ -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; - } -} diff --git a/java/com.sap.sailing.server.api/src/com/sap/sailing/server/api/RaceFetcher.java b/java/com.sap.sailing.server.api/src/com/sap/sailing/server/api/RaceFetcher.java index f588fa53590..b17eb640fda 100755 --- a/java/com.sap.sailing.server.api/src/com/sap/sailing/server/api/RaceFetcher.java +++ b/java/com.sap.sailing.server.api/src/com/sap/sailing/server/api/RaceFetcher.java @@ -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); } diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java index e0407cdccfa..f4c374e2b6f 100755 --- a/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java +++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java @@ -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