Commit Graph
33609 Commits
Author SHA1 Message Date
Benjamin Barth f7cb402328 Merge branch 'foiling' of ssh://trac@sapsailing.com/home/trac/git into foiling 2016-07-08 16:34:31 +02:00
Benjamin Barth 8a21c7b3f8 Follow up to bug3761 Fixed chart and axes title refresh 2016-07-08 16:34:08 +02:00
Benjamin Barth f338d43b26 bug3761 Fixed chart tooltips not working when two measures are selected 2016-07-08 15:54:05 +02:00
Steffen Schaefer dd2570fed3 Added JavaDoc 2016-07-08 12:53:07 +02:00
Axel Uhl b39eee43d2 Merge branch 'master' into foiling 2016-07-08 11:16:54 +02:00
Benjamin Barth 98fe0c1b04 Extended release notes to reflect foiling and tracking related changes 2016-07-08 11:13:15 +02:00
Axel Uhl 0f23eda391 fixing implementation of /marks/{mark-id} end point: correct mark is now selected
Change-Id: I932eed30d237a3fe555ad3c4d26dfadd6fc4c7c5
2016-07-08 11:13:10 +02:00
Benjamin Barth cd49a414e2 Adjusted env.sh REPLICATE_ON_START property to reflect current dev state 2016-07-08 10:43:22 +02:00
Axel Uhl 90afb9d6f7 Merge remote-tracking branch 'server/master' 2016-07-08 10:22:00 +02:00
Axel Uhl e14a21df6f enable entering a time point with a fixed mark position
Change-Id: Iac029f294b774ef3707e5540f091b09f159d3b5a
2016-07-08 10:17:31 +02:00
Steffen Schaefer ccad89e448 Added missing volatile keyword to make double checked locking work
reliable
2016-07-08 09:28:42 +02:00
Steffen Schaefer 892335678b Fixed NPE in masterdata import if a device mapping is open-ended 2016-07-07 14:49:06 +02:00
Steffen Schaefer fe12554783 Fixed NPE 2016-07-07 14:02:45 +02:00
Steffen Schaefer 23e0d33127 Added JavaDocs 2016-07-07 13:46:27 +02:00
Steffen Schaefer c3a2443930 Fixed a NPE when starting Smartphone-Tracking 2016-07-07 13:43:37 +02:00
Axel Uhl b20ab0c1cb formatting only
Change-Id: Idb46cafb2b87ec841cd5d6b412f11c0d6a699042
2016-07-07 11:28:42 +02:00
Axel Uhl cf7b8ca286 Merge branch 'master' into foiling 2016-07-07 09:44:48 +02:00
Axel Uhl 4eea6afba9 making expedition and UDP receiver threads daemon threads that don't obstruct shutting down the VM
Change-Id: I122e66b6cbca7defa388bfa9634fb63025887f0a
2016-07-07 09:44:12 +02:00
Papick Garcia Taboada 297fb13dad Merge branch 'master' of ssh://sapsailing.com/home/trac/git into foiling 2016-07-07 09:28:09 +02:00
Axel Uhl 6c2b1f16fb also ensure that the WebSocketClient is nulled when no successful connection could be established
Change-Id: Ibcadd8330fd99edaf1cbd82174f2ce4c3f627a87
2016-07-07 01:23:38 +02:00
Axel Uhl 920ca128bd ensure that only one call to connect(...) happens per client; otherwise the client ends up in the shutdown hooks several times
Change-Id: Icbaaedc94b4e6263407966f0834cf10e6c9d4ca3
2016-07-07 01:21:56 +02:00
Axel Uhl 3c6df87650 when destroying the WebSocketClient, deregister from ShutdownThread.
Change-Id: Icd21191fd77521f5c87228d2cff1ad7e0744a9c6
2016-07-07 00:43:31 +02:00
Axel Uhl 09e0eaa170 compute remote address of Igtimi connections live for display in servlet
Change-Id: I828de665ef0b00b09c937be1c7696a418b544686
2016-07-06 22:51:52 +02:00
Axel Uhl eabdff2ce7 fixed Igtimi connector issue: server timestamp was not properly reset when launching a new connection;
this would have suggested to the server that the connection was immediately available although it wasn't; this way,
an unsuccessful connection would not have been recognized properly

Change-Id: I199847cead792de00fb0467541f220f095b87898
2016-07-06 22:02:52 +02:00
Axel Uhl aa9a7a8c15 less re-use of WebSocketClient, using new one and new ClientUpgradeRequest after each disconnect; new listener object each time
Change-Id: I088d4c30af6c12f9e7117dbdc97f8a2ca57ca960
2016-07-06 20:41:00 +02:00
Axel Uhl b884ad9677 a somewhat more robust way of closing and reconnecting to Igtimi WebSocket servers;
ignore the onWebSocketClose event if it is caused by the reconnect() call

