Commit Graph
100 Commits
Author SHA1 Message Date
Axel Uhl e39b49bfd6 Merge remote-tracking branch 'server/master' 2016-07-23 01:11:52 +02:00
Axel Uhl d27397179a fixed another issue related to bug 3811: comparison of Integer waypoint index with another Integer with == fails for different instances of the number 0
Change-Id: I6e3579318cdea2987322c898f465aed6bf27c594
2016-07-23 01:03:46 +02:00
Axel Uhl fabe0705fa made compileable by adjusting the readResolve() method of DynamicTrackedRaceImpl
Change-Id: Ibc6a359c644ec375ac22677d519a97ef86694361
2016-07-23 00:51:31 +02:00
Axel Uhl e6efbcc67e bug 3811: don't re-establish a MarkPassingCalculator in a de-serialized TrackedRaceImpl object;
replicas receive mark passings through UpdateMarkPassing operations

Change-Id: I3045efe9b21ebe5de871270802be663d83a3811a
2016-07-23 00:42:13 +02:00
Axel Uhl 85ea562c36 fixing syntax of StartAnalysisRaceMap.gss
Change-Id: I032d3b828544b39e81c07651752045e2f75edea4
2016-07-22 09:14:19 +02:00
Axel Uhl 9d094eb0c9 trying to fix compilation error after bug 3775 changed style trueNorthIndicator to trueNorthIndicatorPanel
Change-Id: I75613a4b3091d288da7ab6cee362161f85b6941d
2016-07-22 09:12:06 +02:00
Axel Uhl 3cb290207b added cleaning of dashboards GWT project at the beginning of the build
Change-Id: Ia6d3a1decc0cdba4b03459c82e4170624f0e0c0f
2016-07-22 09:04:11 +02:00
Axel Uhl e3f0be4018 fixed ordering or device mapping from/to columns for empty values
Change-Id: I4c9de8af76863be6960f65adae789d12bef79e9d
2016-07-21 23:07:24 +02:00
Axel Uhl 44e69b6b16 Merge branch 'raceboardmodes' 2016-07-21 19:34:31 +02:00
Axel Uhl c22314e725 Merge branch 'bug3785' 2016-07-21 19:28:53 +02:00
Axel Uhl f3daa02042 Merge branch 'bug3785' 2016-07-21 17:23:32 +02:00
Axel Uhl 5624e46a5c Merge remote-tracking branch 'server/master' 2016-07-21 17:22:53 +02:00
Axel Uhl 3a60c0a947 fixed bug 3801 by introducing a send/buffer Timer that collects fix sending intents during the send interval
Change-Id: If78ef584dbdc718af665c8e2b671fbf1f1c57da3
2016-07-21 17:14:32 +02:00
Axel Uhl fb5931a2b5 fixing "KnKn" duplicate unit appending for SOG display in InSight app, fixing bug 3799
Change-Id: I8aaf738365bc7806b878ccdafb15366423f55a2e
2016-07-21 15:53:34 +02:00
Axel Uhl 51b3c7190d made preference objects and their converters transient
Change-Id: I9f892f69e736131fb0d8bcb197a06372339e41b8
2016-07-21 13:37:16 +02:00
Axel Uhl 36fc322a34 Merge branch 'master' into bug3798 2016-07-21 13:13:10 +02:00
Axel Uhl 5d062c2d71 Merge branch 'bug3785' 2016-07-21 13:11:47 +02:00
Axel Uhl 92ff7cccda Merge branch 'master' into bug3798
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
	java/com.sap.sailing.www/release_notes_admin.html

