Merge remote-tracking branch 'server/master'

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

@@ -1362,7 +1362,8 @@ public class SailingServiceImpl extends RemoteServiceServlet implements SailingS
                 speedWithBearing==null?null:createSpeedWithBearingDTO(speedWithBearing), windDTO, tack, legType, extrapolated);
     }
 
-    @Override
+    @SuppressWarnings("deprecation")
+	@Override
     public RaceTimesInfoDTO getRaceTimesInfo(RaceIdentifier raceIdentifier) {
         RaceTimesInfoDTO raceTimesInfo = null;
         TrackedRace trackedRace = getExistingTrackedRace(raceIdentifier);
@@ -1424,7 +1425,30 @@ public class SailingServiceImpl extends RemoteServiceServlet implements SailingS
                     legNumber++;
                 }
             }
-        }        
+        }   
+        
+        // special instrumentation for strange race times
+        if(raceTimesInfo.startOfTracking != null) {
+            boolean allDatesAtSameDay = true;
+            int initialDay = raceTimesInfo.startOfTracking.getDay();
+            if(raceTimesInfo.startOfRace != null && raceTimesInfo.startOfRace.getDay() != initialDay) {
+            	allDatesAtSameDay = false;
+            }
+            if(raceTimesInfo.newestTrackingEvent != null && raceTimesInfo.newestTrackingEvent.getDay() != initialDay) {
+            	allDatesAtSameDay = false;
+            }
+            if(raceTimesInfo.endOfTracking != null && raceTimesInfo.endOfTracking.getDay() != initialDay) {
+            	allDatesAtSameDay = false;
+            }
+            if(raceTimesInfo.endOfRace != null && raceTimesInfo.endOfRace.getDay() != initialDay) {
+            	allDatesAtSameDay = false;
+            }
+            if(!allDatesAtSameDay) {
+        		logger.warning("Not all raceTimeInfos times are at the same day.");
+        		logger.warning(raceTimesInfo.toString());
+        	}
+        }
+
         return raceTimesInfo;
     }
     

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

@@ -4,6 +4,7 @@ import com.google.gwt.user.client.rpc.IsSerializable;
 import com.sap.sailing.domain.common.LegType;
 
 public class LegInfoDTO extends NamedDTO implements IsSerializable {
+
     public int legNumber;
     
     public LegType legType;
@@ -15,4 +16,11 @@ public class LegInfoDTO extends NamedDTO implements IsSerializable {
     public LegInfoDTO(int legNumber) {
         this.legNumber = legNumber;
     }
+
+	@Override
+	public String toString() {
+		return "LegInfoDTO [name=" + name + ", legNumber=" + legNumber
+				+ ", legType=" + legType + ", legBearingInDegrees="
+				+ legBearingInDegrees + "]";
+	}
 }

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

@@ -19,4 +19,11 @@ public class MarkPassingTimesDTO extends NamedDTO implements IsSerializable {
     public MarkPassingTimesDTO(String name) {
         this.name = name;
     }
+
+	@Override
+	public String toString() {
+		return "MarkPassingTimesDTO [firstPassingDate=" + firstPassingDate
+				+ ", lastPassingDate=" + lastPassingDate + ", name=" + name
+				+ "]";
+	}
 }

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

@@ -8,7 +8,7 @@ import com.google.gwt.user.client.rpc.IsSerializable;
 import com.sap.sailing.domain.common.RaceIdentifier;
 
 public class RaceTimesInfoDTO implements IsSerializable {
-    private RaceIdentifier raceIdentifier;
+	private RaceIdentifier raceIdentifier;
 
     public List<LegInfoDTO> legInfos;
 
@@ -103,4 +103,15 @@ public class RaceTimesInfoDTO implements IsSerializable {
     public void setMarkPassingTimes(List<MarkPassingTimesDTO> markPassingTimes) {
         this.markPassingTimes = markPassingTimes;
     }
+    
+    @Override
+	public String toString() {
+		return "RaceTimesInfoDTO [raceIdentifier=" + raceIdentifier
+				+ ", legInfos=" + legInfos + ", markPassingTimes="
+				+ markPassingTimes + ", startOfRace=" + startOfRace
+				+ ", startOfTracking=" + startOfTracking + ", endOfTracking="
+				+ endOfTracking + ", endOfRace=" + endOfRace
+				+ ", newestTrackingEvent=" + newestTrackingEvent
+				+ ", delayToLiveInMs=" + delayToLiveInMs + "]";
+	}
 }