Kai Börnert
95d71cdb9f
bug4661 formating/code style only change
2018-07-17 09:16:03 +02:00
Kai Börnert
879c0c3504
move score factor calculation to ScoringScheme if not explizitly set
2018-07-13 14:38:06 +02:00
Kai Börnert
57067b2d37
bug4343 added test for encoding of leaderboards, improved leaderboard
...
encoding to capture all cases
2018-06-20 11:42:29 +02:00
Maximilian Groß
37917a50a4
Merge branch 'master' into bug4491
...
# Conflicts:
# java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasRaceOfCompetitorContext.java
# java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/TrackedLegOfCompetitorWithContext.java
# java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/tracking/impl/BravoExtendedFixImpl.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/ManeuverMainCurveWithEstimationData.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverMainCurveWithEstimationDataImpl.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/GPSFixTrack.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/GPSFixTrackImpl.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/client/StringMessages_fr.properties
# java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/ManeuverMainCurveWithEstimationDataJsonDeserializer.java
# java/com.sap.sse.datamining.ui/src/main/java/com/sap/sse/datamining/ui/client/presentation/AbstractTabbedResultsPresenter.java
2018-05-28 08:35:21 +02:00
Axel Uhl
b98b4efa78
Merge branch 'bug4574' into bug4527
2018-05-15 01:48:21 +02:00
Axel Uhl
80c3ce45bd
fixed test case after getOrCreateCompetitorWithBoat got stricter
2018-05-15 01:44:38 +02:00
Axel Uhl
b095a063a8
bug 4527: allow for synchronous RaceListener registrations
...
Change-Id: Ibb6a064222d9cb1ef0944df5fee9dd0e3675ab8e
2018-05-14 15:36:04 +02:00
Maximilian Groß
e977678869
Merge branch 'master' into bug4491
...
# Conflicts:
# java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/LeaderboardEntryDTO.java
# java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/Fix.java
# java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SailMasterConnector.java
# java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/FixImpl.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/CompleteManeuverCurveWithEstimationData.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/ManeuverMainCurveWithEstimationData.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/CompleteManeuverCurveWithEstimationDataImpl.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverCurveWithUnstableCourseAndSpeedWithEstimationDataImpl.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/maneuverdetection/impl/ManeuverMainCurveWithEstimationDataImpl.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/afterliveraceloop/boats/RaceEndWithBoatsPresenterImpl.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/afterliveraceloop/boats/RaceEndWithBoatsView.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/afterliveraceloop/boats/RaceEndWithBoatsViewImpl.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/liveraceloop/racemapwithleaderboard/LiveRaceWithRacemapAndLeaderBoardView.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/liveraceloop/racemapwithleaderboard/LiveRaceWithRacemapAndLeaderBoardViewImpl.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/server/LeaderboardContext.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_es.properties
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_fr.properties
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ja.properties
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_pt.properties
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_zh.properties
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
# java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/LeaderboardsResource.java
2018-04-20 13:10:37 +02:00
Axel Uhl
22b4ec6535
Merge branch 'master' into bug4509
...
Change-Id: Ia63ce5f964be5471b00a5429d6984e141d742b4d
2018-04-13 15:55:28 +02:00
Axel Uhl
b4f1c8fb10
more getCompetitorStore()-->getCompetitorAndBoatStore() renames
...
Change-Id: I715aba1aeaef8a4bd180d73b026164abcbdba196
2018-04-13 09:01:27 +02:00
Axel Uhl
662fd99fad
Merge branch 'master' into bug4509
...
Change-Id: I68eacba973b9c1246aaf9b769f69bc7e96e93f2b
2018-04-12 14:23:56 +02:00
Axel Uhl
4c319f5f6c
renamed CompetitorStore to CompetitorAndBoatStore; renamed Competitor[WithBoat]DTO classes
...
Change-Id: Ib80cf877e63fd834a73e81f20fafa57f130cc0a7
2018-04-12 14:18:16 +02:00
Axel Uhl
231e83bc2c
Merge branch 'master' into bug4509
...
Change-Id: I23ff6e0b645ab626284fc95b172243878e022806
2018-04-12 13:41:37 +02:00
Maximilian Groß
ed1fae0c8f
divided datamining from sailing specific classes
2018-04-12 07:40:59 +02:00
Axel Uhl
1cf923a027
use DynamicCompetitor and DynamicBoat where necessary
...
Change-Id: Id06014ac0baba5ea2315894068003c80733f1b0e
2018-04-11 17:26:20 +02:00
Steffen Schaefer
16ada7f8a6
Bug 4492: Adjusted StatisticsTest to correctly work with asynchronous
...
event handling
2018-04-11 10:15:10 +02:00
Axel Uhl
360f72a6a7
Merge branch 'master' into bug2822_boatcolors
2018-03-24 08:49:11 +01:00
Axel Uhl
bd90f921dd
added Automatic-Module-Name headers to satisfy Oxygen.3 Java9 warnings rule
2018-03-24 01:45:37 +01:00
Axel Uhl
e812b1ad60
Merge branch 'master' into bug2822_boatcolors
...
Change-Id: I19333a21e5d79726b1409eb319798f55b49faf79
2018-03-22 14:45:41 +01:00
Steffen Schaefer
0601becf81
Bug 4489: Initial implementation to ensure replication state for out of
...
thread event processing in TrackedRegattaImpl
2018-03-21 16:50:37 +01:00
Frank Mittag
d2b3fc62c0
Merge remote-tracking branch 'origin/master' into bug2822_boatcolors_merged_with_eol_changes
2018-02-21 10:48:43 +01:00
Frank Mittag
98abbf7cb4
Merge remote-tracking branch 'origin/master' into bug2822_boatcolors_merged_with_eol_changes
...
# Conflicts:
# java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java
2018-02-07 13:38:32 +01:00
Steffen Schaefer
f6851c53c7
Bug 4442: Updated Jetty dependencies to consistently use version 9.4.8
2018-02-06 15:46:26 +01:00
Frank Mittag
e9e52697a6
Merge remote-tracking branch 'origin/master' into bug2822_boatcolors_merged_with_eol_changes
2018-01-31 15:04:09 +01:00
Axel Uhl
774525b457
Merge branch 'master' into bug4429
...
Change-Id: Ie2dc18c27efe884f7e1bc24206707424b356e739
2018-01-31 10:43:57 +01:00
Steffen Schaefer
952988e2ef
Bug 4429: Test fixes
2018-01-29 09:33:18 +01:00
Frank Mittag
bbf68c4ed5
and cleanup of last test using CompetitorAndBoat class
2018-01-11 15:55:20 +01:00
Frank Mittag
9ad514909f
Further test cleanup
2018-01-11 15:48:41 +01:00
Frank Mittag
e629372c5a
Cleanup of some test and removal of a createCompetitorAndBoat method() in AbstractLeaderboardTest
2018-01-11 14:39:32 +01:00
Peter Siegmund
94b8ae7af8
Merge branch 'master' of ssh://sapsailing.com/home/trac/git into bug4232
2018-01-05 08:42:41 +01:00
Axel Uhl
3397169c8a
Merge branch 'master' into bug2822_boatcolors_merged_with_eol_changes
...
Change-Id: I217ebf26a7c0b92b27efc06de5ac80cf7fcc6d8f
2017-12-21 13:35:18 +01:00
Axel Uhl
4271d8c9cc
resort to default regatta for TrackedRace / RaceDefinition lookup while trying to remove existing
...
Change-Id: I5ed69350a0b647125e1da371e10112eaa2e9ee50
2017-12-20 10:02:02 +01:00
Frank Mittag
ddc3deb66b
fixed a test after last master merge
2017-12-08 12:01:18 +01:00
Frank Mittag
ab250e131b
Merge remote-tracking branch 'origin/master' into bug2822_boatcolors_merged_with_eol_changes
...
# Conflicts:
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/afterliveraceloop/boats/RaceEndWithBoatsPresenterImpl.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/preliveraceloop/leaderboard/PreLiveRaceLeaderBoardWithImagePresenterImpl.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/partials/racelist/RaceListColumnFactory.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/partials/statistics/AbstractStatisticsBoxPresenter.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/SingleRaceLeaderboardPanel.java
2017-12-08 11:52:11 +01:00
Benjamin Barth
f94243d057
bug1630 Optimized and refactored JUnit test cases
2017-12-07 14:07:25 +01:00
Peter Siegmund
0e2888203e
don't use unconfirmed finish list for confirming - use concrete list
2017-12-06 10:35:43 +01:00
Benjamin Barth
20eca60bd7
bug1630 Code formatting only
2017-12-05 18:07:53 +01:00
Frank Mittag
812fef2f22
Removed not needed RegattaLogRegisterAndBoatEvent after discussion with Axel.
...
All registration on regatta level will be of type RegattaLogRegisterCompetitorEvent where the passed competitor is either of type Competitor or CompetitorWithBoat depending on the regatta type
2017-12-04 14:38:59 +01:00
Frank Mittag
d45de24610
Merge remote-tracking branch 'origin/master' into bug2822_boatcolors_merged_with_eol_changes
...
# Conflicts:
# java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/CompetitorDTO.java
# java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/DomainObjectFactory.java
# java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
# java/com.sap.sailing.domain.test/resources/IncrementalLeaderboardDTO.ser
# java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/tracking/impl/BravoFixTrackSerializationTest.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/RegattaImpl.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/liveraceloop/racemapwithleaderboard/LiveRaceWithRacemapAndLeaderBoardPlace.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/utils/AutoplayHelper.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/LeaderboardSettingsFactory.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/MultiRaceLeaderboardSettingsDialogComponent.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/SingleRaceLeaderboardSettingsDialogComponent.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorRegistrationsPanel.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaLogImportSensorDataAndAddMappingsDialog.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/MultiRaceLeaderboardPanel.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/SingleRaceLeaderboardPanel.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/EmbeddedMapAndWindChartEntryPoint.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
# java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndLoadingEventsAndRegattas.java
# java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/CompetitorReplicationTest.java
# java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/RegattaReplicationTest.java
# java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
# java/com.sap.sailing.server/src/com/sap/sailing/server/impl/PersistentCompetitorStore.java
# java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2017-11-22 15:39:00 +01:00
Kai Boernert
579c122b2a
improved test asserts to be more concrete
2017-11-22 10:50:01 +01:00
Kai Boernert
1429ebe671
fixed warning
2017-11-22 10:48:04 +01:00
Kai Boernert
0a5c2a47f8
fixed testcase
2017-11-22 10:43:14 +01:00
Kai Boernert
e967416162
formating only change
2017-11-21 13:47:50 +01:00
Kai Boernert
8e8c83bf45
added RaceColumnReloadTest
2017-11-21 13:42:38 +01:00
Frank Mittag
7517a9a26c
fixed a couple of tests after removal of BoatStore.getOrCreateBoat(competitor)
2017-11-16 11:05:07 +01:00
Axel Uhl
021ac5e80e
Merge branch 'master' into bug4356
2017-11-13 11:33:54 +01:00
Axel Uhl
612e9b76d5
when adding a device mapping for EXPEDITION_SENSOR, use the correct log event type
...
Change-Id: I6358ff0120224082532ad25d40265b49e2c02142
2017-11-08 14:20:38 +01:00
Axel Uhl
6924ea32b8
bug 4356: included MergeState enum and field in CompetitorResult
...
Change-Id: I974bb5904c7e71efc142ac19e84b03a91b7ad045
2017-10-27 10:42:32 +02:00
Axel Uhl
c53c67f797
made DoubleVectorFix null-aware
...
Change-Id: I59cc0f5b44c78609e2fdf65dcdb6998c2050862b
2017-10-26 18:32:28 +02:00
Steffen Schaefer
988fec83d1
Merge branch 'bug4267'
2017-09-25 11:11:09 +02:00
Kai Börnert
Maximilian Groß
Axel Uhl
Steffen Schaefer
Frank Mittag
Peter Siegmund
Benjamin Barth