Change-Id: I62653e839d19957e48a292497c8d13b29a90c0fe
2016-07-21 13:10:14 +02:00
Axel Uhl 3c35ec4d23 Merge remote-tracking branch 'server/master' 2016-07-21 13:07:46 +02:00
Axel Uhl 4a62df1fd0 fixed several compilation issues after pulling through th maximumNumberOfDiscards field
Change-Id: I1b4afc391de68c148da6bf735917016719211dea
2016-07-21 12:56:41 +02:00
Axel Uhl 221cee122d added maximumNumberOfDiscards throughout the Series maintenance, persistence, UI and replication chain
Change-Id: Id91a6e82f6445bb2de826d2fcf1ed7b5bf4ba853
2016-07-21 12:25:47 +02:00
Axel Uhl d64b2e9a82 push the leaderboard received for a specific time point into the LeaderboardPanel to ensure consistency; see bug 3797
Change-Id: Id2854f6246a491c604658c9254bb7a7114bae9d3
2016-07-21 11:20:09 +02:00
Axel Uhl eaf5d32cf6 changed toggleExpansion() to changeExpansionState(boolean), queueing not toggles but desired expansion states; see bug 3797
Change-Id: I2da4ce90f48c5eecb5fea7c41c0a5756bd59bb16
2016-07-21 11:13:07 +02:00
Axel Uhl 9d9b66ae00 Merge remote-tracking branch 'server/bug3785' into bug3785 2016-07-21 09:49:48 +02:00
Axel Uhl 9e6fd28244 Merge remote-tracking branch 'server/bug3785' into bug3785 2016-07-21 09:48:22 +02:00
EC2 Server 34c89fd4b6 fixed Event-SSL macro 2016-07-20 21:12:46 +00:00
Axel Uhl c000ac31e0 Merge remote-tracking branch 'server/master' 2016-07-20 22:46:07 +02:00
Axel Uhl 90d9ea47de handle QUERY_STRING better in apache 000-macros.conf; locale is now properly put before fragment in rewrite rules
Change-Id: Ied02e5c7d7cedfc0707209dfaa48c8dc7fb952e0
2016-07-20 22:45:05 +02:00
Axel Uhl 2ff60fb044 Merge branch 'raceboardmodes' 2016-07-20 20:33:59 +02:00
Axel Uhl 382428bd3d fixed notification message text
Change-Id: I54f34f6886c7bb76246790d7343fe72a2abc7e34
2016-07-20 18:42:06 +02:00
Axel Uhl 1dd5db458b Merge branch 'master' into bug3785 2016-07-20 18:38:20 +02:00
Axel Uhl 60dbb42d67 working towards bug 3798: implemented scoring specials, optionally limiting the number of discards in a series
Change-Id: Ifa5ec9e14791aac6bfc9648450d91e80a49039ad
2016-07-20 16:46:15 +02:00
Axel Uhl f952be214f added a "buffer" for toggleExpansion() requests; see bug 3797 comment #7
Change-Id: Ibc123564bc6fe6be9c55c443776c786adb3500f5
2016-07-20 15:12:10 +02:00
Axel Uhl 0450b59fa0 formatting
Change-Id: I8deb0461f8d94f2cc7eac3f35712d7c2e95f0ced
2016-07-20 14:44:10 +02:00
Axel Uhl 6a807cff29 Merge branch 'raceboardmodes' 2016-07-20 14:43:58 +02:00
Axel Uhl 6f68b4921a Merge remote-tracking branch 'server/raceboardmodes' into raceboardmodes
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/ExpandableSortableColumn.java

Change-Id: I9eee210b53c442a807d51662d80e548a5105a5c5
2016-07-20 14:28:50 +02:00
Axel Uhl f6fd637c99 suggestion regarding always setting the "in progress" to false and resetting the "busy" indicator
Change-Id: Ica225b6a44d1f70968d09bb37a76fc23956c0fea
2016-07-20 13:57:43 +02:00
Axel Uhl e595841051 fixed test error after an incorrect test "refactoring"
Change-Id: I3e88b55a4ab590ddeba0148c6e9a04aea12ad214
2016-07-20 13:48:18 +02:00
Axel Uhl 59244825e0 using leaderboard display name in e-mail invitations if available, plus the event name
Change-Id: I9f670dd1adc3b562e12e8fb27a9f1f47bb1ae1da
2016-07-20 11:45:52 +02:00
Axel Uhl c3596bb5ee Merge branch 'bug3794' into bug3794-failing-test
Conflicts:
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RaceLogScoringReplicator.java

