Merge branch 'master' of ssh://195.227.10.246/home/trac/git

java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRace.java

@@ -137,8 +137,7 @@ public interface TrackedRace {
     WindTrack getWindTrack(WindSource windSource);
 
     /**
-     * Waits until {@link #getUpdateCount()} is after <code>since</code>.
-     * @param sinceUpdate TODO
+     * Waits until {@link #getUpdateCount()} is after <code>sinceUpdate</code>.
      */
     void waitForNextUpdate(int sinceUpdate) throws InterruptedException;
 
@@ -149,4 +148,10 @@ public interface TrackedRace {
     NavigableSet<MarkPassing> getMarkPassings(Competitor competitor);
 
     void removeWind(Wind wind, WindSource windSource);
+
+    /**
+     * Time stamp that the last event received from the underlying push service carried on it.
+     * Note that these times may not increase monotonically.
+     */
+    TimePoint getTimePointOfLastEvent();
 }

java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java

@@ -46,6 +46,7 @@ public abstract class TrackedRaceImpl implements TrackedRace, CourseListener {
     private TimePoint start;
     private TimePoint finish;
     private TimePoint timePointOfNewestEvent;
+    private TimePoint timePointOfLastEvent;
     private int updateCount;
     
     private final Map<TimePoint, TreeSet<Competitor>> competitorRankings; 
@@ -352,6 +353,11 @@ public abstract class TrackedRaceImpl implements TrackedRace, CourseListener {
     public TimePoint getTimePointOfNewestEvent() {
         return timePointOfNewestEvent;
     }
+    
+    @Override
+    public TimePoint getTimePointOfLastEvent() {
+        return timePointOfLastEvent;
+    }
 
     /**
      * @param timeOfEvent may be <code>null</code> meaning to only unblock waiters but not update any time points
@@ -366,6 +372,7 @@ public abstract class TrackedRaceImpl implements TrackedRace, CourseListener {
             if (startOfTracking == null || startOfTracking.compareTo(timeOfEvent) > 0) {
                 startOfTracking = timeOfEvent;
             }
+            timePointOfLastEvent = timeOfEvent;
         }
         notifyAll();
     }

java/com.sap.sailing.expeditionconnector.test/src/com/sap/sailing/expeditionconnector/test/MockedTrackedRace.java

@@ -243,4 +243,10 @@ public class MockedTrackedRace implements DynamicTrackedRace {
         
     }
 
+    @Override
+    public TimePoint getTimePointOfLastEvent() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
 }

java/com.sap.sailing.server/src/com/sap/sailing/server/ModeratorApp.java

@@ -200,6 +200,8 @@ public class ModeratorApp extends Servlet {
                         .asMillis());
                 jsonRace.put("timeofnewestevent", trackedRace.getTimePointOfNewestEvent() == null ? 0l : trackedRace
                         .getTimePointOfNewestEvent().asMillis());
+                jsonRace.put("timeoflastevent", trackedRace.getTimePointOfLastEvent() == null ? 0l : trackedRace
+                        .getTimePointOfLastEvent().asMillis());
                 jsonRace.put("updatecount", trackedRace.getUpdateCount());
                 Position positionForWind = null;
                 TrackedLeg currentLeg = trackedRace.getCurrentLeg(timePoint);