Commit Graph
100 Commits
Author SHA1 Message Date
Axel Uhl 86de772656 Merge remote-tracking branch 'server/ubilabs--rcapp--bug-3011' 2016-01-27 15:10:57 +01:00
Axel Uhl e48fbfc26d removed extra space characters from www/build.properties
Change-Id: I5f5d6922221fce1a34613c1be59353a9b2138f3f
2016-01-27 14:23:59 +01:00
Axel Uhl aade9cf2bf Merge remote-tracking branch 'server/master' 2016-01-27 14:23:15 +01:00
Axel Uhl 4396919105 Merge branch 'master' into ubilabs--rcapp--bug-3011 2016-01-27 10:39:27 +01:00
Axel Uhl d3c7fd9760 Merge branch 'bug3420' 2016-01-27 10:06:08 +01:00
Axel Uhl 9087d12118 fetch rank and cast to Long because JSONObject doesn't know Integer
Change-Id: I47c2cc5e32ae8ad38bd93927b90564839a21870a
2016-01-27 10:05:08 +01:00
Axel Uhl 0c76c57e79 added missing version update of pom.xml for TracAPI upgrade
Change-Id: Ida5055d690f406a2a6ebbe29c493a8b6361eaf9b
2016-01-25 18:34:42 +01:00
Axel Uhl a070d86627 upgraded to TracAPI 3.1.3, hoping to fix the deadlock issue
Change-Id: Ib8f06a5841b9a46c07667d7f3c3757de7efd9abe
2016-01-25 18:28:39 +01:00
Axel Uhl d6b3066620 renamed AdminConsole tab from Race Committee App to Race Manager App
Change-Id: I0594862ec56681a934c7fb030c2aaea82e4b96f1
2016-01-25 15:28:17 +01:00
Axel Uhl 4c378e7ca9 enhanced Javadoc
Change-Id: Ib6322d3c9741b99c03ed5e5260dd468c347e1ab0
2016-01-25 11:18:29 +01:00
Axel Uhl f8e3c32bae integrated loading indicator in abstract entry point hierarchy and included in AdminConsole and EmbeddedMapAndWindChart entry points
Change-Id: Ia22bed6fd44a2cf2035a313d73dacfa5236de63a
2016-01-25 11:11:03 +01:00
Axel Uhl 60d6cbc4c6 caching CompetitorResult objects in a Map<Competitor, CompetitorResult> in DynamicTrackedRaceImpl;
this way regular mark passing updates are not troubled by expensive race log look-ups

Change-Id: I2bfe6fcf4eac4a6b9749fb4ea8b549967bc4aeb8
2016-01-22 18:23:37 +01:00
Axel Uhl 1aa9bae074 Merge branch 'master' into bug3420 2016-01-22 16:43:20 +01:00
Axel Uhl 642426ecfb Merge remote-tracking branch 'server/master' 2016-01-22 16:42:45 +01:00
Axel Uhl 5af777f726 fixed tests by using different creation time stamps for mark definition events
Change-Id: I5e89fe6e581a70e850c08cafeae62a2c85d489dd
2016-01-22 16:40:46 +01:00
Axel Uhl 7a41f85d17 fixed mark fix loading tests which require now that there is a RegattaLogDefineMarkEvent in the RegattaLog
Change-Id: Iac9d5e9699b7df4aed376b508c92ec49a097de89
2016-01-22 16:35:19 +01:00
Axel Uhl c6ca28750d removed method from DynamicTrackedRace contract that was only used by Impl class
Change-Id: I29b462c77de1b13932c31a39e43449b82d651d5c
2016-01-22 16:24:47 +01:00
Axel Uhl a522f7450e added more tests for mark passing updates from race logs
Change-Id: I5f1631678bef2ecf7b5a1e8dbc059705e562e9d9
2016-01-22 16:20:46 +01:00
Axel Uhl f57aed7de6 Merge branch 'master' into bug3420
Conflicts:
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/FieldNames.java
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java

