Merge branch 'master' of ssh://kielweek.web4sap.com/home/trac/git

java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/AbstractRaceColumn.java

@@ -58,8 +58,14 @@ public abstract class AbstractRaceColumn implements RaceColumn {
 
     @Override
     public void setTrackedRace(Fleet fleet, TrackedRace trackedRace) {
-        TrackedRace previouslyLinkedRace = this.trackedRaces.put(fleet, trackedRace);
-        this.setRaceIdentifier(fleet, trackedRace == null ? null : trackedRace.getRaceIdentifier());
+        TrackedRace previouslyLinkedRace = this.trackedRaces.get(fleet);
+        if (trackedRace == null) {
+            setRaceIdentifier(fleet, null);
+            this.trackedRaces.remove(fleet);
+        } else {
+            this.trackedRaces.put(fleet, trackedRace);
+            this.setRaceIdentifier(fleet, trackedRace.getRaceIdentifier());
+        }
         if (previouslyLinkedRace != null) {
             notifyListenersAboutTrackedRaceUnlinked(fleet, previouslyLinkedRace);
         }
@@ -90,7 +96,11 @@ public abstract class AbstractRaceColumn implements RaceColumn {
 
     @Override
     public void setRaceIdentifier(Fleet fleet, RaceIdentifier raceIdentifier) {
-        this.raceIdentifiers.put(fleet, raceIdentifier);
+        if (raceIdentifier == null) {
+            this.raceIdentifiers.remove(fleet);
+        } else {
+            this.raceIdentifiers.put(fleet, raceIdentifier);
+        }
     }
 
     @Override

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

@@ -298,15 +298,6 @@ public class LeaderboardConfigPanel extends FormPanel implements RegattaDisplaye
         hPanel.setSpacing(5);
         vPanel.add(hPanel);
 
-        Button stressTestButton = new Button(stringMessages.stressTest());
-        hPanel.add(stressTestButton);
-        stressTestButton.addClickHandler(new ClickHandler() {
-            @Override
-            public void onClick(ClickEvent event) {
-                performStressTestForSelectedLeaderboard();
-            }
-        });
-
         // ------------ races of the selected leaderboard ----------------
         AnchorCell raceAnchorCell = new AnchorCell();
         Column<Pair<RaceColumnDTO, String>, SafeHtml> raceLinkColumn = new Column<Pair<RaceColumnDTO, String>, SafeHtml>(raceAnchorCell) {
@@ -451,24 +442,6 @@ public class LeaderboardConfigPanel extends FormPanel implements RegattaDisplaye
 
     }
     
-    private void performStressTestForSelectedLeaderboard() {
-        if (selectedLeaderboard != null) {
-            final String leaderboardName = selectedLeaderboard.name;
-            sailingService.stressTestLeaderboardByName(leaderboardName, 100, new AsyncCallback<Void>() {
-                @Override
-                public void onFailure(Throwable caught) {
-                    errorReporter.reportError("Error during leaderboard stress test for " + leaderboardName + ": "
-                            + caught.getMessage());
-                }
-
-                @Override
-                public void onSuccess(Void result) {
-                    errorReporter.reportError("Stress test for " + leaderboardName + " finished successfully ");
-                }
-            });
-        }
-    }
-
     private void unlinkRaceColumnFromTrackedRace(final String raceColumnName, final String fleetName) {
         final String selectedLeaderboardName = getSelectedLeaderboardName();
         sailingService.disconnectLeaderboardColumnFromTrackedRace(selectedLeaderboardName, raceColumnName, fleetName,

java/com.sap.sailing.kiworesultimport.test/.gitignore

@@ -0,0 +1 @@
+bin/

java/com.sap.sailing.kiworesultimport/.gitignore

@@ -0,0 +1 @@
+bin/

java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/RegattaSummary.java

@@ -24,4 +24,6 @@ public interface RegattaSummary {
      * All {@link Boat} objects that participated in this regatta
      */
     Iterable<Boat> getBoats();
+    
+    String getEvent();
 }

java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/impl/RegattaSummaryImpl.java

@@ -15,9 +15,12 @@ public class RegattaSummaryImpl implements RegattaSummary {
     private final String boatClassName;
     private final Iterable<Boat> boats;
     private final TimePoint timePointPublished;
+    private final String event;
     
-    public RegattaSummaryImpl(Iterable<RaceSummary> races, String boatClassName, Iterable<Boat> boats, TimePoint timePointPublished) {
+    public RegattaSummaryImpl(String event, Iterable<RaceSummary> races, String boatClassName, Iterable<Boat> boats,
+            TimePoint timePointPublished) {
         super();
+        this.event = event;
         this.races = races;
         this.boatClassName = boatClassName;
         this.boats = boats;
@@ -64,4 +67,9 @@ public class RegattaSummaryImpl implements RegattaSummary {
         return boats;
     }
 
+    @Override
+    public String getEvent() {
+        return event;
+    }
+
 }

java/com.sap.sailing.kiworesultimport/src/com/sap/sailing/kiworesultimport/impl/ZipFileImpl.java

@@ -66,7 +66,8 @@ public class ZipFileImpl implements ZipFile {
                 raceSummaries.add(new RaceSummaryImpl(boatClassNameAndLatestResultList.getKey(), resultsPerBoat,
                         fleetNamesPerBoatClassAndRaceNumber.get(boatClassNameAndLatestResultList.getKey()).get(raceNumber), raceNumber));
             }
-            RegattaSummary regattaSummary = new RegattaSummaryImpl(raceSummaries, boatClassNameAndLatestResultList.getKey(), resultList.getBoats(),
+            RegattaSummary regattaSummary = new RegattaSummaryImpl(boatClassNameAndLatestResultList.getValue()
+                    .getEvent(), raceSummaries, boatClassNameAndLatestResultList.getKey(), resultList.getBoats(),
                     resultList.getTimePointPublished());
             regattaSummaryByBoatClass.put(regattaSummary.getBoatClassName(), regattaSummary);
         }