Merge branch 'master' into tw2015

Conflicts:
	java/com.sap.sailing.gwt.ui/SailingGWT.launch

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/Regatta.java

@@ -57,15 +57,6 @@ public class Regatta extends Composite {
     @UiField SpanElement racesCount;
     @UiField SpanElement trackedRacesCount;
     @UiField DivElement isLiveDiv;
-//    @UiField TableElement isLiveDiv2;
-//    @UiField DivElement isFinishedDiv;
-//    @UiField DivElement isFinishedDiv2;
-//    @UiField DivElement isScheduledDiv;
-//    @UiField AnchorElement leaderboardLink;
-//    @UiField DivElement liveRaceInfosPerFleetPanel;
-//    @UiField(provided=true) RegattaCompetitor competitorWithRank1;
-//    @UiField(provided=true) RegattaCompetitor competitorWithRank2;
-//    @UiField(provided=true) RegattaCompetitor competitorWithRank3;
 
     @UiField Anchor regattaDetailsLink;
     

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/eventregatta/EventRegattaList.java

@@ -126,15 +126,18 @@ public class EventRegattaList extends Composite {
             for (LeaderboardGroupDTO lg : presenter.getCtx().getLeaderboardGroups()) {
                 boolean isVisible = leaderboardGroup.getName().equals(lg.getName());
                 List<Regatta> regattaElements = regattaElementsByLeaderboardGroup.get(lg.getName());
+                if (regattaElements != null) {
                     for (Regatta regatta : regattaElements) {
                         regatta.setVisible(isVisible);
                     }
                 }
+            }
         } else {
             // make all regattas visible
             filterNoLeaderboardGroupsAnchor.addClassName(EventRegattaListResources.INSTANCE.css().selectedItem());
             for (LeaderboardGroupDTO lg : presenter.getCtx().getLeaderboardGroups()) {
                 List<Regatta> regattaElements = regattaElementsByLeaderboardGroup.get(lg.getName());
+                if (regattaElements != null) {
                     for (Regatta regatta : regattaElements) {
                         regatta.setVisible(true);
                     }
@@ -142,3 +145,4 @@ public class EventRegattaList extends Composite {
             }
         }
     }
+}

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

@@ -697,6 +697,11 @@ public class LeaderboardGroupConfigPanel extends AbstractRegattaPanel implements
                                 for (int i = 0; i < availableLeaderboardGroups.size(); i++) {
                                     LeaderboardGroupDTO group = availableLeaderboardGroups.get(i);
                                     if (oldGroupName.equals(group.getName())) {
+                                        // if the leaderboard is selected, de-select equality/hashCode may change) and select again when done
+                                        final boolean wasSelected = Util.equalsWithNull(groupToUpdate, getSelectedGroup());
+                                        if (wasSelected) {
+                                            groupsSelectionModel.setSelected(groupToUpdate, false);
+                                        }
                                         groupToUpdate.setName(updateDescriptor.getName());
                                         groupToUpdate.description = updateDescriptor.getDescription();
                                         groupToUpdate.setDisplayName(updateDescriptor.getDisplayName());
@@ -708,6 +713,9 @@ public class LeaderboardGroupConfigPanel extends AbstractRegattaPanel implements
                                         if (displayedIndex != -1) {
                                             groupsProvider.getList().set(displayedIndex, groupToUpdate);
                                         }
+                                        if (wasSelected) {
+                                            groupsSelectionModel.setSelected(groupToUpdate, true);
+                                        }
                                     }
                                 }
                                 groupsFilterablePanel.updateAll(availableLeaderboardGroups);

java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/PageObject.java

@@ -44,7 +44,7 @@ import com.sap.sailing.selenium.core.SeleniumFieldDecorator;
  *   D049941
  */
 public class PageObject {
-    public static final int DEFAULT_WAIT_TIMEOUT_SECONDS = 60;
+    public static final int DEFAULT_WAIT_TIMEOUT_SECONDS = 120;
     
     public static final int DEFAULT_POLLING_INTERVAL = 5;