Commit Graph
42614 Commits
Author SHA1 Message Date
Kai Börnert 0997fe3373 improved wait conditions to use less Thread sleep 2018-04-12 18:39:18 +02:00
Kai Börnert 61fd673f27 Merge branch 'master' into bug4494 2018-04-12 17:12:20 +02:00
Axel Uhl 4c319f5f6c renamed CompetitorStore to CompetitorAndBoatStore; renamed Competitor[WithBoat]DTO classes
Change-Id: Ib80cf877e63fd834a73e81f20fafa57f130cc0a7
2018-04-12 14:18:16 +02:00
Axel Uhl af0aa7bf52 formatting change only
Change-Id: I371ab995e51fecdfdfd6abfecedb767b923648ba
2018-04-12 13:42:03 +02:00
Axel Uhl 8106f5a4bc Merge remote-tracking branch 'server/master'
Change-Id: I7bfd8d5332225daf15a2f38b8e89a87058e3af8b
2018-04-12 12:45:12 +02:00
Axel Uhl 4ee1250409 pass competitor/boat mapping through to RaceCompetitorSelectionModel; from there extract all competitors and boat mapping
Change-Id: Ibbcd0d89fc0ab95811da8fd53969189483cadef6
2018-04-12 12:33:46 +02:00
Kai Börnert 37de7ce85e Merge branch 'master' of ssh://trac@sapsailing.com/home/trac/git 2018-04-12 11:15:57 +02:00
Axel Uhl 89a7e608ab Merge branch 'bug4492'
Change-Id: Ida033cc6d7d1f0a688dcf4f6bdc12505de6d121b
2018-04-12 11:15:05 +02:00
Kai Börnert bc3aa4f854 Merge branch 'master' of ssh://trac@sapsailing.com/home/trac/git 2018-04-12 11:15:05 +02:00
Kai Börnert bbab535002 60inch, fix for npe in PreLiveRaceWithRacemap 2018-04-12 11:13:33 +02:00
Axel Uhl 96d68ff07d show a short name only in the leaderboard if its not empty; set short name and e-mail to null if empty in edit dialog
Change-Id: I49049ca5802de9609fbd272e354aa9b7ea49207c
2018-04-12 10:57:44 +02:00
Axel Uhl 6b1ffa52b5 removed extra ":" at end of string message
Change-Id: I6f47ce07c8abe4260f9307887773d8158210697a
2018-04-12 10:18:51 +02:00
Axel Uhl dc04ebdcdb fixed typo in variable name
Change-Id: I0e94e1d2d5a803576b25765076c1a9f2ba075fb6
2018-04-12 09:43:32 +02:00
Axel Uhl b145e79997 Merge remote-tracking branch 'server/master'
Change-Id: I215c3ed0a3c43f56a2450b16e6695e95f4b7f8f8
2018-04-12 09:41:09 +02:00
Steffen Schaefer 3ab81a10ea Bug 4492: fixed another timing problem in a test case 2018-04-12 08:27:27 +02:00
Kai Börnert 067d098163 Merge branch 'master' of ssh://trac@sapsailing.com/home/trac/git 2018-04-11 16:57:25 +02:00
Axel Uhl 656d8cbff1 another occurrence of boat before competitor to DB
Change-Id: Iba2857f4408789de7c34f50bb3d898dbdb6008b7
2018-04-11 16:21:33 +02:00
Axel Uhl 5bae991418 write boat to DB before competitor is written, to improve DB consistency
Change-Id: I41eb360e20687cfe73361e5e6a20b69091d73ea4
2018-04-11 16:19:57 +02:00
Steffen Schaefer 5a0cc67cf9 Merge branch 'master' into bug4492 2018-04-11 15:03:42 +02:00
Axel Uhl a58f41594f clear competitor store during test setup to account for different competitor implementation classes used by different test cases
Change-Id: If4d56bc4b453b193ee758cb6b9f943b6824cebde
2018-04-11 15:01:01 +02:00
Kai Börnert 4011e98c6d sixty inch, fixed two other cases with missing sailid 2018-04-11 14:31:02 +02:00
Axel Uhl 07105f65d8 let CompetitorWithBoatRefJsonDeserializer inherit from CompetitorJsonDeserializer
Change-Id: I177b2c1a5a96bb9e9313e86d3535ecd4cc70cce7
2018-04-11 14:19:43 +02:00
Kai Börnert 91e258dc96 60inch, fix shortname/sailid not shown 2018-04-11 12:56:42 +02:00
Axel Uhl dc63fb7277 Merge remote-tracking branch 'server/master'
Change-Id: I08abd2c54fe0feb53e53e3fbc4685c4e5ee97de9
2018-04-11 12:02:58 +02:00
Axel Uhl 88dfc32508 whitespace and comment changes only in the SwissTiming adapter
Change-Id: I1c94f8179791f8f46de3a69214ac5e3da5ad1efa
2018-04-11 12:02:41 +02:00
Steffen Schaefer ce659a6b97 Bug 4492: Adjusted test cases to correctly work with asynchronous
event handling
2018-04-11 10:18:41 +02:00
Steffen Schaefer 16ada7f8a6 Bug 4492: Adjusted StatisticsTest to correctly work with asynchronous
event handling
2018-04-11 10:15:10 +02:00
Axel Uhl e0ab3a19e1 Merge branch 'master' into bug4500
Change-Id: Ic83293bf5d2ff4ff9995a9d7aa53c395659c47cb
2018-04-11 00:05:26 +02:00
Axel Uhl da9cbcba06 Merge branch 'master' into bug4492
Change-Id: Ida1d54fb52394fa3f6bb6105335581287912032d
2018-04-10 23:36:41 +02:00
Axel Uhl cfe4af7251 added null checks for boat.getColor() in app code
Change-Id: I3878752357eb0836f98b633d64366df7cefa20be
2018-04-10 18:43:07 +02:00
Steffen Schaefer 6887d42a05 Bug 4492: Changed firing of events in TrackedRegattaImpl to use a queue
per listener to prevent deadlocks
2018-04-10 13:12:56 +02:00
Axel Uhl 9084ae9fd6 Merge remote-tracking branch 'server/master'
Change-Id: Ic2da3380f37690e9867983465233cd01b07c117e
2018-04-10 10:59:46 +02:00
Kai Börnert c7cb3e0ae9 bug4494 href for url fix 2018-04-10 10:24:22 +02:00
Kai Börnert 7f7e832106 href for url fix 2018-04-10 10:23:37 +02:00
Axel Uhl 2430a689b2 removed trailing blanks from message properties in English and German 2018-04-10 00:44:57 +02:00
Axel Uhl e4e9cdb22c changed CompetitorAndBoat[De]Serializer such that it is backward compatible for CompetitorWithBoat
Change-Id: Ia5717bdef5d9db7833b8d44df061dce524cecf85
2018-04-09 18:23:33 +02:00
Axel Uhl 9cfb66cbe8 fixed RaceManager app's start order acquisition
Change-Id: Ie287abcd78c8856476759724bed11c18674329c8
2018-04-09 17:06:50 +02:00
Axel Uhl b0a3669924 use a CompetitorAndBoatJsonSerializer in LeaderboardsResource.getStartOrder()
Change-Id: Ibf9dc7f2b57318f6696d5df3d119dc3a2a7fe62d
2018-04-09 17:01:44 +02:00
Axel Uhl 06447318e5 bug4500: consolidated the two Competitor Json (De-)Serializers into one
Change-Id: I517a2649b6175f11f5e1c7b35fdc439f1982dca4
2018-04-09 16:39:17 +02:00
Kai Börnert 3992b7eabc improved assertions 2018-04-09 15:26:35 +02:00
Kai Börnert af1eb3e62d Merge branch 'master' into bug4494 2018-04-09 12:10:53 +02:00
Kai Börnert bd7c6cc1ea added delay for url generation 2018-04-09 11:54:43 +02:00
Axel Uhl bc47bafa4c fixed german translation of "discarding"
Change-Id: I757a1cfbc61aa476752201d42ffce53090cc950e
2018-04-08 12:55:25 +02:00
Axel Uhl f454439d82 reverted effects of 7323e186fc, only importing server package and not requiring the entire bundle
Change-Id: I997e99c8a09f2f0e862f66953cb89b84237be567
2018-04-08 01:09:17 +02:00
Axel Uhl 7323e186fc let gateway bundle require com.sap.sailing.server bundle to let Shiro find bearer token class
Change-Id: I67c9c1ba2d94875d02753fbfa7b93dedaf6e3ebf
2018-04-07 19:38:30 +02:00
Axel Uhl d387b35201 Merge remote-tracking branch 'server/master'
Change-Id: I8610384bceecec287b3018ad94fd910a5d378de3
2018-04-06 17:34:29 +02:00
Axel Uhl 827824f699 re-added "boat" field to competitor serialization for backward compatibility
Change-Id: I01c2d405b5d261b032caefb261f0be18b2f9d026
2018-04-06 17:31:05 +02:00
Vladislav Chumak 8fd27a2e5c Merge remote-tracking branch 'origin/maneuver_refactoring' 2018-04-06 14:47:24 +02:00
Axel Uhl 28c36a449c don't add all leaderboards to leaderboard group during structure import if leaderboard group already exists
Change-Id: I7ee465e48c5090f18529f506240a0653923dbdf0
2018-04-06 11:44:36 +02:00
Axel Uhl 0666d49ff1 formatting and exception handling in EventParser
Change-Id: I6157b664a34106d7681651dfc2119047880395ce
2018-04-06 11:39:27 +02:00