Commit Graph
100 Commits
Author SHA1 Message Date
Axel Uhl e14abcf43b fixed totalPoints export in LeaderboardsResources.
Change-Id: I27e003c02f2600a04cc05a3f22c6d61e1692c30c
2016-06-09 17:28:56 +02:00
Axel Uhl c75a33d874 consolidated imports
Change-Id: I745e4a3977fc3f8687e9aa6c8cfa69aa315cdc0c
2016-06-08 13:23:53 +02:00
Axel Uhl 75a4b37f53 Merge branch 'master' into ubilabs--rcapp--bug-3525 2016-06-08 13:03:49 +02:00
Axel Uhl a0bfbcaef7 removed obsolete statement System.currentTimeMillis() where the return value was not used
Change-Id: I5d084469c9ffd1362932fd928c15cced1ac21873
2016-06-08 11:52:37 +02:00
Axel Uhl e8332229a2 cleaned up i18n stuff in and around MediaPanel
Change-Id: I99fec8d06b369ce0085830a956138f74665582df
2016-06-08 11:34:24 +02:00
Axel Uhl 9be2bb2004 implemented single point of exit pattern in MediaPanel
Change-Id: I09a30edbcdf9544ecae91e722b8fc83127ec9f21
2016-06-08 11:24:51 +02:00
Axel Uhl 5b5b9f8ff0 consolidated imports
Change-Id: I52ef42a010c88137ce48758e0b0822b2e36c6201
2016-06-07 22:58:02 +02:00
Axel Uhl 9702cc8cb2 introduced new method TimePoint.getNearestModuloOneMinute, added test case for it and used in RaceManager app's StartTimeFragment
Change-Id: Ifd839f0d4d9f90b0306f428cfdd1bd0f9dc5bdf3
2016-06-07 22:57:23 +02:00
Axel Uhl 07e5063f26 Merge branch 'master' into ubilabs--rcapp--bug-3525 2016-06-07 21:25:19 +02:00
Axel Uhl 09b54e604d fixes regarding ConcurrentHashMap-->ConcurrentMap; use Iterable instead of Collection in MediaLibrary and related services
Change-Id: I71b2d1cef21cb9725001f1e84103644a8e076bc2
2016-06-07 18:23:32 +02:00
Axel Uhl 4b11a46ca5 another ConcurrentHashMap-->ConcurrentMap declaration change
Change-Id: Idb691d65d9cc73b6483be2a19bfe95573a9d16a3
2016-06-07 17:15:36 +02:00
Axel Uhl 80b2da6baa another ConcurrentHashMap-->ConcurrentMap declaration change
Change-Id: I5d7722a0e38afad3d36318e57eaf52c6f066b8b8
2016-06-07 17:14:23 +02:00
Axel Uhl 32daae4ad3 where concurrency support plays a role, changed field declarations from ConcurrentHashMap to ConcurrentMap which is sufficiently specific
Change-Id: I71254d96d495a1a8d79e009d70fd8928b720b31e
2016-06-07 17:08:07 +02:00
Axel Uhl 58fe2b8342 simplified MediaLibrary.updateMapByRace_Add
Change-Id: I65770d2c145ef8500d71d6374357028791f10375
2016-06-07 11:58:14 +02:00
Axel Uhl 2f5d6813b9 whitespace change only
Change-Id: Iff02931084b336f366a22d5b471e83994cd21ec7
2016-06-07 11:54:49 +02:00
Axel Uhl d27f243d3a added assert statements that validate constraints in MediaLibrary so far expressed only as a comment
Change-Id: I4ee9e5dc0f0c60ec1e6216e3b2b39ac766c13f0b
2016-06-07 11:53:35 +02:00
Axel Uhl 1415f61d16 formatting only: spaces, not tabs
Change-Id: Id25edad75463aafbb868cccdf2d01c2ca0e3718e
2016-06-07 11:25:26 +02:00
Axel Uhl 36ee1ffc39 whitespace/formatting change only
Change-Id: Idbd80127e812fb3958cf3adaf1a8908d2dd081f2
2016-06-07 09:33:13 +02:00
Axel Uhl 8c25a5a5c3 support default sailing locales also in AutoPlay entry point
Change-Id: I6a5771ee5e03279a864ddcbd6cfa94de06144966
2016-06-06 14:23:04 +02:00
Axel Uhl 7d6370428e adjusted usaged of PerspectiveLifecycle to the type arguments that were eliminated
Change-Id: Ia2f5a4e07af91873606f471ae04947b113bd68f1
2016-06-06 13:57:03 +02:00
Axel Uhl c499d53b49 removed redundant type argument from PerspectiveLifecycle, too
Change-Id: I2873b47ababc4ba2d40e0a72ce5537b5a58953c4
2016-06-06 13:55:47 +02:00
Axel Uhl 37547d8ac3 eliminated type arguments for PerspectiveCompositeTabbedSettingsDialogComponent and PerspectiveCompositeSettings
Change-Id: I3295922352aaff42d4af21cec8139d31d40faf35
2016-06-06 13:54:18 +02:00
Axel Uhl c077ae396a eliminated ComponentIdAndSettings
Change-Id: Ifabc4ce48fea0d631342ac56322f7593d3c47381
2016-06-06 10:39:23 +02:00
Axel Uhl d6537007ee a few whitespace and coding convention changes
Change-Id: I29bdabb56323a05cc5c2eabc55174cc774b11c9e
2016-06-06 09:44:50 +02:00
Axel Uhl b37f28ef33 eliminated PerspectiveIdAndSettings
Change-Id: Ia3eaa0980b0bf870ca78e0173af17c96ea97e3e8
2016-06-03 18:10:03 +02:00
Axel Uhl f353521428 removing PerspectiveIdAndSettings.perspectiveId (one of the existential reasons of PerspectiveIdAndSettings...)
Change-Id: Ib236c053c4102c779fc1a70d55641b00afe5886a
2016-06-03 18:00:05 +02:00
Axel Uhl 8a484366bd removed PerspectiveLifecycleAndSettings as it was not used anywhere
Change-Id: I2d65080003bf743b2721712d6899d42593258491
2016-06-03 17:47:03 +02:00
Axel Uhl f8ec511cf2 Merge branch 'master' into bug2610_componentid 2016-06-03 17:44:46 +02:00
Axel Uhl 5d9a1489ad Merge remote-tracking branch 'server/master' 2016-06-03 17:44:33 +02:00
Axel Uhl 6e04e49db0 Merge branch 'master' into bug2610_componentid 2016-06-03 15:52:02 +02:00
Axel Uhl 592c44e880 introduced command line options for uploadRepositoryToServer.sh for proxy/tunnel upload
Change-Id: Ib35d0de686c9f4f6660726a5a4bb9fbc69457933
2016-06-03 15:51:39 +02:00
Axel Uhl 91ce2c2d55 Merge branch 'bug3683' 2016-06-03 12:05:06 +02:00
Axel Uhl 337ce15ef1 formatting changes only
Change-Id: I43c8bf3de168ffe02e2bb1d05a6b89c387969151
2016-06-03 12:04:57 +02:00
Axel Uhl 341086ff54 fixing NPE issues for XML exporter in case a race has no valid end of race; sampling five wind fixes then
Change-Id: Ieeb8148f04ae2e9bc767a4c34d032ed2f6d3d76b
2016-06-03 10:45:48 +02:00
Axel Uhl a0cc588055 upgraded target platform: org.apache.servicemix.bundles.aws-java-sdk-1.9.8_1.jar replaced by org.apache.servicemix.bundles.aws-java-sdk-1.10.73_1.jar
Change-Id: If049def19299fbfba6ea27f30345b0c6a70b4ef6
2016-06-03 09:19:09 +02:00
Axel Uhl 51bab1b93f fix for bug 3682: remove a leaderboard group from all events referencing it when removing the leaderboard group
Change-Id: Ifa4a66202a1506c42f74c29037e052fad95ba053
2016-06-01 17:42:07 +02:00
Axel Uhl d1af28800d fix for bug 3681, "greening" the test: removing an overall leaderboard from the server unlinks it from the respective leaderboard group
Change-Id: Id23a781a2e640d8ee68d68e6dae2ec2e85b30a82
2016-06-01 17:34:56 +02:00
Axel Uhl fecedb380a added failing test case for bugs 3681 and 3682
Change-Id: I1d4fa2061b3ff0afecc4f9e8f5d5aeabd5ad3599
2016-06-01 17:29:11 +02:00
Axel Uhl bf7dfa7a6e Merge branch 'ubilabs--tracking_app--bug-2779' 2016-06-01 11:47:47 +02:00
Axel Uhl cf5b6bff9e introduced Component.getId(), defaulting to getLocalizedShortName(). Preparing for using this ID as key for components
and their life cycles in the scope of a perspective