Change-Id: I0b735d17168855e66ade684f5953a1faaa8e82e4
2016-07-06 16:50:17 +02:00
Axel Uhl b5b74b8982 Merge branch 'master' into bug3758 2016-07-06 14:36:29 +02:00
Axel Uhl d4706b8ffd Merge remote-tracking branch 'server/master' 2016-07-06 14:36:09 +02:00
Axel Uhl 2b5b02e65a Merge branch 'master' into bug3758 2016-07-06 14:30:22 +02:00
Axel Uhl 25b92a71f9 made SailWave import tolerant for rank formatting (1st, 2nd, ... instead of 1, 2, ..., as documented in Wiki but not implemented so far...
Change-Id: I4eff90780c1f3f36159c25a7b227d39f49148571
2016-07-06 14:29:43 +02:00
fmittag 858a4ff025 fixed a parsing problem with tractrac competitor metadata in case of key names with the same prefix 2016-07-06 11:58:21 +02:00
Axel Uhl f773186c11 Merge branch 'master' into bug3758 2016-07-06 11:22:56 +02:00
Axel Uhl e6f53cbbf9 return null as rank from HighPointMatchRacing if rank==0
Change-Id: I5c35450e4bdb2afd413c8f4f6d0be1d8d70637b3
2016-07-06 11:20:21 +02:00
Axel Uhl 0364016e09 trying a more careful handling of Igtimi websocket resources; not done yet
Change-Id: I4b258cb82c9411bbff60df4e6eba1f72379a4735
2016-07-06 11:19:51 +02:00
Axel Uhl 169f66b30e added description of Race Manager App to doc/
Change-Id: Ic2493acf9abe7ef6102ee3d7ee7b294336ea6aaa
2016-07-06 09:23:11 +02:00
Axel Uhl 5bfed45502 additional test resource for SailWave importer
Change-Id: I61be2ebe4835b9daac99ead2d2957483e5e4c69a
2016-07-05 18:24:42 +02:00
Axel Uhl 3c7009cc80 support blanks instead of , as separator of score and max points reason in CSV / SailWave result importer
Change-Id: I6e179457b664f45545941370ae1d68e4b680d1ee
2016-07-05 18:21:46 +02:00
Papick Garcia Taboada ebdc33ca65 Fixed timerange calculation 2016-07-05 18:16:41 +02:00
Axel Uhl 23553bebf3 made fields of IgtimiConnectionInfo private/final and initialize in constructor
Change-Id: I81fe62c9a8dad8cc2d229a0a56e315117f10059b
2016-07-05 17:36:42 +02:00
Papick Garcia Taboada 9bed677363 Using $inc to increment fixes count 2016-07-05 15:36:14 +02:00
Axel Uhl 1530a06919 replaced more stderr exception printing by logging in WindStatusServlet
Change-Id: Ia50a72b64556adf0a7d27db86dce70c079280aee
2016-07-05 14:55:41 +02:00
Papick Garcia Taboada 062c94c58f Introduced storing fixes in batches 2016-07-05 14:02:44 +02:00
Axel Uhl 42bb1d7ac0 Merge branch 'master' into foiling
Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/AbstractCompetitorRaceChart.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/MultiCompetitorRaceChartLifecycle.java

Change-Id: I5f97a3c21e75e6d493c06dc87925d1273b0c4969
2016-07-05 12:47:39 +02:00
Axel Uhl 5223eac3b5 added /marks/{markId} end point for LeaderboardsResource so that it delivers a single mark
Change-Id: Ief31a6d5af78595d222bf056f5f4baf43e413857
2016-07-05 11:41:29 +02:00
Axel Uhl e224363e45 replaced stderr output for exception by logging
Change-Id: I3a1ce245a120028d59c43b5a771484bbe604f7f7
2016-07-05 11:40:29 +02:00
Axel Uhl 77219f7563 follow-up to bug 3755: added description for the new behavior to the admin release notes 2016-07-04 23:58:25 +02:00
Axel Uhl ed5ec864fd fix for bug 3755: considering suppressed competitors when "improving" ranks for live races; fixes formerly failing test cases
Change-Id: I815b323e11b0cd5ff456e0debe798517683aff04
2016-07-04 17:33:13 +02:00
Axel Uhl 0c24a3ac57 failing test cases for score adjustments based on suppressions
Change-Id: I38ede6c823c168285e93efff4f61ce0699e569da
2016-07-04 17:25:57 +02:00
Axel Uhl 5ce5eb6bb8 fixed simulator enablement by removing the viewSimulationEnabled URL option and its "false" default
Change-Id: I8e9daa576981f38f78e752a67d898f7d2933a68b
2016-07-04 14:44:06 +02:00
Axel Uhl 5d59e47d5f fixed initialization order of HashMap in WindStatusServlet
Change-Id: Iaad094c73f38f09b94f8644bcdd9a66ea7922a51
2016-07-04 14:27:27 +02:00