Commit Graph
100 Commits
Author SHA1 Message Date
Axel Uhl 808aab973e adjusted NOAA importer launch config so that https proxy is set
Change-Id: I78c92d058658d6826d6bfc8ef0429b24ba9a43e1
2016-12-07 09:12:18 +01:00
Axel Uhl 1aeaefbc07 whitespace change only
Change-Id: I8929018a78b64ec11b583ba6eea98a048885a560
2016-12-05 11:38:38 +01:00
Axel Uhl 13b9103e79 fixed Flags.getStartModeFlags
Change-Id: I53c41180138f5bd963eaecbe67bf3702889e073f
2016-12-05 11:33:51 +01:00
Axel Uhl 79814a9750 Merge remote-tracking branch 'server/master' 2016-12-05 11:10:29 +01:00
Axel Uhl 146dd86401 only generate Event-SSL entry into 001-events.conf; the macro already has the redirect from port 80 to port 443
Change-Id: If6c440c6cb74c7cd5a57323efb7ffdf569e18b7b
2016-12-05 10:59:29 +01:00
Axel Uhl 1d5678ddbd Updated amazon ec2 (markdown) 2016-12-05 09:39:10 +00:00
Axel Uhl 04e7aa684e Merge branch 'master' into bug3924 2016-12-05 09:19:08 +01:00
Axel Uhl 22dbbf7d87 updated race management app release notes
Change-Id: I3e57d5cbd167ede42c1ff8f71ae8b881cf22ab77
2016-12-05 09:18:07 +01:00
Axel Uhl 07bc4a4c3f Merge branch 'master' into bug3028 2016-12-05 09:10:20 +01:00
Axel Uhl 315e174817 the refactoring around SWCRacingProcedure had accidentally removed the super.update() call to BaseRacingProcedure.update, missing updating the individual recall
Change-Id: I1264cc96b91bb15804b36545a668db19e38d70d5
2016-12-04 10:18:09 +01:00
Axel Uhl 4665f15b50 adjusted race committee release notes regarding bug 3980
Change-Id: I038f1a7854bff247dfc04705c3a1d877421a98b4
2016-12-03 22:45:21 +01:00
Axel Uhl 81c4a3d889 bug3980: showing all races in one fragment for protest time entry on smartphone/portrait
Change-Id: I1ee1f44d5e2ed46d5433ba601f7b3c96696324c9
2016-12-03 14:16:34 +01:00
Axel Uhl 70294c886d fixed NPE in protest time race log event deserializer; a follow-up problem of bug 3918
Change-Id: I3e6478ec9e05eb6d16a7fe9be8e3ae6d29931e55
2016-12-03 13:36:17 +01:00
Axel Uhl e4f888b0da Merge remote-tracking branch 'server/bug3916' into bug3916 2016-12-02 17:49:22 +01:00
Axel Uhl 1fb25e5aab let Flags enumeration know which ones generally qualify as start mode flags
Change-Id: I0bb251d57a4b3bd0c37c712b1a76713ee81754db
2016-12-02 17:10:24 +01:00
Axel Uhl 3ad647c803 fixed constructor resolution after introducing type arguments for CheckinDataActivity
Change-Id: I06b96d4da615f09438ca772ab02bd32b695a4bf9
2016-12-02 16:49:09 +01:00
Axel Uhl d0b53f6f1b removed now redundant casts based on the introduction of generics for CheckinData
Change-Id: I380626162bf4bb78ec6a31a3c638334cb3cf3427
2016-12-02 15:52:55 +01:00
Axel Uhl 4988f7cae4 use generics to avoid casts for CheckinData vs. BaseCheckinData in shared android stuff
Change-Id: I248cb11ff5972b6bc55ac760ff1e37b49a9f599c
2016-12-02 15:40:26 +01:00
Axel Uhl f0171e7bbf Merge branch 'master' into bug3959 2016-12-02 15:10:34 +01:00
Axel Uhl 7486fc2d53 changed timing values of RRS26 and SWC procedures from millis to Duration objects; factored and fixed isStartphaseActive
Change-Id: I3f1b5d865d2d4af0e23a8ede412f3021908e820a
2016-12-02 14:38:22 +01:00
Axel Uhl fb9cd19be5 use https now for NOAA declination service
Change-Id: I5300327fd280e6ed2422bfe3a8b11e8198ba0204
2016-12-02 12:30:14 +01:00
Axel Uhl 64e32db44a Javadoc change only
Change-Id: Ibd9bfbf67c8c0efb196dbc36459c0b382dcff3d0
2016-12-02 12:30:01 +01:00
Axel Uhl e5dcd5cbbf copied changes in zh_CN file to _zh file
Change-Id: I05d06052a562a8de6b50a7044db7900eec28dd29
2016-12-01 18:23:54 +01:00
Axel Uhl 1404b9079f Merge branch 'master' into translation 2016-12-01 18:21:49 +01:00
Axel Uhl 626a18d097 whitespace change only
Change-Id: Ia3c9662e9c8d9d9dc19ec099e38316638043580d
2016-12-01 18:21:40 +01:00
Axel Uhl 393e8dba23 Merge branch 'master' into translation 2016-12-01 18:16:42 +01:00
Axel Uhl 6970edc880 updated release notes for Race Manager app for SWC racing procedure
Change-Id: Idae13402c5d07cbc3d6eea932a355a760c2e8ba0
2016-12-01 13:44:42 +01:00
Axel Uhl 3208ad1d58 Merge remote-tracking branch 'origin/translation' into translation 2016-12-01 13:16:20 +01:00
Axel Uhl 8c133508d4 Merge branch 'master' into bug3972 2016-11-30 16:37:47 +01:00
Axel Uhl 55c8267036 Merge branch 'master' into bug3972 2016-11-30 13:40:26 +01:00
Axel Uhl 02cc3e833d Merge branch 'master' into bug3919 2016-11-30 12:24:07 +01:00
Axel Uhl e8d5836ab6 Merge branch 'master' into bug3916 2016-11-30 12:23:13 +01:00
Axel Uhl d334d44acd fixed RaceLogEventSerializerTest after having introduced assertions for non-nullness of protest time range
Change-Id: Iddc4d571698172c37097eda738cf1e659dd64b1b
2016-11-30 12:20:00 +01:00
Axel Uhl f2b586ea4b Merge branch 'master' into bug2564 2016-11-29 18:11:19 +01:00
Axel Uhl d51143f077 Merge branch 'master' into bug3916
Conflicts:
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/preference/RegattaPreferenceFragment.java

