Merge remote-tracking branch 'd043530/gwt' into gwt

java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ParseTracTracJSONServiceOutputTest.java

@@ -95,8 +95,8 @@ public class ParseTracTracJSONServiceOutputTest {
         List<RaceRecord> races = jsonService.getRaceRecords();
         assertFalse(races.isEmpty());
         for (RaceRecord race : races) {
-            assertEquals(new URI("tcp://" + TracTracConnectionConstants.HOST_NAME + ":" + TracTracConnectionConstants.PORT_LIVE), race.getLiveURI());
-            assertEquals(new URI("tcp://" + TracTracConnectionConstants.HOST_NAME + ":" + TracTracConnectionConstants.PORT_STORED), race.getStoredURI());
+            assertEquals(new URI("tcp://" + TracTracConnectionConstants.HOST_NAME + ":4400"), race.getLiveURI());
+            assertEquals(new URI("tcp://" + TracTracConnectionConstants.HOST_NAME + ":4401"), race.getStoredURI());
         }
     }
 

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java

@@ -78,7 +78,7 @@ public interface SailingService extends RemoteService {
 
     List<LeaderboardDTO> getLeaderboards();
     
-    List<LeaderboardDTO> getLeaderboardsByEvent(EventIdentifier eventIdentifier);
+    List<LeaderboardDTO> getLeaderboardsByEvent(EventDTO event);
     
     void updateLeaderboard(String leaderboardName, String newLeaderboardName, int[] newDiscardingThreasholds);
 

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java

@@ -143,7 +143,7 @@ public interface SailingServiceAsync {
      * Does the same as {@link SailingServiceAsync#getLeaderboards(AsyncCallback) getLeaderboards} but returns only
      * leaderboards which have the given event as race
      */
-    void getLeaderboardsByEvent(EventIdentifier eventIdentifier, AsyncCallback<List<LeaderboardDTO>> callback);
+    void getLeaderboardsByEvent(EventDTO event, AsyncCallback<List<LeaderboardDTO>> callback);
     
     void updateLeaderboard(String leaderboardName, String newLeaderboardName, int[] newDiscardingThreasholds,
             AsyncCallback<Void> callback);

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java

@@ -866,20 +866,27 @@ public class SailingServiceImpl extends RemoteServiceServlet implements SailingS
     }
     
     @Override
-    public List<LeaderboardDTO> getLeaderboardsByEvent(EventIdentifier eventIdentifier) {
-        Event event = getEvent(eventIdentifier);
-        Map<String, Leaderboard> leaderboards = getService().getLeaderboards();
+    public List<LeaderboardDTO> getLeaderboardsByEvent(EventDTO event) {
         List<LeaderboardDTO> results = new ArrayList<LeaderboardDTO>();
         
-        for (Leaderboard leaderboard : leaderboards.values()) {
-            for (RaceInLeaderboard race : leaderboard.getRaceColumns()) {
-                if (Util.contains(event.getAllRaces(), race.getTrackedRace().getRace())) {
-                    LeaderboardDTO dao = createStrippedLeaderboardDTO(leaderboard);
-                    results.add(dao);
+        for (RegattaDTO regatta : event.regattas) {
+            for (RaceDTO race : regatta.races) {
+                List<LeaderboardDTO> leaderboard = getLeaderboardByRace(race);
+                if (leaderboard != null && !leaderboard.isEmpty()) {
+                    results.addAll(leaderboard);
                 }
             }
         }
         
+        return results;
+    }
+    
+    private List<LeaderboardDTO> getLeaderboardByRace(RaceDTO race) {
+        List<LeaderboardDTO> results = new ArrayList<LeaderboardDTO>();
+        Map<String, Leaderboard> leaderboards = getService().getLeaderboards();
+        
+        
+        
         return results;
     }