Change-Id: Ib5000c43c003dfc791f34306ea0fe9d208e0f3e4
2016-07-20 11:08:50 +02:00
Axel Uhl 352c007a49 a failing test case for bug3794, trying to push scores through the race log into the leaderboard's score corrections
Change-Id: I35bc58c25f032e254932b157790557c6f07d3621
2016-07-20 11:07:25 +02:00
Axel Uhl f0c75e7a13 Merge branch 'master' into bug3794 2016-07-20 09:51:36 +02:00
Axel Uhl 1fa86545a8 Merge remote-tracking branch 'server/bug3785' into bug3785 2016-07-20 01:54:27 +02:00
Axel Uhl f0bbff8ecf added a null check in RacingEventServiceImpl where the notificationService may be null, especially in test cases
Change-Id: I508b4fc8ae083b57ab49c1c0b809a5b10df33a5c
2016-07-20 01:47:59 +02:00
Axel Uhl 9f1f12f88e Merge branch 'master' into bug3785 2016-07-20 01:14:17 +02:00
Axel Uhl 2d30f19415 added "Juliet" in addition to "Juliett" as possible course area name
Change-Id: Ice3d56a6f1f63718d31e389be68707d95884be59
2016-07-20 01:12:06 +02:00
Axel Uhl 1951e335d0 added "Alfa" as the international name for a course area; fixed spelling of "Foxtrot" course area (was "Foxtrott")
Change-Id: Ib492dc2338b7bcb80d0474446c0f4695ea75daed
2016-07-20 01:08:06 +02:00
Axel Uhl e84fd7ff01 removed the commented code, some formatting issues, use Util.equalsWithNull(...) 2016-07-19 23:49:49 +02:00
Axel Uhl 27ae517fca Merge branch 'master' into bug3794 2016-07-19 22:36:33 +02:00
Axel Uhl e1a4058809 Merge remote-tracking branch 'server/bug3790' 2016-07-19 17:27:39 +02:00
Axel Uhl dc5f42baa1 Merge remote-tracking branch 'server/ubilabs--tracking_app--bug-3769' 2016-07-19 17:02:05 +02:00
Axel Uhl 31e8e248ff avoid warnings
Change-Id: I8794623bed951e84a9d1405d5d3fe01234f6ea52
2016-07-19 17:01:36 +02:00
Axel Uhl 5df840c0d4 made user store variable final in Activator
Change-Id: I0d5119b0e78809ecbfc1c22a7a942361355364e9
2016-07-19 16:27:47 +02:00
Axel Uhl 7207e2edcb whitespace changes only
Change-Id: Ied1d1f84ed21153c57f803836a6655bbf335f819
2016-07-19 16:27:05 +02:00
Axel Uhl 1d9dd796a0 added some Javadoc to User methods
Change-Id: I10a6a550dd61cad9b6aa72f71fdf31fcc5ca00cd
2016-07-19 16:09:27 +02:00
Axel Uhl ee8d0bbe36 fixed notification message for competitor score correction
Change-Id: I334d470d3a4a10f793a979a5aa74e8a4d26d32e6
2016-07-19 16:09:10 +02:00
Axel Uhl fc31383809 renamed parameter
Change-Id: I02e35cbe8c2e8ba19ecff8128f8c34bd3e94679c
2016-07-19 16:08:37 +02:00
Axel Uhl a6bb1d2d7d avoid creating threads for notifications; use existing scheduler in RacingEventServiceImpl instead
Change-Id: I2e590a285139294bbeb918dbedb5cea5f2c01905
2016-07-19 13:27:39 +02:00
Axel Uhl 1b1c5ea653 Merge remote-tracking branch 'server/bug3785' into bug3785 2016-07-19 13:14:48 +02:00
Axel Uhl 7eff56ad65 Merge branch 'master' into bug3785 2016-07-19 13:13:53 +02:00
Axel Uhl 8f8a9a938d Merge branch 'master' into bug3786 2016-07-19 13:04:25 +02:00
Axel Uhl 8e2f6a7b46 added LowPointTieBreakBasedOnLastSeriesOnly
Change-Id: I7ad5d0d33e8fba35fb4d67f934af29d719f1f0b0
2016-07-18 18:25:57 +02:00
Axel Uhl 7b6376d9a7 added scoring scheme LOW_POINT_TIE_BREAK_BASED_ON_LAST_SERIES_ONLY
Change-Id: I471fb6c882406414940d39ff43f1a4b5dd598baf
2016-07-18 17:48:18 +02:00
Axel Uhl 133fcdaa58 Merge branch 'master' into bug3785
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/Home.gwt.xml
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java

