32149445146adc71831e035e8f40ca39c75629e3
java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/MarkPassingCalculator.java
| ... | ... | @@ -590,18 +590,18 @@ public class MarkPassingCalculator { |
| 590 | 590 | suspended = false; |
| 591 | 591 | } else { |
| 592 | 592 | suspended = false; |
| 593 | - if (markPassingRaceFingerprintRegistry != null) { |
|
| 594 | - enqueueUpdate(new StorePositionUpdateStrategy() { |
|
| 595 | - @Override |
|
| 596 | - public void storePositionUpdate(Map<Competitor, List<GPSFixMoving>> competitorFixes, |
|
| 597 | - Map<Competitor, List<GPSFixMoving>> competitorFixesThatReplacedExistingOnes, |
|
| 598 | - Map<Mark, List<GPSFix>> markFixes, List<Waypoint> addedWaypoints, |
|
| 599 | - List<Waypoint> removedWaypoints, IntHolder smallestChangedWaypointIndex, |
|
| 600 | - List<Triple<Competitor, Integer, TimePoint>> fixedMarkPassings, |
|
| 601 | - List<Pair<Competitor, Integer>> removedMarkPassings, |
|
| 602 | - List<Pair<Competitor, Integer>> suppressedMarkPassings, |
|
| 603 | - List<Competitor> unSuppressedMarkPassings, CandidateFinder candidateFinder, |
|
| 604 | - CandidateChooser candidateChooser) { |
|
| 593 | + enqueueUpdate(new StorePositionUpdateStrategy() { |
|
| 594 | + @Override |
|
| 595 | + public void storePositionUpdate(Map<Competitor, List<GPSFixMoving>> competitorFixes, |
|
| 596 | + Map<Competitor, List<GPSFixMoving>> competitorFixesThatReplacedExistingOnes, |
|
| 597 | + Map<Mark, List<GPSFix>> markFixes, List<Waypoint> addedWaypoints, |
|
| 598 | + List<Waypoint> removedWaypoints, IntHolder smallestChangedWaypointIndex, |
|
| 599 | + List<Triple<Competitor, Integer, TimePoint>> fixedMarkPassings, |
|
| 600 | + List<Pair<Competitor, Integer>> removedMarkPassings, |
|
| 601 | + List<Pair<Competitor, Integer>> suppressedMarkPassings, |
|
| 602 | + List<Competitor> unSuppressedMarkPassings, CandidateFinder candidateFinder, |
|
| 603 | + CandidateChooser candidateChooser) { |
|
| 604 | + if (markPassingRaceFingerprintRegistry != null) { |
|
| 605 | 605 | initializationExecutor.submit(()->{ |
| 606 | 606 | final Map<Competitor, Map<Waypoint, MarkPassing>> markPassings = race.getMarkPassings(/* waitForLatestUpdates */ true); |
| 607 | 607 | markPassingRaceFingerprintRegistry.storeMarkPassings(race.getRaceIdentifier(), |
| ... | ... | @@ -609,8 +609,8 @@ public class MarkPassingCalculator { |
| 609 | 609 | markPassings, race.getRace().getCourse()); |
| 610 | 610 | }); |
| 611 | 611 | } |
| 612 | - }); |
|
| 613 | - } |
|
| 612 | + } |
|
| 613 | + }); |
|
| 614 | 614 | } |
| 615 | 615 | } |
| 616 | 616 | } finally { |
| ... | ... | @@ -667,4 +667,4 @@ public class MarkPassingCalculator { |
| 667 | 667 | public String toString() { |
| 668 | 668 | return getClass().getName() + " for " + race + " / " + race.getTrackedRegatta().getRegatta() + " with chooser " + chooser; |
| 669 | 669 | } |
| 670 | -} |
|
| ... | ... | \ No newline at end of file |
| 0 | +} |
java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/regatta/RegattaDetailsCompositePO.java
| ... | ... | @@ -72,8 +72,8 @@ public class RegattaDetailsCompositePO extends PageArea { |
| 72 | 72 | if (entry != null) { |
| 73 | 73 | WebElement removeAction = ActionsHelper.findRemoveAction(entry.getWebElement()); |
| 74 | 74 | removeAction.click(); |
| 75 | - ActionsHelper.acceptAlert(this.driver); |
|
| 76 | - waitForAjaxRequests(); |
|
| 75 | + ActionsHelper.acceptAlert(this.driver); |
|
| 76 | + waitForAjaxRequests(); |
|
| 77 | 77 | } |
| 78 | 78 | } |
| 79 | 79 |