made more files compileable; still many errors

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java

@@ -1036,8 +1036,11 @@ public class LeaderboardPanel extends FormPanel implements TimeListener, PlaySta
     private RaceInLeaderboardDTO getRaceByName(String raceName) {
         if (getLeaderboard() != null) {
             for (RaceInLeaderboardDTO race : getLeaderboard().getRaceList()) {
-                if (race.getRaceIdentifier(fleetName) != null && raceName.equals(race.getRaceIdentifier(fleetName).getRaceName())) {
-                    return race;
+                for (String fleetName : race.getFleetNames()) {
+                    if (race.getRaceIdentifier(fleetName) != null
+                            && raceName.equals(race.getRaceIdentifier(fleetName).getRaceName())) {
+                        return race;
+                    }
                 }
             }
         }
@@ -1058,9 +1061,14 @@ public class LeaderboardPanel extends FormPanel implements TimeListener, PlaySta
     private RaceColumn<?> getRaceColumnByRaceName(String raceName) {
         for (int i=0; i<getLeaderboardTable().getColumnCount(); i++) {
             Column<LeaderboardRowDTO, ?> column = getLeaderboardTable().getColumn(i);
-            if (column instanceof RaceColumn<?>
-                    && ((RaceColumn<?>) column).getRace().getRaceIdentifier(fleetName).getRaceName().equals(raceName)) {
-                return (RaceColumn<?>) column;
+            if (column instanceof RaceColumn<?>) {
+                RaceInLeaderboardDTO raceInLeaderboard = ((RaceColumn<?>) column).getRace();
+                for (String fleetName : raceInLeaderboard.getFleetNames()) {
+                    final RegattaAndRaceIdentifier raceIdentifier = raceInLeaderboard.getRaceIdentifier(fleetName);
+                    if (raceIdentifier != null && raceIdentifier.getRaceName().equals(raceName)) {
+                        return (RaceColumn<?>) column;
+                    }
+                }
             }
         }
         return null;
@@ -1288,7 +1296,7 @@ public class LeaderboardPanel extends FormPanel implements TimeListener, PlaySta
         if (preSelectedRace != null) {
             for (Iterator<RaceInLeaderboardDTO> i=columnsToAddImplicitly.iterator(); i.hasNext(); ) {
                 RaceInLeaderboardDTO next = i.next();
-                if (!preSelectedRace.equals(next.getRaceIdentifier(fleetName))) {
+                if (!next.containsRace(preSelectedRace)) {
                     i.remove();
                 }
             }
@@ -1386,7 +1394,7 @@ public class LeaderboardPanel extends FormPanel implements TimeListener, PlaySta
     private void correctColumnData(RaceColumn<?> raceColumn) {
         RaceInLeaderboardDTO race = raceColumn.getRace();
         int columnIndex = getRaceColumnPosition(raceColumn);
-        if (raceColumn.isExpansionEnabled() != race.isTrackedRace(fleetName)
+        if (raceColumn.isExpansionEnabled() != race.hasTrackedRaces()
                 || race.isMedalRace() != raceColumn.isMedalRace()) {
             if (raceColumn.isExpanded()) {
                 raceColumn.toggleExpansion(); // remove children from table
@@ -1531,7 +1539,7 @@ public class LeaderboardPanel extends FormPanel implements TimeListener, PlaySta
     }
 
     protected RaceColumn<?> createRaceColumn(RaceInLeaderboardDTO raceInLeaderboard) {
-        TextRaceColumn textRaceColumn = new TextRaceColumn(raceInLeaderboard, raceInLeaderboard.isTrackedRace(fleetName), RACE_COLUMN_HEADER_STYLE,
+        TextRaceColumn textRaceColumn = new TextRaceColumn(raceInLeaderboard, raceInLeaderboard.hasTrackedRaces(), RACE_COLUMN_HEADER_STYLE,
                 RACE_COLUMN_STYLE);
         return textRaceColumn;
     }
@@ -1694,8 +1702,10 @@ public class LeaderboardPanel extends FormPanel implements TimeListener, PlaySta
     private List<RegattaAndRaceIdentifier> getTrackedRacesIdentifiers() {
         List<RegattaAndRaceIdentifier> result = new ArrayList<RegattaAndRaceIdentifier>();
         for (RaceInLeaderboardDTO raceColumn : getLeaderboard().getRaceList()) {
-            if (raceColumn.getRaceIdentifier(fleetName) != null) {
-                result.add(raceColumn.getRaceIdentifier(fleetName));
+            for (String fleetName : raceColumn.getFleetNames()) {
+                if (raceColumn.getRaceIdentifier(fleetName) != null) {
+                    result.add(raceColumn.getRaceIdentifier(fleetName));
+                }
             }
         }
         return result;

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/TVViewPanel.java

@@ -102,10 +102,12 @@ public class TVViewPanel extends SimplePanel implements RaceTimesInfoProviderLis
     private void updateRaceTimesInfoProvider() {
         boolean providerChanged = false;
         for (RaceInLeaderboardDTO race : leaderboard.getRaceList()) {
-            RaceIdentifier raceIdentifier = race.getRaceIdentifier(fleetName);
-            if (raceIdentifier != null && !raceTimesInfoProvider.containsRaceIdentifier(raceIdentifier)) {
-                raceTimesInfoProvider.addRaceIdentifier(raceIdentifier, false);
-                providerChanged = true;
+            for (String fleetName : race.getFleetNames()) {
+                RaceIdentifier raceIdentifier = race.getRaceIdentifier(fleetName);
+                if (raceIdentifier != null && !raceTimesInfoProvider.containsRaceIdentifier(raceIdentifier)) {
+                    raceTimesInfoProvider.addRaceIdentifier(raceIdentifier, false);
+                    providerChanged = true;
+                }
             }
         }
         if (providerChanged) {
@@ -221,12 +223,15 @@ public class TVViewPanel extends SimplePanel implements RaceTimesInfoProviderLis
         RegattaAndRaceIdentifier firstStartedAndUnfinishedRace = null;
         Map<RaceIdentifier, RaceTimesInfoDTO> raceTimesInfos = raceTimesInfoProvider.getRaceTimesInfos();
         for (RaceInLeaderboardDTO race : leaderboard.getRaceList()) {
-            RegattaAndRaceIdentifier raceIdentifier = race.getRaceIdentifier(fleetName);
-            RaceTimesInfoDTO raceTimes = raceTimesInfos.get(raceIdentifier);
-            if (raceIdentifier != null && raceTimes != null && raceTimes.startOfTracking != null
-                    && raceTimes.endOfRace == null) {
-                firstStartedAndUnfinishedRace = raceIdentifier;
-                break;
+            for (String fleetName : race.getFleetNames()) {
+                RegattaAndRaceIdentifier raceIdentifier = race.getRaceIdentifier(fleetName);
+                if (raceIdentifier != null) {
+                    RaceTimesInfoDTO raceTimes = raceTimesInfos.get(raceIdentifier);
+                    if (raceTimes != null && raceTimes.startOfTracking != null && raceTimes.endOfRace == null) {
+                        firstStartedAndUnfinishedRace = raceIdentifier;
+                        break;
+                    }
+                }
             }
         }
         return firstStartedAndUnfinishedRace;

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RaceInLeaderboardDTO.java

@@ -3,9 +3,12 @@ package com.sap.sailing.gwt.ui.shared;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 
 import com.google.gwt.user.client.rpc.IsSerializable;
+import com.sap.sailing.domain.common.RaceIdentifier;
 import com.sap.sailing.domain.common.RegattaAndRaceIdentifier;
 
 public class RaceInLeaderboardDTO implements IsSerializable {
@@ -167,4 +170,14 @@ public class RaceInLeaderboardDTO implements IsSerializable {
         return true;
     }
 
+    public boolean containsRace(RaceIdentifier preSelectedRace) {
+        return trackedRaceIdentifiersPerFleet.values().contains(preSelectedRace);
+    }
+
+    public boolean hasTrackedRaces() {
+        Set<RegattaAndRaceIdentifier> raceIdentifiers = new HashSet<RegattaAndRaceIdentifier>(trackedRaceIdentifiersPerFleet.values());
+        raceIdentifiers.remove(null);
+        return !raceIdentifiers.isEmpty();
+    }
+
 }