Change-Id: I679391487b85c85abdf8e100b72829b1947a2ff1
2016-11-29 18:06:38 +01:00
Axel Uhl b7f72371da Merge branch 'master' into bug3919
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/home/solutions/RaceCommitteeAppNotes.html

Change-Id: I693b8bd6c24e293c5e7923ca8033ad6d1d13c208
2016-11-29 18:03:14 +01:00
Axel Uhl e691bca866 added protest start time to status panel; fixed date display; added assertions about non-nullness of protest time range and its bounds
Change-Id: I8697c5083fa7e5b5f3cfd0092256cbd9a67d049a
2016-11-29 17:41:13 +01:00
Axel Uhl c3f18e7451 added protestStartTime to RaceInfoDTO; it may now be used in, e.g., RegattaOverview
Change-Id: I4ea548323bd3a20c34a5f4917046c4b985013e7c
2016-11-29 17:06:27 +01:00
Axel Uhl 3234eb0a6b removed unused duration loaders in DomainObjectFactoryImpl
Change-Id: Ic052f384b22b0c94581aeec85017063abf65f0ba
2016-11-29 16:37:47 +01:00
Axel Uhl f80a7f8fce Merge branch 'master' into bug3918 2016-11-29 16:29:12 +01:00
Axel Uhl ea2c6c67e7 renamed LineStartRacingProcedure and related types to ConfigurableStartModeFlagRacingProcedure
Change-Id: I5cef86cbb768c837db7fe5b5712f12d76c9d0b59
2016-11-29 16:13:01 +01:00
Axel Uhl 7dd5755df8 introduced RacingProcedureWithConfigurableStartModeFlagConfigurationImpl; more factoring out of common DTO--config copying parts
Change-Id: I05247092d08a71e44bfdd83c45560b43e40c6c95
2016-11-29 16:09:21 +01:00
Axel Uhl 43048a3a2b factored commonalities for regatta configuration DTO production for the different racing procedures
Change-Id: I19e2e62cef59c114e2f884a29316c7f957db3e14
2016-11-29 15:46:46 +01:00
Axel Uhl d365dab8c6 Merge branch 'master' into bug3916 2016-11-29 15:05:59 +01:00
Axel Uhl ba4d5e23be avoid unnecessary HSV conversion when everything is an HSVColor anyhow
Change-Id: If01a348d864c5d73e636f00ef69cfad7f4e7a709
2016-11-29 14:59:03 +01:00
Axel Uhl 10fc56d287 increased minimum color distance from blocked colors from 0.2 to 0.5
Change-Id: I59eb74f47e22344e7f605a4c25fc4b2c63dceb6e
2016-11-29 14:53:40 +01:00
Axel Uhl 1e087d3e2b introduced ColorMapTypeStyler, avoiding HSL altogether
Change-Id: Iaa36247720d314c2987f0276775b22681f0e1e19
2016-11-29 14:36:23 +01:00
Axel Uhl 83be78d448 improved initialization of ColorMapImpl.baseColors
Change-Id: Icee2364ac613d945f8b71170de08481c4727fab3
2016-11-29 10:18:29 +01:00
Axel Uhl f2a0b7347a use vararg in ColorMapImpl for blocked colors argument
Change-Id: If04f05700789aa0f5ce030e94c8104d65514f3c7
2016-11-29 10:14:48 +01:00
Axel Uhl 1f4b210cf6 removed WATER_COLOR from blocked colors for WindChart
Change-Id: I91af7f08a4ae3af031243cab90e064cb76beb17d
2016-11-29 10:12:38 +01:00
Axel Uhl 0b2a98723f added an RGB/HSV conversion test case that fails before 55ce549f60
Change-Id: I8aa54ae58ceb292f568ed078a9d6ae87f7d4ebbd
2016-11-29 09:42:30 +01:00
Axel Uhl 232fbe1d9a moved ColorMapTest out of the never executed gwt.ui.test project into com.sap.sailing.domain.test
Change-Id: I0a0962fa8b32182eb29f9107325d6f1e44c338e0
2016-11-29 09:34:05 +01:00
Axel Uhl 10ec0e3c35 Merge branch 'master' into bug2564 2016-11-29 09:21:21 +01:00
Axel Uhl a0302d97b9 don't insert extrapolated fixes anywhere except at the end; use real fixes if extrapolation is requested and we have a real fix for the "to" time point
Change-Id: I83fcb72a3d09b97922f918234263ba167f0e7645
2016-11-28 18:12:43 +01:00
Axel Uhl 6746b39028 Revert "fix for invalid tail starts being appended, if tail starts before the race"
This reverts commit bbdc6cedd6.
2016-11-28 16:01:19 +01:00
Axel Uhl a4f4c68992 Merge branch 'master' into bug3970 2016-11-28 12:58:13 +01:00
Axel Uhl 35ddb2ab07 Merge branch 'master' into ubilabs--ios--develop 2016-11-28 10:11:29 +01:00
Axel Uhl 28dbe6c136 Merge remote-tracking branch 'server/ubilabs--ios--develop' into ubilabs--ios--develop 2016-11-28 10:11:12 +01:00
Axel Uhl 26c21d9915 Merge branch 'master' into bug3916 2016-11-11 15:59:30 +01:00
Axel Uhl 192e558518 allowing mergeFixes to consider an overlap even if fixes are added before *and* after the existing sequence
Change-Id: If92d8375e486689f13234d32ad8f2d545169032b
2016-11-11 13:55:27 +01:00
Axel Uhl 27dfab2908 Merge branch 'bug3967' 2016-11-11 12:34:49 +01:00
Axel Uhl 2aeb6fe0db fixed quoted in urlForLanguage text message in chinese translation
Change-Id: Iddf5266b78b3136c014b55e0323b7ffd7a46c631
2016-11-10 23:07:18 +01:00
Axel Uhl 34c090185f fixing problem with quoting in translated messages; copied zh_CN properties to _zh properties
Change-Id: I0dd925b462a841aa82edb0d7a7e59c184e9d5bb5
2016-11-10 18:25:41 +01:00
Axel Uhl 5c6e2de36a slight refactoring, moving the display of the error message out of the test method
Change-Id: I789467194533e28b24d5cf808a93fb1d440686b7
2016-11-10 14:57:06 +01:00
Axel Uhl 1acd629749 Merge remote-tracking branch 'server/master' into bug3225 2016-11-10 14:38:36 +01:00
Axel Uhl ca4af627ef Merge remote-tracking branch 'server/master' 2016-11-09 18:41:51 +01:00
Axel Uhl 0bf67cecb9 set encoding for datamining string messages to UTF-8
Change-Id: I262e78e6889f59f5e4f51418bf88dc5a669f7f10
2016-11-09 18:34:12 +01:00
Axel Uhl f93327e533 Merge branch 'master' into translation 2016-11-09 09:13:09 +01:00
Axel Uhl 1df564bf9a more compact implementation using ternary expression
Change-Id: Ia683af42fce1be66b6289916d27bd1e957cfd933
2016-11-08 18:16:25 +01:00
Axel Uhl 10fe0fb989 clear triggerables collection before starting to run them
Change-Id: Iec771233468bebff7bb28e2b7cb582d28ed97e87
2016-11-08 18:07:10 +01:00
Axel Uhl 238c63681a introducing Trigger/Triggerable to protect inconsistent states of FixesAndTails from becoming visible
Change-Id: I1d43a1f398433f74b6c90d147c25918f212793e8
2016-11-08 17:52:46 +01:00
Axel Uhl 5b0ee0edc4 Merge branch 'startboat' 2016-11-08 09:09:52 +01:00
Axel Uhl c639685186 consolidated imports to avoid warnings
Change-Id: I17e3e47f6e2fb609937ce3dd8d7536670c107537
2016-11-07 17:59:04 +01:00
Axel Uhl 500740e047 Merge branch 'master' into bug3918 2016-11-07 17:57:21 +01:00
Axel Uhl a4e44e4ad4 changed the rotation logic and made sure to update the course position data into the mark overlay
Change-Id: I3065e4fb10f02cc2fbe6a683e07233ad0804e2d3
2016-11-07 14:36:59 +01:00
Axel Uhl 07b4a807fc break the for loop when the startboat mark has been found; more formatting changes
Change-Id: I0575610020f4fbbef00385115bfe4ed7fa1ffa77
2016-11-07 13:39:51 +01:00
Axel Uhl b1de45ac4c removed redundant parameter MarkType from MarkVectorGraphicsFactory.getMarkVectorGraphics
Change-Id: Idd76e591a1e79dc9f71e159692f5e469d8ca9097
2016-11-07 11:49:14 +01:00
Axel Uhl f05e40a2d4 split up BuoyMarkVectorGraphics according to drawing strategy
Change-Id: I342495e36b154eca3f27b41e28c1c0f4c8270946
2016-11-07 11:09:16 +01:00
Axel Uhl 3802798fb2 formatting; removed redundancies in switch/case
Change-Id: I9e1567b21fce2771d9211be8c12e1abd51cd6dcf
2016-11-07 11:01:37 +01:00
Axel Uhl 067516300b Merge branch 'master' into startboat 2016-11-07 09:33:38 +01:00
Axel Uhl f7ed68aa38 use harmonization of TrackedRace.getMarkPassings in SailingServiceImpl
Change-Id: I52adbb6d7e77ea57c65c99aa912f394e7c64a6f2
2016-10-28 10:42:39 +02:00
Axel Uhl 3e163dd6b2 unified getMarkPassings methods on TrackedRace
Change-Id: Idd4d82766de52a719dae609f5e89f4ec48733fd5
2016-10-28 10:41:56 +02:00
Axel Uhl 3489c9132b moved write-locking the MarkPassingCalculator.Listen out of the try-block;
An InterruptedException would have lead to the lock not having been obtained. Yet, the finally
clause would have tried to unlock, leading to non-symmetrical locking behavior which could lead
to deadlocks.

