Merge remote-tracking branch 'server/master'

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardGroupConfigPanel.java

@@ -490,7 +490,6 @@ public class LeaderboardGroupConfigPanel extends AbstractEventPanel {
             }
             @Override
             public void onFailure(Throwable t) {
-                errorReporter.reportError("Error trying to obtain list of leaderboard groups: " + t.getMessage());
             }
         });
     }
@@ -634,24 +633,40 @@ public class LeaderboardGroupConfigPanel extends AbstractEventPanel {
     }
     
     private void groupSelectionChanged() {
-        LeaderboardGroupDTO selectedGroup = groupsSelectionModel.getSelectedObject();
-        if (selectedGroup != null) {
-            //Display details of the group
-            groupDetailsCaptionPanel.setCaptionText(stringConstants.detailsOfLeaderboardGroup() + " '" + selectedGroup.name + "'");
-            descriptionTextArea.setText(selectedGroup.description);
-            setDescriptionEditable(false);
-            
-            groupDetailsSelectionModel.clear();
-            groupDetailsProvider.getList().clear();
-            groupDetailsProvider.getList().addAll(selectedGroup.leaderboards);
-            //Reload available leaderboards and remove leaderboards of the group from the list
-            leaderboardsSelectionModel.clear();
-            leaderboardsFilterTextBox.setText("");
-            leaderboardsProvider.getList().clear();
-            leaderboardsProvider.getList().addAll(availableLeaderboards);
-            leaderboardsProvider.getList().removeAll(selectedGroup.leaderboards);
-        }
+        final LeaderboardGroupDTO selectedGroup = groupsSelectionModel.getSelectedObject();
         splitPanel.setVisible(selectedGroup != null);
+        if (selectedGroup != null) {
+            sailingService.getLeaderboardGroupByName(selectedGroup.name, new AsyncCallback<LeaderboardGroupDTO>() {
+                @Override
+                public void onFailure(Throwable t) {
+                    errorReporter.reportError("Error trying to obtain the leaderboard group " + selectedGroup.name + ": " + t.getMessage());
+                }
+                @Override
+                public void onSuccess(LeaderboardGroupDTO result) {
+                    //Updating the data lists
+                    availableLeaderboardGroups.set(availableLeaderboardGroups.indexOf(selectedGroup), result);
+                    groupsProvider.getList().clear();
+                    groupsProvider.getList().addAll(availableLeaderboardGroups);
+                    groupsSelectionModel.setSelected(result, true);
+
+                    //Display details of the group
+                    groupDetailsCaptionPanel.setCaptionText(stringConstants.detailsOfLeaderboardGroup() + " '" + result.name + "'");
+                    descriptionTextArea.setText(result.description);
+                    setDescriptionEditable(false);
+                    
+                    groupDetailsSelectionModel.clear();
+                    groupDetailsProvider.getList().clear();
+                    groupDetailsProvider.getList().addAll(result.leaderboards);
+                    
+                    //Reload available leaderboards and remove leaderboards of the group from the list
+                    leaderboardsSelectionModel.clear();
+                    leaderboardsFilterTextBox.setText("");
+                    leaderboardsProvider.getList().clear();
+                    leaderboardsProvider.getList().addAll(availableLeaderboards);
+                    leaderboardsProvider.getList().removeAll(result.leaderboards);
+                }
+            });
+        }
     }
     
     private void leaderboardsFilterChanged() {

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

@@ -95,8 +95,9 @@ public class RaceTimePanel extends TimePanel<RaceTimePanelSettings> implements R
                 // we set here the min and max of the time slider, the start and end of the race as well as the known
                 // leg markers
                 long livePlayDelayInMillis = timer.getLivePlayDelayInMillis();
+                long eventTimeoutTolerance = 30 * 1000; // 30s 
                 long liveTimePointInMillis = System.currentTimeMillis() - livePlayDelayInMillis;
-                if (liveTimePointInMillis < raceTimesInfo.timePointOfNewestEvent.getTime()
+                if (liveTimePointInMillis < raceTimesInfo.timePointOfNewestEvent.getTime() + eventTimeoutTolerance
                         && liveTimePointInMillis > raceTimesInfo.startOfTracking.getTime()) {
                     // don't worry; this will only fire an event if something actually changed
                     timer.setPlayMode(PlayModes.Live);