bug5288: Fix error after merge

java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/DetailType.java

@@ -372,6 +372,7 @@ public enum DetailType implements Serializable {
         allowed.add(RACE_IMPLIED_WIND);
         allowed.add(RACE_CALCULATED_TIME_AT_ESTIMATED_ARRIVAL_AT_COMPETITOR_FARTHEST_AHEAD);
         allowed.add(RACE_CURRENT_SPEED_OVER_GROUND_IN_KNOTS);
+        allowed.add(RACE_CURRENT_COURSE_OVER_GROUND_IN_TRUE_DEGREES);
         allowed.add(RACE_CURRENT_DISTANCE_FOILED_IN_METERS);
         allowed.add(RACE_CURRENT_DURATION_FOILED_IN_SECONDS);
         allowed.add(RACE_DISTANCE_TO_COMPETITOR_FARTHEST_AHEAD_IN_METERS);

java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/BoatClassDTO.java

@@ -16,20 +16,15 @@ public class BoatClassDTO extends NamedDTO implements Serializable, Comparable<B
     
     private Distance hullLength;
     private Distance hullBeam;
-    private String displayName;
     
     BoatClassDTO() {}
 
-    public BoatClassDTO(String name, String displayName, Distance hullLength, Distance hullBeam) {
+    public BoatClassDTO(String name, Distance hullLength, Distance hullBeam) {
         super(name);
         this.hullLength = hullLength;
         this.hullBeam = hullBeam;
     }
 
-    public BoatClassDTO(String name, Distance hullLength, Distance hullBeam) {
-        this(name, /* display name */ null, hullLength, hullBeam);
-    }
-
     public Distance getHullLength() {
         return hullLength;
     }
@@ -38,10 +33,6 @@ public class BoatClassDTO extends NamedDTO implements Serializable, Comparable<B
         return hullBeam;
     }
 
-    public String getDisplayName() {
-        return displayName;
-    }
-    
     @Override
     public int compareTo(BoatClassDTO o) {
         return getName().compareToIgnoreCase(o.getName());

java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/LeaderboardEntryDTO.java

@@ -5,6 +5,7 @@ import java.util.List;
 
 import com.sap.sailing.domain.common.MaxPointsReason;
 import com.sap.sailing.domain.common.RaceIdentifier;
+import com.sap.sailing.domain.common.SpeedWithBearing;
 import com.sap.sailing.domain.common.Tack;
 import com.sap.sailing.domain.common.impl.MeterDistance;
 import com.sap.sse.common.Bearing;
@@ -141,6 +142,8 @@ public class LeaderboardEntryDTO implements Serializable {
      * farthest ahead for all subsequent legs.
      */
     public Duration calculatedTimeAtEstimatedArrivalAtCompetitorFarthestAhead;
+    
+    public SpeedWithBearing currentSpeedAndCourseOverGround;
 
     /**
      * If <code>null</code>, no leg details are known yet, the race is not being tracked or the details
@@ -618,6 +621,8 @@ public class LeaderboardEntryDTO implements Serializable {
         result = prime * result + ((calculatedTime == null) ? 0 : calculatedTime.hashCode());
         result = prime * result + ((calculatedTimeAtEstimatedArrivalAtCompetitorFarthestAhead == null) ? 0
                 : calculatedTimeAtEstimatedArrivalAtCompetitorFarthestAhead.hashCode());
+        result = prime * result + ((currentSpeedAndCourseOverGround == null) ? 0
+                : currentSpeedAndCourseOverGround.hashCode());
         result = prime * result + (discarded ? 1231 : 1237);
         result = prime * result + ((distanceToStarboardSideOfStartLineInMeters == null) ? 0
                 : distanceToStarboardSideOfStartLineInMeters.hashCode());
@@ -703,6 +708,12 @@ public class LeaderboardEntryDTO implements Serializable {
         } else if (!calculatedTimeAtEstimatedArrivalAtCompetitorFarthestAhead
                 .equals(other.calculatedTimeAtEstimatedArrivalAtCompetitorFarthestAhead))
             return false;
+        if (currentSpeedAndCourseOverGround == null) {
+            if (other.currentSpeedAndCourseOverGround != null)
+                return false;
+        } else if (!currentSpeedAndCourseOverGround
+                .equals(other.currentSpeedAndCourseOverGround))
+            return false;
         if (discarded != other.discarded)
             return false;
         if (distanceToStarboardSideOfStartLineInMeters == null) {

java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/racelog/tracking/MarkAlreadyUsedInRaceException.java

@@ -0,0 +1,25 @@
+package com.sap.sailing.domain.common.racelog.tracking;
+
+import java.io.Serializable;
+
+public class MarkAlreadyUsedInRaceException extends Exception implements Serializable {
+    
+    private static final long serialVersionUID = 2040461905745135256L;    
+    
+    public MarkAlreadyUsedInRaceException() {
+        super();
+        this.raceNames = "";
+    }
+    
+    public MarkAlreadyUsedInRaceException(String message, String raceNames) {
+        super(message);
+        this.raceNames = raceNames;
+    }
+    
+    private String raceNames;
+    
+    public String getRaceNames() {
+        return raceNames;
+    }
+    
+}

java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/windfinder/AvailableWindFinderSpotCollections.java

@@ -24,7 +24,8 @@ public enum AvailableWindFinderSpotCollections {
     TEGERNSEE("tegernsee"),
     TORTOLA("tortola"),
     AUCKLAND("auckland"),
-    AARHUS("aarhus");
+    AARHUS("aarhus"),
+    NEW_YORK("new_york");
 
     private final String name;