Change-Id: I73298972a7761dc6580154ecc83d5eda1b39fadc
2016-07-18 13:06:54 +02:00
Axel Uhl f1aa6c8d36 Merge remote-tracking branch 'server/raceboardmodes' into raceboardmodes 2016-07-18 13:02:27 +02:00
Axel Uhl e4bbb427ce Merge branch 'master' into bug3785 2016-07-18 10:22:46 +02:00
Axel Uhl 8d36f52620 Merge branch 'master' into raceboardmodes 2016-07-18 10:01:50 +02:00
Axel Uhl e08b6c1622 Merge remote-tracking branch 'server/master' 2016-07-18 10:01:32 +02:00
Axel Uhl fead633e77 Merge branch 'master' into raceboardmodes 2016-07-17 23:15:55 +02:00
Axel Uhl 9147d7cca8 create the wind simulator thread as a daemon thread to not keep VM from shutting down if requested 2016-07-17 23:15:02 +02:00
Axel Uhl 4e55229115 stop receiving triggers in RaceBoardModes when no longer necessary 2016-07-17 23:09:27 +02:00
Axel Uhl 279f03e062 Merge branch 'master' into raceboardmodes 2016-07-17 18:12:45 +02:00
Axel Uhl 559c768175 pause timer if in live mode for start analysis; addresses comment #23 of bug 3779 2016-07-17 17:48:30 +02:00
Axel Uhl 80531e5fba for winning lanes mode, fixed trigger() method which has to wait for the competitors in race before selecting them 2016-07-17 17:19:53 +02:00
Axel Uhl 1ea6443aad trying to increase the probability that the StartModeAnalysis view shows the chart and the map reasonably well 2016-07-17 14:27:36 +02:00
Axel Uhl 4a081c5776 fixed issue in SimpleRaceMetadataDTO for RUNNING race state, causing Start Analysis menu item to appear properly
Change-Id: I66221118a4e7e1c7764c55a243b49e38345cc434
2016-07-16 23:47:10 +02:00
Axel Uhl 100ea8c30f aftermath for 8387f3379d: needed to expose Raceboard sources to Home.gwt.xml module to make RaceBoardModes enum visible
Change-Id: Id305a9dd2e0dc301d708b0ec41336cedd7d3bcf5
2016-07-16 23:46:38 +02:00
Axel Uhl 8387f3379d use enum literals to produce RaceBoardMode parameter
Change-Id: I728a2f41e244707a62359c9e6c2812f7b0d8440a
2016-07-16 22:54:39 +02:00
Axel Uhl c44d6eeb14 use leaderboard for specific time point to perform competitor selection update in RaceBoardModes
Change-Id: I2963c155d9cca018f86cb6953e115280ae50dfac
2016-07-16 22:47:01 +02:00
Axel Uhl 6cdd32bbbf structured the RaceBoardModes such that only those that need CompetitorsInRace notifications will have them
Change-Id: I43a2ec87ded4133b9d2a15771e1ddbf856e62a97
2016-07-16 15:37:18 +02:00
Axel Uhl 0a666baf6e unsubscribe from competitors-for-race updates in those PlayerModes that don't need it
Change-Id: Ib0eabc33e29e0dbecfa4b86b2991d86aa8dc6a21
2016-07-16 15:33:26 +02:00
Axel Uhl dae3acd2e9 an untested attempt to re-structure the PlayerModes
Change-Id: I7685f7018899551941f2d6a7b3297687b653fc9d
2016-07-16 15:31:52 +02:00
Axel Uhl 82d9b3cf63 Merge remote-tracking branch 'server/raceboardmodes' into raceboardmodes 2016-07-16 12:57:27 +02:00
Axel Uhl 53df4fa00f formatting only
Change-Id: Ic363fefd6a62719d485faecc09f0092ffa7e7fd5
2016-07-16 12:57:15 +02:00
Axel Uhl d206558bf1 Merge remote-tracking branch 'origin/predefined-analysis' into raceboardmodes 2016-07-16 01:04:48 +02:00
Axel Uhl 1c5604be22 fixed message texts for notifications
Change-Id: Ie127ea34b58ceb087433b7d6570f3149a0c633c0
2016-07-15 20:01:35 +02:00
Axel Uhl 568d6cd767 in the HTML mail embed the link as a <a> element
Change-Id: I5c89ddf6de6872ca0991f5e738b0d8e1d5907c66
2016-07-15 19:59:00 +02:00
Axel Uhl 6c199d8598 also notify users interested in leaderboard correction changes if only a single competitor was changed
Change-Id: I67f37d60679b96e3a3dd4c640e24f61f580428f6
2016-07-15 19:58:39 +02:00
Axel Uhl 4adb6ba386 open the OSGi service tracker, or else nothing happens...
Change-Id: I5b278f4ef72849f2910b2b58dfa9b622cc9631bd
2016-07-15 19:53:44 +02:00
Axel Uhl 9526d78d70 a little speed-up in Util.addToValueSet, avoiding duplicate look-up
Change-Id: I428fbe0a331e3989c357db5947f046b59ddd6631
2016-07-15 19:46:27 +02:00
Axel Uhl 42429da7a1 encode URLs before sending them in an HTML e-mail
Change-Id: Ic71c4a6a66a110dac3148261f01aa5b2ffd1c19c
2016-07-15 19:46:10 +02:00
Axel Uhl 451a67cb82 properly initialize this.scoreCorrectionListenersByLeaderboard in RacingEventServiceImpl
Change-Id: I5091865beef52d630793c521fc44bd1ddaf411e2
2016-07-15 19:45:36 +02:00
Axel Uhl d6419c51cb wired user notifications to a new LeaderboardScoreCorrectionNotifier in RacingEventService; wired notifications with TrackedRaceReplicatorAndNotifier
Change-Id: I4ff77cf49700140b134dc95326a3f7a844958d95
2016-07-15 18:38:24 +02:00
Axel Uhl 17eed109d1 Merge branch 'master' into bug3785 2016-07-15 16:19:08 +02:00
Axel Uhl 939c86addf in TrackedRaceImpl.isLive(), consider delay to live in addition to grace time
Change-Id: Ib81ce0e95bf3eefc7069e99e30ea2e7876244031
2016-07-15 16:17:37 +02:00
Axel Uhl aa748878c1 clear the UserStoreImpl.listeners map in the UserStoreImpl.clear() method; fresh replicas should start with no listeners
Change-Id: I43211599b4d0369efba5cde426975475d563b891
2016-07-15 15:22:10 +02:00
Axel Uhl 721808aa77 use EventBase.getBaseURL() in SailingNotificationServiceImpl
Change-Id: I5d2afbc26f5ddb35c877fcc0dc5126f47d795db8
2016-07-15 14:27:58 +02:00
Axel Uhl e9a3cbbbce fixed handling of event base URL in UI
Change-Id: Iec853e4983ac27209fd8f91a7b25df7d7962e7e5
2016-07-15 14:18:38 +02:00
Axel Uhl 97c25d6bcd added baseURL property to EventBase
Change-Id: I0fbd92b14331918986d817fc86a06912ae8f603d
2016-07-15 13:56:07 +02:00
Axel Uhl dea82a7c88 Merge branch 'master' into bug2775 2016-07-15 13:17:56 +02:00