Axel Uhl
4f733b9b9d
Merge remote-tracking branch 'server/master'
2014-01-25 20:27:48 +01:00
Axel Uhl
b46f65469a
removing an old default regatta for which a new one has been created fixes bug 1725
2014-01-25 00:45:52 +01:00
Axel Uhl
4bb12ebc26
formatting only
2014-01-25 00:18:51 +01:00
Axel Uhl
a1833d51e9
re-formatted comment
2014-01-25 00:03:29 +01:00
Axel Uhl
be11e19ef8
fixing bug 1725 by introducing locking for raceTrackersByID that still allows for maximum concurrency
2014-01-24 22:41:37 +01:00
Simon Pamies
38dcb578d8
Extended comment to clarify that method can return null
2014-01-24 13:47:01 +01:00
Simon Pamies
9fbe539615
Added xmlexport to startup
2014-01-24 12:30:57 +01:00
Frederik Petersen
2246814e79
Fixed possible conc. mod. error in master data override
2014-01-24 11:52:27 +01:00
Frederik Petersen
b6cdeae717
Merge branch 'master' into masterdataimport-bug1708
2014-01-24 10:31:20 +01:00
Simon Pamies
fb31e6fda5
Removed GetStartAdvantage
2014-01-23 23:14:16 +01:00
Frederik Petersen
d89b19e1d3
Merge branch 'master' into masterdataimport-bug1708
2014-01-23 16:32:59 +01:00
Frederik Petersen
ed6d224a1c
Carried points, score corrections, suppressed competitors
...
are all imported even if no corresponding race is loaded on
the exporting side.
also fixed competitor id serialization
2014-01-23 16:10:00 +01:00
Lennart Hensler
06ecf6aae7
Cleaned the signature of two methods of TrackedRace
2014-01-22 18:24:25 +01:00
Simon Pamies
6689927305
Added new method getDistanceFromStarboardSideOfStartLine that computes
...
result based on given timepoint - this is useful if you want to compute
the distance before the start of the race
2014-01-22 16:45:30 +01:00
Frederik Petersen
971983d0e1
Suppressed competitors will not be imported if they are resolved to null
...
this fixes the null pointer in bug 1705
note that the supressed competitors are not exported, if the race is not
tracked on the exporting side. Just like the score corrections.
2014-01-22 13:35:28 +01:00
Frederik Petersen
0c26f164a9
Fixed override behavior for master data import
...
concerning bug 1708
tracked races are now relinked for flexible leaderboards
they are removed for regatta leaderboards
2014-01-22 10:53:30 +01:00
Axel Uhl
b200cdc51d
Merge remote-tracking branch 'server/master'
2014-01-21 20:25:12 +01:00
Axel Uhl
93e57ce471
follow-up for bug 1707: don't update regatta nor leaderboard in DB when race was removed; it only "releases" the connection
...
but keeps the race identifier attached to the column
2014-01-21 17:31:40 +01:00
Simon Pamies
335b2d0a06
Important change: From now on score corrections coming from the race committee always are persisted even when tracking provider has delivered correct results.
2014-01-21 16:48:51 +01:00
Axel Uhl
52712b79ba
fixed other launch configs, too, regarding sse gwt bundle
2014-01-20 14:41:16 +01:00
Axel Uhl
b56ce06a18
fixed launch config regarding gwt sse bundle
2014-01-20 14:39:45 +01:00
Simon Pamies
dc97d37f8f
Adapted launch configurations to work with SSE bundle - also added equinox console
2014-01-19 18:38:56 +01:00
Axel Uhl
6816dcdfea
added sse gwt bundle to Debug launch config
2014-01-17 15:24:43 +01:00
Lennart Hensler
0005562ae4
Extracted the data mining shared classes to its own project
2014-01-15 10:44:24 +01:00
Axel Uhl
dec22d638b
fixed launches to auto-start connector bundles; removed groovy from target platform; fixed SailingGWT launch again
2014-01-10 18:06:25 +01:00
Lennart Hensler
a4186302b4
Renamed SharedDimension to DimensionIdentifier
2014-01-08 18:19:05 +01:00
Lennart Hensler
2ea2816a80
Merge remote-tracking branch 'extern/master' into dataMining
...
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
java/pom.xml
2014-01-08 11:16:05 +01:00
Simon Pamies
e74ddaafaf
Changed method signature to use SpeedWithConfidence
2013-12-20 15:48:19 +01:00
Simon Pamies
61182234d3
Added getSpeedWhenCrossingStartLine as this functionality is useful for
...
start analysis
2013-12-19 19:21:08 +01:00
Lennart Hensler
6d22101407
Fixed launch configs after merge
2013-12-19 17:58:03 +01:00
Lennart Hensler
adbeb04b24
Merge branch 'master' into dataMining
...
Conflicts:
java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
java/com.sap.sailing.gwt.ui/SailingGWT.launch
java/com.sap.sailing.gwt.ui/build.properties
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/ui/AdminConsole.gwt.xml
java/com.sap.sailing.server/SailingServer (No Proxy).launch
java/com.sap.sailing.server/SailingServer (Proxy).launch
java/com.sap.sailing.targetplatform.base/features/target-base/feature.xml
java/pom.xml
2013-12-19 17:25:47 +01:00
Simon Pamies
1b4853a0b9
Added functionality to get course length for a tracked race
2013-12-16 19:44:04 +01:00
Simon Pamies
c7385366fa
Added functionality to get averaged wind for a race - seems like something we should directly have on a TrackedRace
2013-12-16 15:50:51 +01:00
Axel Uhl
87e8870eae
let combined wind start four minutes before race start
2013-12-13 21:35:54 +01:00
Axel Uhl
ed7e1296e1
Merge branch 'master' into igtimi
...
Conflicts:
java/com.sap.sailing.selenium.test/com.sap.sailing.selenium.test (No Proxy, GWT Codesvr.launch
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2013-12-12 12:03:02 +01:00
Axel Uhl
1fc4558dcb
Merge branch 'master' into igtimi
...
Conflicts:
java/com.sap.sailing.selenium.test/com.sap.sailing.selenium.test (No Proxy, GWT Codesvr).launch
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2013-12-10 21:27:45 +01:00
D049941
04e7c3e5c0
Merge remote-tracking branch 'origin'
2013-12-10 15:54:15 +01:00
D049941
5b9d469d5b
Merge branch 'master-for-merge'
...
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsoleEntryPoint.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaDetailsComposite.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaWithSeriesAndFleetsCreateDialog.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SeriesEditDialog.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SeriesWithFleetsCreateDialog.java
java/com.sap.sailing.selenium.test/local-test-environment.xml
java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/AdminConsolePage.java
java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestStartAndStopTrackingForTracTracEvents.java
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2013-12-10 15:49:40 +01:00
Axel Uhl
06e8413847
started an Igtimi AdminConsole panel to manage Igtimi accounts
2013-12-10 00:33:11 +01:00
Axel Uhl
28a7419cb6
Merge branch 'master' into igtimi
2013-12-09 23:34:36 +01:00
Axel Uhl
1404c18f67
replaced all usages of RGB Strings by the use of Color where possible; particularly in Competitor and CompetitorDTO
2013-12-09 22:06:29 +01:00
Axel Uhl
1e2cd16e89
fixed swapped name/color in CompetitorImpl.resolve
2013-12-09 20:42:57 +01:00
Axel Uhl
b1678d914c
switched RacingEventServiceImpl to WindTrackerFactory discovery through OSGi service lookup
2013-12-09 17:33:57 +01:00
Axel Uhl
1749cd54dd
removed expedition dependency from RacingEventService
2013-12-09 15:37:31 +01:00
D049941
be3aecf067
Bundle com.sap.sailing.server.gateway.test.support added to be able to
...
clear the state in tests.
2013-12-09 14:33:13 +01:00
D049941
3b1d491b65
Required bundles fixed.
2013-12-09 13:40:12 +01:00
D049941
984420ae06
Launch configuration with database 'winddbTest' added for the execution
...
of UI-Tests.
2013-12-09 13:11:47 +01:00
D049941
9c3c8cfaf3
Merge branch 'riccardo' into 'master-for-merge'
...
Conflicts:
java/com.sap.sailing.domain.igtimiadapter.persistence/src/com/sap/sailing/domain/igtimiadapter/persistence/impl/DomainObjectFactoryImpl.java
2013-12-09 13:00:58 +01:00
fmittag
6d543b46b4
renamed new attribute displayColor of competitor back to color
2013-12-07 16:25:54 +01:00
fmittag
5918bb1d14
Merge remote-tracking branch 'origin/master' into competitorpanel_reuse
2013-12-07 14:22:27 +01:00
Axel Uhl
Simon Pamies
Frederik Petersen
Lennart Hensler
Lennart Hensler
D049941
fmittag