Commit Graph
27354 Commits
Author SHA1 Message Date
Steffen Schaefer 3ec659572f Importing commons logging by its package. We have both, commons logging
and jcl-over-slf4j in the product. In addition we have no
commons-logging implementation in the product. With this change we can
consistently use jcl-over-slf4j that delivers log messages to jul.
2016-12-01 10:21:26 +01:00
Steffen Schaefer 14d834db07 Highcharts and mgwt seem to be only needed by GWT compiler. Set the
bundle dependency to resolution:=optional to make it possible to exclude
these at runtime
2016-12-01 10:18:34 +01:00
Steffen Schaefer 137bce36c1 Removed direct bundle references to slf4j because it seems that we do
not really need it in our code
2016-12-01 10:15:17 +01:00
Steffen Schaefer 790d809a29 Merge branch 'master' into bug2447 2016-12-01 10:13:47 +01:00
Kai Boernert 2e21ccd7b4 Merge branch 'master' of ssh://sapsailing.com/home/trac/git 2016-11-30 16:32:07 +01:00
Benjamin Barth 919cf97b4e Merge branch 'bug3947' 2016-11-30 15:24:58 +01:00
fmittag 1f2acc1f90 Merge remote-tracking branch 'origin/bug3916' 2016-11-30 14:16:12 +01:00
fmittag c974eaa047 Merge remote-tracking branch 'origin/bug3919' 2016-11-30 14:15:34 +01:00
fmittag c1c4cfe5eb added oscar flag to server side resources 2016-11-30 13:56:15 +01:00
Kai Boernert 05446ae821 Merge branch 'master' into bug3970 2016-11-30 13:41:35 +01:00
Kai Boernert c8677bdaa6 Merge branch 'master' of ssh://sapsailing.com/home/trac/git 2016-11-30 13:31:55 +01:00
fmittag 75035115ad fix for SWCConfiguration being null. 2016-11-30 13:14:10 +01:00
Benjamin Barth 1fbebcf835 bug3947 Adjusted JavaDoc and visibility of shouldShowLoading method 2016-11-30 12:46:02 +01:00
Benjamin Barth 35ceabf807 bug3947 Adjusted StringMessages for chart loading texts 2016-11-30 12:42:48 +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
fmittag 98687d1e8f fixed type from SWCConfiguration to ConfigurableStartModeFlagRacingProcedureConfiguration 2016-11-29 16:37:11 +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
fmittag 64bc834998 added to SWC start procedure settings to RegattaConfigurationDialog 2016-11-29 11:59:49 +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 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
Kai Boernert 7ec212c20d fixed testcase, put constant in the correct class, cleaned up code for blockinglist 2016-11-28 17:19:52 +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
Kai Boernert 4465088111 Merge branch 'master' into bug2564 2016-11-28 13:48:10 +01:00
Axel Uhl a4f4c68992 Merge branch 'master' into bug3970 2016-11-28 12:58:13 +01:00
Steffen Schaefer 68d42a02c2 Using apache commons from orbit where possible 2016-11-24 15:14:16 +01:00
Steffen Schaefer dd5d1fc745 Using junit and hamcrest from orbit / adjustments for different junit
bundle ID
2016-11-24 13:29:02 +01:00
Steffen Schaefer e0a9e5796b Using more current orbit site 2016-11-24 13:08:25 +01:00
Steffen Schaefer ad28ff7408 Added missing bundles to target platform that cause validation errors 2016-11-24 11:08:56 +01:00
Steffen Schaefer 7da60aba40 Using newer Orbit updatesites where possible 2016-11-24 11:00:30 +01:00
Kai Börnert 0e9bd289fc refactored duplicate code to superclass 2016-11-23 09:31:00 +01:00
Kai Börnert 36a93b7c26 Added i18n to Windchart for loading text 2016-11-23 09:15:03 +01:00