Change-Id: I2a89d5bb4f9ef5afe6fcf069a29fc2ccafe68ecc
2016-10-28 10:32:53 +02:00
Axel Uhl 08300f7fe4 made MarkPassingCalculator.listenThread final
Change-Id: I3d5f7402b750ffe7d5e5740acc7197328c64fba8
2016-10-28 10:27:23 +02:00
Axel Uhl d1fd52301e adjusted locking method names to naming conventions
Change-Id: I3d5a1dd86e809de1798ff30403d18835203105b2
2016-10-28 09:55:18 +02:00
Axel Uhl d1dfdaa768 removed obsolete unused method from SailingService; enhanced Javadoc
Change-Id: I4110ee1704c8ff0a6f6e5cf14fcf9ce0d7627c84
2016-10-28 09:52:40 +02:00
Axel Uhl f8b7fe3b33 Merge remote-tracking branch 'server/master' into bug3816_2 2016-10-28 08:47:09 +02:00
Axel Uhl 6a3e77befc Merge branch 'bug3280' 2016-10-27 14:05:46 +02:00
Axel Uhl ca297619fc adjusted formatting according to conventions
Change-Id: I19ef2ffdcd10892134221358c4e90f994d0daf70
2016-10-26 10:16:24 +02:00
Axel Uhl 5b67f0b9b9 Merge remote-tracking branch 'origin/bug3964' 2016-10-23 01:38:21 +02:00
Axel Uhl 95f295d79a Merge branch 'master' into bug2570_2 2016-10-22 14:37:25 +02:00
Axel Uhl 5923ac55b2 fixed SensorFixStoreAndLoadTest after changing ride height type from double to Distance
Change-Id: I1b4864c25732a0d9b5db9275c7e835890ada8f07
2016-10-22 14:29:54 +02:00
Axel Uhl b772026d24 Merge branch 'bug2570_2' of ssh://localhost:12347/home/trac/git into bug2570_2 2016-10-21 16:05:42 +02:00
Axel Uhl d8429d6766 migrated ride height from a double value to a Distance
Change-Id: I15c18f90df384b0241f2ec5ef7e223ded96561d9
2016-10-21 14:49:43 +02:00
Axel Uhl 02be736b12 fixed bug 3964 by calculating *race* average after last leg is finished
Change-Id: Ib9852e87e473dbfae9c1a67407bb85338f8a979b
2016-10-21 14:36:04 +02:00
Axel Uhl e84394597f bug3964: computing avg SOG and ride height for entire race when race is finished
Change-Id: I982325e724f891e88ed1a6297c18d8a71f38d1b8
2016-10-21 13:11:12 +02:00
Axel Uhl 8a38e46f95 in NaturalComparator use Long instead of Integer for number comparison
Change-Id: If09c10c48072bf90aa1f9c05bc60477388666a99
2016-10-21 12:35:51 +02:00
Axel Uhl 54873d8aa6 Merge branch 'master' into bug2570_2 2016-10-21 09:44:19 +02:00
Axel Uhl dc04d0fe84 release notes entry for Race Management app
Change-Id: I05e790a67bd056339b97b298d4dedf3cdbf6aa55
2016-10-20 10:47:32 +02:00
Axel Uhl 7c2cc3135f Merge remote-tracking branch 'server/master' 2016-10-20 10:44:20 +02:00