Change-Id: I26b78dac9aba6e629e57a28af54a04d382f753f2
2016-05-31 14:26:52 +02:00
Axel Uhl 57c7ac1e70 consolidated imports
Change-Id: I0d7e02d567db06c70d2aaf718ca8c9011509ad69
2016-05-30 18:24:16 +02:00
Axel Uhl fcd653b822 fixed search test cases which now require the Event--LeaderboardGroup--Leaderboard association to be maintained properly
Change-Id: I84d4b864d5ea25d3e507b0b6ad876f7ba74c4eb1
2016-05-30 18:22:20 +02:00
Axel Uhl 48c85b8ba4 copied _zh_CN to _zh
Change-Id: Ie8a0963f878d9f1f86bb505143f16ce836219f67
2016-05-30 17:18:39 +02:00
Axel Uhl fe1da11be5 Merge branch 'translation' 2016-05-30 17:17:23 +02:00
Axel Uhl 8afe0b2ad9 fixing XML export for rank gains, using previous leg's finishing rank instead of current leg's rank at leg start
Change-Id: I2686f70aa8f3fb6a711c6491529ae179f3d2c7e7
2016-05-30 12:17:57 +02:00
Axel Uhl aa919b3433 Merge remote-tracking branch 'server/master' 2016-05-30 12:17:25 +02:00
Axel Uhl 53827a9359 fix for searching public events / leaderboards only (bug 3676)
Change-Id: I375fefcac041b3193b5768fca435c4a7032375a3
2016-05-30 12:10:14 +02:00
Axel Uhl 46d8ea8333 adjusted Javadoc
Change-Id: I8704d7eecb153ce789d2bc959135f37c11676de7
2016-05-30 11:03:05 +02:00
EC2 Server fefad09457 changed chmod 777 to 000-macros.conf so that httpd can read it 2016-05-29 11:29:33 +00:00
Axel Uhl 81620b3850 added "Platu25" as an alias name for "Platu 25"
Change-Id: I4c8a7cb794b9ba93525bf018891f00fb0724e4a7
2016-05-28 23:47:09 +02:00
Axel Uhl 2ae8a6b0c1 fixing "None" passing instruction for single mark start/finish waypoint
Change-Id: Iebce0c1e9fba5940829fedf1bbedfba15c60936c
2016-05-20 17:56:37 +02:00
Axel Uhl b314220429 fixed bug 2418 by checking single mark start/finish correctly now
Change-Id: Iff23d9b11fb04753fd60cc9ae829fdc4fd0fe12a
2016-05-20 17:31:08 +02:00
Axel Uhl a60221d2e5 Merge branch 'translation' 2016-05-20 11:37:05 +02:00
Axel Uhl a598da9b18 removed obsolete parameter Javadoc
Change-Id: I89f4fb76c325cfb952061bb738c11d2c66e5d4ac
2016-05-20 11:36:54 +02:00
Axel Uhl 37f62dad20 copoied _zn_CN.properties files to _zh.properties
Change-Id: Iece7510c447299672099af91c5227c1331c0bcc4
2016-05-19 18:44:12 +02:00
Axel Uhl 39c7d5b86c Merge remote-tracking branch 'origin/translation' into translation 2016-05-19 18:39:26 +02:00
Axel Uhl aeddc9922a bug 2779: fixing the initial texts for COG/SOG display in tracking app, using resources instead of redundant constants
Change-Id: I72e41ff8919b843063c0b3456928ca6b2d50a131
2016-05-19 18:06:17 +02:00
Axel Uhl 38ace3a979 removed dependency of gwt.ui on gwt.theme which no longer exists
Change-Id: I59a8ce3fa4db229fe9a89e6d4499821b1ad3a363
2016-05-19 16:30:31 +02:00
Axel Uhl 4c52f78efc Merge remote-tracking branch 'server/master' 2016-05-19 16:29:46 +02:00
Axel Uhl f3d5bdcf27 adjusted race management app release notes
Change-Id: I8908bf2731982c7f1780cf9d5dd045fe9e2e57dd
2016-05-19 16:22:28 +02:00
Axel Uhl 257bf67982 Merge branch 'ubilabs--rcapp--bug-3659' 2016-05-19 16:14:31 +02:00
Axel Uhl ff2c6cb9ce Merge branch 'bug3658' 2016-05-19 12:57:57 +02:00
Axel Uhl f74970a52c Merge branch 'master' into bug2610_lifecycle 2016-05-19 10:11:23 +02:00
Axel Uhl 44d2b1021e some more formatting
Change-Id: Ic0e15c6896f89e7cccbf1c7663dfca78e180b8bb
2016-05-19 09:40:04 +02:00
Axel Uhl 1177c0b086 fixed forwarding of waitForGPSFixesToLoad parameter; eliminated if-clauses originally described as problematic in bug3636 2016-05-18 22:40:18 +02:00
Axel Uhl 9ac039740f formatting changes only
Change-Id: I9111ee68db718198caec26f62f1bf3e09206faf5
2016-05-18 17:29:32 +02:00
Axel Uhl c9a976dc2f some whitespace, formatting and Javadoc changes
Change-Id: Ibb4f351a22e1a30da9a490aff16025f39b2bc324
2016-05-18 17:19:31 +02:00
Axel Uhl 952a8ebb04 Merge branch 'master' into bug2610_lifecycle 2016-05-18 16:00:55 +02:00
Axel Uhl 56f1ff8767 more tests and fixes for bug 3636
Change-Id: I4b2b8e55e787cfbafd598b95d3ae7566fceecd89
2016-05-18 15:50:25 +02:00
Axel Uhl 370a5c8b59 failing test case for bug3636
Change-Id: I2d929b9e6998cced903116884e04ba09469a9588
2016-05-18 15:10:25 +02:00
Axel Uhl d2420dc058 whitespace changes and a few renames for identifiers with typos in them
Change-Id: I382e6f906b8aabf636a0525aa5b9372ee83a0807
2016-05-18 13:55:42 +02:00
Axel Uhl 376808122a Merge remote-tracking branch 'server/master' 2016-05-17 17:28:29 +02:00
Axel Uhl a9f586ad6f avoid disabling "Add Media" URL field during Youtube probing; support file: protocol as non-Youtube indicator
Change-Id: Idc6763ed5bba9febf7ec50f14005c31c2ce794cc
2016-05-17 17:07:47 +02:00
Axel Uhl ba7e502833 avoid disabling "Add Media" URL field during Youtube probing; support file: protocol as non-Youtube indicator
Change-Id: Idc6763ed5bba9febf7ec50f14005c31c2ce794cc
2016-05-17 17:06:28 +02:00
Axel Uhl 966a2a6435 fixed synchronization for progressDialog in AbstractBaseActivity; see bug 3658
Change-Id: I43cb673d1ca3f53757dd5b1c6c781293a85edd1a
2016-05-17 15:44:05 +02:00
Axel Uhl 6bb120a567 Merge branch 'master' into bug3658 2016-05-17 15:41:15 +02:00
Axel Uhl 4aa46db498 declare Android support-v7 libs as 1.7 compiler level 2016-05-14 21:50:21 +02:00
Axel Uhl da0335eae8 Merge remote-tracking branch 'server/master' 2016-05-14 21:46:50 +02:00
Axel Uhl 545256d028 added preference files for Android source projects
Change-Id: I7bbf64bb5fcc51407462b63ef6411df44bf802d4
2016-05-14 21:46:23 +02:00
Axel Uhl 977c9fb55f Merge remote-tracking branch 'origin/master' 2016-05-14 21:43:57 +02:00
Axel Uhl d78481cf6c fixed paths in racecommittee.app/project.properties from Windows to portable Linux convention 2016-05-14 21:39:12 +02:00
Axel Uhl eea419294a Merge remote-tracking branch 'server/master' 2016-05-14 11:12:58 +02:00
Axel Uhl bb5bef59ae use ListBox value instead of itemText to preserve leading and trailing blanks of event names; bug 3661
Change-Id: I4c5f226a698b667252f94f7bfa63097fcb0ce1c5
2016-05-14 11:09:46 +02:00
Axel Uhl 4e3ad78640 turned method monitor object from Object to String to ensure serializability 2016-05-14 08:37:04 +02:00
Axel Uhl 50c72deb62 Merge branch 'master' into bug3657 2016-05-14 00:02:34 +02:00
Axel Uhl 4ae2566e0d updating the start time was now buggy on bug3657: when no race log is attached, non-null start time would remain unchanged
Change-Id: If74aa071ffca80781dcb673d8cca0fa63d1c4387
2016-05-13 23:59:23 +02:00
Axel Uhl 7aadb0a48e whitespace changes only
Change-Id: I616b32ec9f83ec664311be03a57e351ed3c340f8
2016-05-13 21:59:16 +02:00
Axel Uhl 07b11496c1 Merge branch 'master' into bug3645 2016-05-13 21:50:13 +02:00
Axel Uhl 64f2721563 Merge branch 'bug3660' into bug3657 2016-05-13 21:34:38 +02:00
Axel Uhl ead8e0dc46 removed a redundant call to invalidateStartTime in setStartTimeReceived
Change-Id: Ibd7841cc56ca8e71f121f4b613244861e05787cb
2016-05-13 21:34:14 +02:00
Axel Uhl b401df2276 force invalidateStartTime() when startTimeReceived is updated
Change-Id: I247eb474344b07da59c0812631f84f88e6dc93cd
2016-05-13 21:30:51 +02:00
Axel Uhl 95b509b5b8 Merge branch 'bug3660' into bug3657 2016-05-13 21:18:02 +02:00
Axel Uhl ff524f9808 bug 3660: materializing the startOfRace result in startTime in all cases; respond from cache; notify changes based on cache
Change-Id: I4362bc2a6b7513b3da10731a0a2299ad69f6a4fe
2016-05-13 21:15:30 +02:00
Axel Uhl a31b946b78 fixed a typo in a comment
Change-Id: Ie1688561d2f7c4fa4f1f67d2653e05fb52786b9f
2016-05-13 20:42:23 +02:00
Axel Uhl 468e7fbfc4 more parallelization across competitors for computing mark passing deltas
Change-Id: I444abf12289b1ad8a85466ac29f0ccc1e0558a5a
2016-05-13 19:57:26 +02:00
Axel Uhl 2ca0f358ab fixed setting of end proxy's waypoint index (+1 was missing)
Change-Id: Iecd52c8bce353fcc2590f32335e8e724e2d1b1b7
2016-05-13 19:56:51 +02:00
Axel Uhl f2a687fdd9 don't maintain the end proxy node's index in addWaypoints and removeWaypoints anymore; updated it under the course read lock
Change-Id: I9ecb6b4574a025bbe03a51e772951ba9844e1aa1
2016-05-13 18:36:13 +02:00
Axel Uhl 0650d96b77 introduced a bit more concurrency across the competitors in the MarkPassingCalculator; they are independent of each other
Change-Id: I26eb9bc5f871e8b223dc936139e350d61ef1e0f5
2016-05-13 18:24:49 +02:00
Axel Uhl 490e65000b synchronizing the dismissal of the progress dialog to avoid exceptions in concurrent / asynchronous situations
Change-Id: I208c2d4cb4ce932b470d34c7de65b5320d391ef5
2016-05-13 16:54:58 +02:00
Axel Uhl b58adebaad using multiple threads from an executor service to calculate mark passing/candidate updates in parallel for multiple competitors
Change-Id: I1797eb7f927b4a497384bbc5347e3b41c2c8c9ee
2016-05-13 15:47:27 +02:00