Axel Uhl
9d3d8d6162
Merge remote-tracking branch 'origin/jbross-poor-mans-wizard'
2016-02-17 23:58:46 +01:00
Axel Uhl
808524743c
upgrade TracAPI to 3.1.5
...
Change-Id: I06559c2afcd382b5fae9e628de6d849bfef06c19
2016-02-17 11:58:24 +01:00
Axel Uhl
b2e216b887
use port 1520 again for TracTrac tests; they forgot to upgrade the SAP-dedicated data server
...
Change-Id: Ia6719856194b1c4b55aab9ce8edee2917083f295
2016-02-17 11:57:58 +01:00
Axel Uhl
b5e39cabb4
removed old mark passing test stuff that Martin Hanysz once started with; it got obsoleted by Nick's work
...
Change-Id: I8f679a1c39ab1986a6b6e41dc6a65a7bdb5bb912
2016-02-15 23:09:05 +01:00
Axel Uhl
a87cbdc8f0
fixing TracTrac test cases; no more port 1520/1521, and using new method to construct paramURL if nothing else is known (no more clientparams.php)
...
Change-Id: I453c6247d0b142215bd4039885e9898a0da8bfbb
2016-02-15 23:04:28 +01:00
Axel Uhl
e3f8f87c7d
fixed ParseTracTracJSONServiceOutputTest.testWeymouthURIsOnline by being more tolerant with HIDDEN races
...
Change-Id: Ie82b496cc56a87767f4f047e0e0af9631b64a731
2016-02-15 21:49:56 +01:00
Axel Uhl
a6ccef32ca
Merge branch 'bug778'
2016-02-15 21:17:54 +01:00
Axel Uhl
d6a33d46ff
Merge branch 'archive-hotfix'
2016-02-15 21:17:24 +01:00
Axel Uhl
2728034d38
adjusting border of maps settings button to new Google Maps 3.32 layout, reducing from 30px to 10px
...
Change-Id: I8054cda7a77c314932cbf5281cb93d6073f4de6a
2016-02-15 21:11:44 +01:00
Axel Uhl
9a96e75629
reduced visibility of new RaceMap methods required by ManeuverMarkerClickedListener; package-protected is enough
...
Change-Id: If5f10534d282a11797b2dce32dd96243e46607ed
2016-02-15 18:45:36 +01:00
Axel Uhl
b0f0013d79
minor modifications in text messages and formatting
...
Change-Id: I65220d7ea7d0b1bad9b1dc43a51a939b23a95e17
2016-02-15 18:44:51 +01:00
Axel Uhl
144c5869c2
Merge branch 'master' into bug778
2016-02-15 17:53:30 +01:00
Axel Uhl
f2819e1f10
made licenses dialog compile properly in Eclipse
...
Change-Id: I3f59599db92d34a00e69f41aaa7bc5fc71f37ad0
2016-02-15 17:51:57 +01:00
Axel Uhl
96fce58d03
consolidated imports to get rid of warnings
...
Change-Id: I9f5b464a071118dbcdd22abe7673adfa58f2dc77
2016-02-15 17:50:33 +01:00
Axel Uhl
546385e995
upgraded TracAPI from 3.1.3 to 3.1.4, assuming to avoid an infinite loop for old events
...
Change-Id: Ide5d2f7f34c513588f84973b44b55f2c733bd7a6
2016-02-15 13:33:12 +01:00
Axel Uhl
9fb29e521e
Updated ssl support (markdown)
2016-02-11 17:30:39 +00:00
Axel Uhl
f9bad9570d
Created ssl support (markdown)
2016-02-10 15:50:35 +00:00
Axel Uhl
804bf57496
Updated home (markdown)
2016-02-10 15:44:39 +00:00
Axel Uhl
50cb147a70
changed the default retrieval protocol for Amazon S3 file storage provider from http to https
...
Change-Id: Iaab40c735db54c78f5ec2cb4a5d946a8b6d5c0de
2016-02-10 16:35:57 +01:00
Axel Uhl
32a0331ede
Merge remote-tracking branch 'server/master'
2016-02-10 07:02:59 +01:00
Axel Uhl
dec63406fb
bug3422: extracted common transition handling parts into CanvasOverlayV3 and now also use it in CourseMarkOverlay
...
Change-Id: I284c2c25a40ccd3285c4695cb9bb32a7d218cf70
2016-02-05 15:09:47 +01:00
Axel Uhl
ac9e60eda7
minor refactoring of ManeuverColor, using single point of exit pattern
...
Change-Id: I78e401c0dc189c216a1c1a0149a688d21092c275
2016-02-05 11:56:15 +01:00
Axel Uhl
78d5b65b85
slighly improved release notes
...
Change-Id: Ie6e1dda0944b43895e4fd679f83343451d33f20d
2016-02-05 11:41:01 +01:00
Axel Uhl
1a4d6f8b27
Merge branch 'master' into bug778
...
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/home/solutions/SailingAnalyticsNotes.html
Change-Id: I4452a526ac2470cb8423e2f2473823572ae97103
2016-02-05 11:38:54 +01:00
Axel Uhl
fefd69cc4f
Merge remote-tracking branch 'server/master'
2016-02-04 17:09:19 +01:00
Axel Uhl
3b8127dd08
fixed typo in method name
...
Change-Id: I2450527864a1be9dfcd35326a17bcdb292a095e6
2016-02-04 17:06:45 +01:00
Axel Uhl
56832ae6e8
Merge branch 'archive-hotfix'
2016-02-04 16:58:19 +01:00
Axel Uhl
e0766e5246
reduced race times panel margins to 3min before and 1min after race
...
Change-Id: Iadf8ce656ac39426525b5026cd6f4e178af9343e
2016-02-04 16:57:46 +01:00
Axel Uhl
320d0c84e5
Merge remote-tracking branch 'server/master'
2016-02-04 16:08:09 +01:00
Axel Uhl
c4a9e48bb5
fixed synchronization bug regarding leaderboard list in leaderboard group;
...
the issue was related to the syncGroupsAfterLeaderboardChange method which was based on the assumption that there may be
changes in Leaderboard Java object identity while still meaning the same leaderboard. This would have forced a replacement
of listeners and an update of the leaderboards list in the LeaderboardGroup. Furthermore, LeaderboardGroup used to refer to
the leaderboard by name in the database. This forced an update to the persistent copy of the leaderboard group when the
leaderboard's name changed. Today, this link is based on a MongoDB ObjectId, so no update of the leaderboard group is
necessary any more.
The root cause was a threading issue: iterating over a copy of the leaderboards list of the leaderboard group, then
looking for the old position of the leaderboard in that list, then removing it, then adding it again at the old index.
If this is not atomically locked (which it used to be up to commit 118f03fbb5 when
coarse-grained synchronization was replaced by more fine-grained locking inside the LeaderboardGroupImpl methods) then
one of two concurrent removals for the same leaderboard may not find the leaderboard anymore, yet the second add is
carried out, leading to a duplication; or the first thread gets the index before the second thread removes; then
the first thread adds at an incorrect index.
Change-Id: Ib47ba715c77221fa353fa4669662e5f48d8e5857
2016-02-04 16:01:11 +01:00
Axel Uhl
b680c0baf7
Merge remote-tracking branch 'server/master'
2016-02-03 22:43:29 +01:00
Axel Uhl
adc4cea5b9
Describing the Android release / deploy build process.
2016-02-02 23:00:13 +00:00
Axel Uhl
40aca3ea2f
More hints on getting an MiOS build/deploy/handover done
2016-02-02 22:33:29 +00:00
Axel Uhl
8b488c0478
Describing the iOS build
2016-02-02 21:52:17 +00:00
Axel Uhl
1bc29a9ec0
bug 3452: introducing an applyFilter parameter on DynamicTrackedRace.recordWind, forcing RaceLog-provided wind fixes into the race
...
Change-Id: Ie96ac8537650adb46285ebcc18a91dc70a6f7582
2016-02-02 21:14:43 +01:00
Axel Uhl
bda7a900c7
Merge remote-tracking branch 'server/ubilabs--ios--develop'
2016-02-02 16:36:16 +01:00
Axel Uhl
dccac572f8
don't add regatta log-provided competitors if no race exists; only collect competitors from race columns
...
Change-Id: Icd2843aba1d374cb3ac55b3575ec22e734ab9ec0
2016-01-30 21:11:44 +01:00
Axel Uhl
c985c18c86
consolidated imports to avoid warnings
...
Change-Id: Ib94311d8c96ba4474d4509010c51ab97f3cd369d
2016-01-30 17:32:23 +01:00
Axel Uhl
d50e1a73fd
added logic and test case for bug 3448: invalidate competitor cache and compute competitors from reagtta log if no race columns exist yet
...
Change-Id: Ica3d9fe0e032cce30389a55f2d1d4ad0fc7cd9bf
2016-01-30 17:19:41 +01:00
Axel Uhl
75c658cb21
Merge branch 'bug3446'
2016-01-30 15:13:21 +01:00
Axel Uhl
933c9128db
added forwarding rule for RegattaLogEvent on AbstractSimpleLeaderboardImpl
...
Change-Id: I58758c4b7eb7a589090981383587d709a13f34e6
2016-01-30 15:12:40 +01:00
Axel Uhl
fe1bf844a8
fixing bug 3448: trigger event when regatta log events are added and use to invalidate leaderboard DTO cache
...
Change-Id: Ib4a91d1ab8d58e07a845852cffd0f99d59b29544
2016-01-30 13:24:09 +01:00
Axel Uhl
5a5a74075b
"cherry-picked" the admin training presentation from ubilabs--rcapp--bug-3077 onto master
...
Change-Id: I717da07219848d95c10871e5421c25869ec7adf7
2016-01-30 12:51:34 +01:00
Axel Uhl
e43f85537c
more i18n support; focus identifier text field in create config dialog
...
Change-Id: Iaaff7d66d2969a14450b6f03dd04de741616fab6
2016-01-30 12:43:50 +01:00
Axel Uhl
209066b87b
fix for bug 3446: entity identity comparator for device configurations now compares the list of device names
...
Change-Id: I72f7d20cdb95d64cc403e7645f46c86a3f8c8384
2016-01-30 12:33:27 +01:00
Axel Uhl
c0f30fd545
removed "MULTI" device configuration stuff which was unused
...
Change-Id: Ie27a13acdf84c6978f26ecef362df58f3514e967
2016-01-30 12:14:21 +01:00
Axel Uhl
cb3e6aa94e
fixed several i18n issues around DeviceConfigurations in AdminConsole; use MarkedAsyncCallback in more places
...
Change-Id: Ifb0ba3fde55340595d3c87ed951d94d262e5ef48
2016-01-30 11:35:43 +01:00
Axel Uhl
91f8a9799d
"merging" the training presentation into master
...
Change-Id: I44931946b0a1d93626d91606e07897356501c379
2016-01-29 00:16:52 +01:00
Axel Uhl
f196f13aef
added -Djava.awt.headless=true to ADDITIONAL_JAVA_ARGS in start script to avoid issues with DISPLAY variable and QR code generation
...
Change-Id: Ic502069d60b8c2f8070d9966d28076491963ca70
2016-01-28 22:17:20 +01:00
Axel Uhl
30555d8c38
bug 3444: by removing the redundant validate() method in RegattaLogAddDeviceMappingDialog the QR code is generated when it should
...
Change-Id: If956108c63b7475207e526485f1cadfe43ae295a
2016-01-28 21:44:08 +01:00
Axel Uhl
cfcd0a7272
uncheck "Copy Competitors" checkbox in copy course/competitors dialog because competitors by default are registered on the regatta
...
Change-Id: Id7f0455a13c901e574809a60608fcf2128e9ce5a
2016-01-28 21:12:30 +01:00
Axel Uhl
fdc3b1b777
fix for bug 3443: use WaypointDTO's equals/hashCode which is based on identity to compare waypoints for selection model of waypoints tables
...
Change-Id: I337f2b64c7340f1cf3809b098b42fd181b4be256
2016-01-28 21:11:52 +01:00
Axel Uhl
7f0b8a06d0
bug 3442: fixing NPE when checking if marks are used in other course; if there is no course defined yet, marks are not used
...
Change-Id: Ib4d8e8731dce0e84c819eb42fd29765b4e21850d
2016-01-28 20:38:12 +01:00
Axel Uhl
74b4130338
preparing training presentation for smartphone tracking
...
Change-Id: I4dab74bab1c578ca5d9157c2bc7fbe03fe1ddaa2
2016-01-28 18:21:58 +01:00
Axel Uhl
9d105975a6
started with an administrator training guide
...
Change-Id: I65f338130f5231b9209b9485eb13c050e981df28
2016-01-28 11:31:35 +01:00
Axel Uhl
a68f004b82
Merge branch 'master' into bug778
2016-01-28 09:20:10 +01:00
EC2 Server
a4ae7c3b3c
Merge commit '27fcba4'
2016-01-28 08:03:17 +00:00
EC2 Server
7e78c061e3
use TMP environment variable to set java.io.tmpdir VM argument for GWT build
2016-01-28 08:02:29 +00:00
Axel Uhl
27fcba4ea6
fixing issue with direct de-serialization from a JSONObject produced not by reading from String but by serialization;
...
Serialization adds an Integer object to the JSONObject which cannot be cast to a Long. Reading from string
produces a Long. Solution: cast to Number, then use intValue()
2016-01-27 20:10:50 +01:00
Axel Uhl
40e151ad46
Merge branch 'master' into bug778
...
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
Change-Id: I9b1187b1f5790ae27beb76320a843c069cf45aa1
2016-01-27 18:27:47 +01:00
Axel Uhl
cdcd9a7c6c
fix for bug 3435: don't try to revoke a "Start Tracking" event when none is provided
...
Change-Id: If6a30934618469db1c7c01cf9d30c01d3b40119f
2016-01-27 17:56:44 +01:00
Axel Uhl
7e38d91535
fixed regatta log dialog heading
...
Change-Id: If307671f49f46454765cf8bfd49fd14a7febf557
2016-01-27 17:52:03 +01:00
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