Change-Id: I7347ab0c849aa43f08eebca569c884b6986bf6d0
2016-01-22 15:39:16 +01:00
Axel Uhl 35af1394c6 Got the first tests for mark passing update from race log changes running
Change-Id: I857191e67ae8e408670832d02f1e1caab42d10a9
2016-01-22 15:15:03 +01:00
Axel Uhl b81e6742e5 re-added version to TracAPI's pom.xml
Change-Id: Ia234e07f754324801f072a4181e84859bfa7948d
2016-01-21 16:47:34 +01:00
Axel Uhl 1d93baa62c upgraded TracAPI from 3.1.1 to 3.1.2, hoping to ultimately fix the deadlock upon terminating a subscription and stopping a subscriber
Change-Id: I82c5cb7fbaa9ab9f3b475245d96b35500dd3248f
2016-01-21 14:40:19 +01:00
Axel Uhl 09f92c97da Merge branch 'master' into bug3420 2016-01-20 10:25:00 +01:00
Axel Uhl e5eb4f19b3 adjusted PositioningFragment to changes around CompetitorResults/CompetitorResult
Change-Id: Ib90f29218f6f654312c836625c951a7e87140e7b
2016-01-20 10:14:35 +01:00
Axel Uhl 86c4942049 added missing COmpetitorResultImpl class
Change-Id: I2c08a429851c3604f5f0f8718b52174d30be027a
2016-01-20 08:40:58 +01:00
Axel Uhl 471b8585b7 if an explicit score is provided in the RaceLogFinishPositioningEvent object, it is applied in the score correction (bug 3420)
Change-Id: Iedb4388168024c0f581b96149c295dcb57fb66f0
2016-01-19 20:48:04 +01:00
Axel Uhl 3f80eaf66b also factored the commonalities of the *serializers* for the RaceLogFinishPositioningEvent types
Change-Id: I58eaf0b8c109c6113b3ced1982b1877885b78f2d
2016-01-19 20:42:45 +01:00
Axel Uhl 3095adc8ee as suggested by bug 3420 comment #2, refactors common parts of RaceLogFinishPositioning deserialization in gateway bundle
Change-Id: I13819430107ef932f5fab433164ec9316f5e78d5
2016-01-19 20:30:33 +01:00
Axel Uhl 053268e0d5 enhanced RaceLogFinishPositioningConfirmedEvent and RaceLogFinishPositioningListChangedEvent by fields for score, rank, comment and finishing time
Change-Id: Ib751beb081a1eecfe462919eaa3ce6ea71e56cd3
2016-01-19 19:57:15 +01:00
Axel Uhl 563a282b73 fixed message strings explaining soring schemes for ESS / 12
Change-Id: Ia8d076dbc49fb21c269789185cf00d9c6cf89f9f
2016-01-18 18:33:38 +01:00
Axel Uhl a23387bacd fixed ordering in BoatClassMasterdata
Change-Id: I8fc0fe40ca99e89137d6d2a3754ec14595bba298
2016-01-18 18:25:45 +01:00
Axel Uhl b5e60a0417 factored out commonalities between ESS High Point scoring schemes for act leaderboards
Change-Id: I962f12756e1667a53c533bdd95c0f6757cf29349
2016-01-18 18:24:01 +01:00
Axel Uhl 11132b9fa2 factored out commonalities between the two different ESS HighPoint overall scoring schemes
Change-Id: Iebaf853057056aad271bc20868d6f08323ea31b4
2016-01-18 18:19:45 +01:00
Axel Uhl ba9a19c7c6 re-format and comment change only
Change-Id: I447224e1cc21eef1034f40665f135b0ec800adf8
2016-01-18 17:51:51 +01:00
Axel Uhl b488c2608f Merge branch 'master' into gc32-changes 2016-01-18 17:14:00 +01:00
Axel Uhl 98c7f1b77a Merge branch 'master' into bug2851 2016-01-18 17:08:59 +01:00
Axel Uhl 0fffbe7869 upgraded TracAPI version also in pom.xml
Change-Id: I25e689f8460f12919c37f9798709fdfae03f61a3
2016-01-18 17:06:41 +01:00
Axel Uhl 1891a5562b upgraded TracAPI to version 3.1.1; this should resolve the timeouts during unsubscribe
Change-Id: I7ffa172214d76938258890285b8af4fb48a1028e
2016-01-18 16:58:54 +01:00
Axel Uhl 16196258c9 restored DeviceIdentifier serialization/deserialization test functionality from removed RaceLogSerializationTest
Change-Id: Icfbf819c7a766ec1035db717fc6cf72bf560f9dd
2016-01-18 16:34:44 +01:00
Axel Uhl a5e4ccb465 removed FIXME; append /fleetName to list of races containing mark
Change-Id: I62facd34621de2080a94c710ab4d2272b71200ef
2016-01-18 15:51:00 +01:00
Axel Uhl cf9dd8f662 replaced equals check on RaceLog by ==
Change-Id: I80a7bab98377b63e9068ed48eed36a25089c9a48
2016-01-18 15:40:55 +01:00
Axel Uhl aff525180e single point of exit pattern
Change-Id: I5c8040a5babc3f4562c116fbb9a041da813b01d6
2016-01-18 15:38:37 +01:00
Axel Uhl 22471f9903 made a few variables final; removed redundant cast
Change-Id: I244d0259aceb4d084d048d0e58292481317da5e6
2016-01-18 15:34:38 +01:00
Axel Uhl d6cd41def9 improved Javadoc
Change-Id: I86022d11facc9e799ab23a13ba483b5cff482b3e
2016-01-18 15:29:16 +01:00
Axel Uhl 7b9321336e avoid redundant contains/remove double lookup in SailingServiceImpl.findDuplicates
Change-Id: I65eba92b15187ae489cbb6c7d59adf8303a41496
2016-01-18 15:21:01 +01:00
Axel Uhl c4fb89fb38 refined exception list of SailingServiceImpl.denoteForRaceLogTracking
Change-Id: Iaf17608e35020c428c629eecf2c5170edb3f97fb
2016-01-18 15:13:24 +01:00
Axel Uhl bfc35601ce replaced use of SailingServiceImpl.sizeOf by Util.isEmpty() and removed sizeOf
Change-Id: I2b6a49b897790030618ce73abe5b83f5cf79d90d
2016-01-18 15:08:06 +01:00
Axel Uhl 1d9f04992f introducing equals/hashCode on DeviceMappingDTO; reducing entity comparison for DeviceMappingDTO to its equals/hashCode definition
Change-Id: I9ce39fa3f560fd1280100adfe0612cfbe41ef094
2016-01-18 12:36:53 +01:00
Axel Uhl 259f61d96d coding conventions in RegattaLogTrackingDeviceMappingsDialog
Change-Id: I5a5e2735da23d432d910666522fc27240a4f2532
2016-01-18 11:38:30 +01:00
Axel Uhl e7584e6c90 merged AbstractLogTrackingDeviceMappingsDialog into only subclass RegattaLogTrackingDeviceMappingsDialog
Change-Id: Ifce7a064817bb90eae1471db933e7db74bb4bcfe
2016-01-18 11:34:55 +01:00
Axel Uhl 9b1e11b0c9 merged AbstractLogAddDeviceMappingDialog into RegattaLogAddDeviceMappingDialog
Change-Id: I776f5d2017c669fdd083a1f9addf06781e2c28bb
2016-01-18 11:28:05 +01:00
Axel Uhl 884f071972 added i18n for course management panel
Change-Id: Ie12db85b6eb88c463752853148f33ab2a570f2a5
2016-01-18 11:18:45 +01:00
Axel Uhl 3ef139d0dc use Util.getDominantObject in RaceLogTrackingAdapterImpl when denoting a race for smartphone tracking
Change-Id: I454c0ce3bdf72e3c919e0eaa63df85a77a6f0601
2016-01-18 10:48:29 +01:00
Axel Uhl 4286652f3a changed scope of move method from package to protected
Change-Id: I39b40fa6eb9b2f385d7da21322b7f434ee439441
2016-01-18 09:31:31 +01:00
Axel Uhl babd76d4a3 formatting changes only
Change-Id: Ie9442d4229d8f773d40f6f632aa8a94a527b0188
2016-01-18 09:27:16 +01:00
Axel Uhl 80a34a7a0e fixed test verdict: no artificial mark ping fix is generated anymore
Change-Id: Iace233127fcf03972e0c5ddc7a00061be69d6768
2016-01-15 20:15:03 +01:00
Axel Uhl 981c843381 fixed cancel behavior for toggling "Register Competitors on Race"
Change-Id: Ic4c299797365fc481e7f65b013a3eac929f39fce
2016-01-15 18:09:38 +01:00
Axel Uhl c5f9d0b2a0 validate race competitor registration dialog: it's invalid (not saveable) if the race does not support per-race competitor registrations
Change-Id: I683234365c642c40a1ae70cd98b7d491c11af753
2016-01-15 18:04:15 +01:00
Axel Uhl 46e5f927ae allow user to add any competitor to a RaceLog, not only those registered for the regatta
Change-Id: I01d844cb06a6dfaba11b6338a0824e36551f4e08
2016-01-15 17:32:22 +01:00
Axel Uhl 132bde4686 use DeviceMappingConstants for postCheckout endpoint
Change-Id: Ia8f1a77877304d32d6336fe9fbf6eb9ee66e62b6
2016-01-15 16:59:40 +01:00
Axel Uhl 57c6e5ac89 LeaderboardsResource.pingMark no longer returns a lastKnownPosition in its response, only an OK
Change-Id: Id57cbcbb876bf04707a8cb14046b962d44221485
2016-01-15 16:33:02 +01:00
Axel Uhl d57265f72c added a confirmation popup when toggling the "Show only competitors from log" checkbox which may lose user input
Change-Id: I8d08a8a99d630e4b0474b5926505c38781d576ec
2016-01-15 15:27:52 +01:00
Axel Uhl 27a82505aa fixed clear() vs. removeAll() issue in filtered competitor panel
Change-Id: Ie1bfad9c2ff921ad806b72de043c91a4c740aacb
2016-01-15 15:10:02 +01:00
Axel Uhl 1c3834de91 removed a bunch of empty lines
Change-Id: Ifa3c076996b489c8f52c328f1106b3108b67c3a2
2016-01-15 14:46:14 +01:00
Axel Uhl 01dfe544c2 consolidated imports
Change-Id: I1b6e5a77e73d1860cde00eadbdd1b71a5e518616
2016-01-15 14:39:28 +01:00
Axel Uhl f1e1623c2c improved the implementation of AbstractCompetitorRegistrationsDialog.move, avoiding intermediate collections to be constructed
Change-Id: I27baa65771a8417e79289d8de2ebca41b2ff8c3e
2016-01-15 14:37:56 +01:00
Axel Uhl 32f914c0ea coding conventions, and added a FIXME for showing a confirmation dialog at least before toggling "Show only competitors from log" otherwise losing user input
Change-Id: I3b79a60d55a3cc39dbb004bc7160925483eef007
2016-01-15 14:30:55 +01:00
Axel Uhl b7e7b83778 some minor method renames and making variables final where possible
Change-Id: I21880695f4a7a34488eed38e1cdd650ded8c704d
2016-01-15 14:12:16 +01:00
Axel Uhl c616e0181d made showOnlyCompetitorsOfLog protected because it is not used outside of subclasses
Change-Id: I64e68ebd99311718c31ed4cb23d9636bb3fb076c
2016-01-15 13:51:32 +01:00
Axel Uhl 4d0fb5f865 don't create artificial "anti-creep" mark fixes anymore; see bug 3421 and bug 3422 about abandoning interpolation on mark tracks
Change-Id: I38cba61bbc004ca028c6d87adc7507ac9c1db4fc
2016-01-15 12:18:48 +01:00
Axel Uhl f042f5e4f0 simplified pingMark implementation in RaceLogTrackingAdapterImpl, as marks can only be pinged in RegattaLogs now
Change-Id: I5418a24f1c803631e8f0062a2f6440d026d513f8
2016-01-15 10:03:13 +01:00
Axel Uhl 575fe2c71a restored Javadoc comment for pingMark which was lost in commit 966b17b178
Change-Id: Ib1e6085b7b2a4147cae6b36537380cc1cd8e47fa
2016-01-15 09:57:33 +01:00
Axel Uhl d7e8d4d5f8 removed the unused class LastPingMappingEventFinder
Change-Id: Ie9bcd796c58da105ad5ab8b1df7e10b5beb65246
2016-01-15 09:38:56 +01:00
Axel Uhl 4014d8af2a removing unused RaceLog parameter from RacingEventService.getMarkPosition and updating Javadoc accordingly
Change-Id: Idd8355039a22b0e52078db8935fa92d2fb911ed0
2016-01-15 09:35:40 +01:00
Axel Uhl 16651d5aa6 Merge branch 'master' into bug2851 2016-01-14 21:22:44 +01:00
Axel Uhl 1fd73439ef let NotDenotableForRaceLogTrackingException trickle up as it was declared on RaceLogTrackingAdapterImpl.denoteAllRacesForRaceLogTracking anyhow
Change-Id: I083a9631c82e44c300955ff017bc9834c41ee542
2016-01-14 17:07:45 +01:00
Axel Uhl 8c06b43e18 replaced sizeOf(...)>0 by calls to !Util.isEmpty
Change-Id: I3b97f34559f3aa471c8fdb8c16512c1ecec2aecc
2016-01-14 17:03:51 +01:00
Axel Uhl 19adb0a7eb improved Javadocs
Change-Id: I080a03728f304b61059234442377f4765e53e550
2016-01-14 16:57:44 +01:00
Axel Uhl b45b2ffab0 whtitespace and formatting changes only
Change-Id: I8075e648af46f86d826ab5e35d6ff21d914dc74e
2016-01-14 16:54:12 +01:00
Axel Uhl 6795767e2a renamed getMapping to createMapping
Change-Id: Ic25ab6131381ad762df2457d3d64a20e6503157b
2016-01-14 16:34:29 +01:00
Axel Uhl 06c6a783e7 adjusted updateStartAndEndOfTracking such that open intervals lead to the start/end of tracking to be the beginning/end of time
Change-Id: I6138d7c138962194df83b44f22db3c9d19ea5772
2016-01-14 16:29:46 +01:00
Axel Uhl 93a4f649be added Javadoc, made implementation of updateStartEndEndOfTracking robust against open intervals / time ranges
Change-Id: Ibfd34c42697409dd6ef78cf35ec6ca061b0803f7
2016-01-14 16:21:03 +01:00
Axel Uhl bd8ba0ea2c (re-)created RaceLogTrackingAdapter.copyCompetitors and call it from SailingServiceImpl
Change-Id: I8e860b8ca9cc82760068efa7d31d5a05594d778c
2016-01-14 14:58:24 +01:00
Axel Uhl d2aaf40174 replaced decision by exception by a check;
CompetitorRegistrationOnRaceLogDisabledException can be avoided usually by a check for isCompetitorRegistrationInRaclogEnabled

Change-Id: I3c2cbe761ba0a36a1a8f21689c774c2943b5556b
2016-01-14 14:40:29 +01:00
Axel Uhl e24b3050d4 deprecated RACE_LOG_FROM and RACE_LOG_TO
Change-Id: I8a9673d44f0b912930b83aed4c193fb7b6771712
2016-01-14 14:20:30 +01:00
Axel Uhl a1b9492971 deprecated RACE_LOG_MARK, as it was replaced by REGATTA_LOG_MARK
Change-Id: Ia10f4c2b417f67dc375ef3435404270c34ea6187
2016-01-14 14:14:20 +01:00
Axel Uhl f451e36b87 re-introduced TrackedRaceImpl.attachRaceLog because TrackedRaceImpl should be responsible for managing its attachedRaceLogs field
Change-Id: Idd26a7b71f937ad4e7f22acc8ab427c1db63b405
2016-01-14 12:19:45 +01:00
Axel Uhl 011bb4ddfc introduced getAllCompetitors() on HasRegattaLike; all implementations already provide it; using it in LeaderboardsResource instead of only looking at RegattaLog
Change-Id: Ibdea059c56a5a528583fd5494afa96d6b1e85a86
2016-01-14 12:07:34 +01:00
Axel Uhl 25baa60a15 cleaned up TopLevelMasterData.isMarkMappingEvent
Change-Id: I987270de1ca18a68ccef648240aa8c0995f07e71
2016-01-14 11:45:15 +01:00
Axel Uhl 088f1441cc fixing getAllMarks() and getMarks(Fleet) implementatoins on MetaLeaderboardColumn
Change-Id: I320c8a329f76735c066241872a3e73e2e95881ab
2016-01-14 11:39:51 +01:00
Axel Uhl 76f1b88bcd added a test case for the fix provided by 06fd44ffcda12a5d4ce1e0334228db364acde005;
this was about invalidation of the competitor cache when a race log changes its mind regarding whether it is
responsible for providing the race's competitors or not

Change-Id: Ibb2b057005d2b1b8f056ac8263faa541c0701e41
2016-01-14 11:29:25 +01:00
Axel Uhl 06fd44ffcd in CompetitorProviderFromRaceColumnsAndRegattaLike also invalidate caches when a race log no longer provides dedicated competitors for a race
Change-Id: I1da92144012c9e7c5e6f437f5d80151281895693
2016-01-14 11:15:43 +01:00
Axel Uhl ec7c4978a5 minor refactoring: use Collections.emptySet() instead of a new HashSet
Change-Id: Ide53267137c910eef4df0e759c566cafd8d46b94
2016-01-13 18:16:19 +01:00
Axel Uhl 42c701df2f formatting only
Change-Id: I0b6e78fcb9363ec2b5764993d1a4c68a9ea715b8
2016-01-13 18:10:40 +01:00
Axel Uhl cab993170f harmonized deregisterCompetitor and deRegisterCompetitor naming
Change-Id: I9f300d9ffdb37f95a09ef67279ab5bc4cac2b2bb
2016-01-13 18:05:29 +01:00
Axel Uhl ade6f01323 simple reformat
Change-Id: I3761ea48a07f5460397c495da4b6db3f441dfa00
2016-01-13 18:04:27 +01:00
Axel Uhl 5af68c8dcb fixed FIXME comment formatting
Change-Id: I1fb8df525b9099fd99e959ec8c8c9bd5ebb396ab
2016-01-13 17:51:05 +01:00
Axel Uhl 824e9e9872 Javadoc and formatting changes only
Change-Id: I0c481239d4e5ae092ff6421152609364ef8014ca
2016-01-13 16:46:54 +01:00
Axel Uhl 73cf0c9472 added NotRevokableException to RaceColumn.disableCompetitorRegistrationOnRaceLog
Change-Id: Ifad088dcda292316bb9993092c44b5221c8cfd1d
2016-01-13 15:42:41 +01:00
Axel Uhl 62a1cb8b30 escalate the NotRevokableException on disableCompetitorRegistrationOnRaceLog
Change-Id: I068d78761dbc4dd8a0a37374e5f169ec79cee6b1
2016-01-13 15:41:09 +01:00