Frank Mittag
819118c73c
fixed a broken test in RegattaReplicationTest
2017-11-13 13:13:17 +01:00
Frank Mittag
ecc51c05ba
Removed the idea of a RegattaLogEntryEvent
...
Refactored CompetitorProviderFromRaceColumnsAndRegattaLike to be a CompetitorAndBoatProviderFromRaceColumnsAndRegattaLike to cache also the boats of the competitors
2017-08-30 17:01:01 +02:00
Frank Mittag
68ae4f561c
Merge remote-tracking branch 'origin/master' into bug2822_boatcolors_merged_with_eol_changes
...
# Conflicts:
# java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/MongoObjectFactory.java
# java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java
# java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/CompetitorImpl.java
# java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/DomainFactoryImpl.java
# java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java
# java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRaceWithStartTimeAndRanks.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/AbstractRaceColumn.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/Leaderboard.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DummyMarkPassingWithTimePointOnly.java
# java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.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/server/SailingServiceImpl.java
# java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java
# java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java
# java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2017-08-28 16:12:00 +02:00
Frank Mittag
48162c73be
major refacoring and cleanup of RaceLog and RegattaLog events needed for the new way of registering boats and competitors as separate entities -> UI is still not ready for it.
2017-08-25 17:09:00 +02:00
Steffen Schaefer
2603294510
Bug 2059: Statistics calculation is now cached per TrackedRace
2017-07-11 16:56:36 +02:00
Frank Mittag
69ea00be97
fixed inconsistent name and parameter type of method TrackedRace.getBoatOfCompetitor(Serializable competitorId) to be
...
TrackedRace.getBoatOfCompetitor(Competitor competitor)
2017-06-22 13:41:41 +02:00
Steffen Schäfer
1542a36109
Merge branch 'master' into bug2822_boatcolors
2017-05-16 16:12:16 +02:00
Steffen Schäfer
67d310df4b
Merge branch 'master' into bug2822_boatcolors
...
# Conflicts:
# java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/SensorFixStoreAndLoadTest.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegOfCompetitorImpl.java
# java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/AdminConsolePage.java
# java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2017-05-16 15:59:24 +02:00
Steffen Schaefer
9123771f34
normalized line endings
2017-05-16 09:42:02 +02:00
Frank Mittag
fd8fee5d58
work commit in the middle of refactoring competitor.getBoat()
2017-04-28 09:08:14 +02:00
Axel Uhl
b11dca244e
bug3552: refactored Mark.color from String to Color
...
Change-Id: Iddcc26de68dd5c1ecd3fdcbb61e59810e879ae37
2017-04-11 11:20:46 +02:00
Frank Mittag
358b733fd6
Merge remote-tracking branch 'origin/master' into bug2822_boatcolors
...
# Conflicts:
# java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/DomainFactory.java
# java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java
# java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch
2017-03-30 18:05:51 +02:00
Axel Uhl
cfccd8c5d6
Merge remote-tracking branch 'origin/tracapi-3.6.0'
2017-03-08 21:35:31 +01:00
Frank Mittag
31e8164166
Merge remote-tracking branch 'origin/master' into bug2822_boatcolors
...
# Conflicts:
# java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/SensorFixStoreAndLoadTest.java
# java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/Competitor.java
# java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/TransientCompetitorStoreImpl.java
# java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/DomainFactory.java
# java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/DomainFactoryImpl.java
# java/com.sap.sailing.domain.swisstimingreplayadapter/src/com/sap/sailing/domain/swisstimingreplayadapter/impl/SwissTimingReplayToDomainAdapter.java
# java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/LeaderboardDTODiffingTest.java
# java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LineAnalysisTest.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/FlexibleLeaderboardImpl.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorEditDialog.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaWithSeriesAndFleetsDialog.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_zh_CN.properties
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
# java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceWithGPSFixStoreContentsReplicationTest.java
# java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/ApplyScoresFromRaceLogTest.java
2017-03-08 16:03:56 -03:00
Axel Uhl
a4b5bfe8d5
use timeout mechanism of TracAPI 3.6.0 for obtaining IRace from TracTrac
...
Change-Id: Ib3ceca870482ce524f647f7c985320c470086a95
2017-03-08 12:17:49 +01:00
Axel Uhl
735b9a8042
relaxed further test verdicts; fixed WindTrackImpl.remove regarding equals and compactify
...
Change-Id: Iba121c395fb35963df0c6f0a699f4d27f818b723
2017-03-07 20:42:03 +01:00
Axel Uhl
688d37d27c
bug 4037: automatically "upgrade" to replay format during restore if available;
...
still using a kludge for detecting replay format; TracAPI 3.3.2 will
offer a reliable API for that later today
Change-Id: Ied19e1e787f6f28d2a6e531b9ac1aedf5721ab5b
2017-01-25 08:47:17 +01:00
Steffen Schaefer
673907c017
Merge branch 'master' into bug2447
...
Conflicts:
java/com.sap.sailing.feature/feature.xml
java/pom.xml
2017-01-09 10:05:05 +01:00
fmittag
fbd07215d3
added some simple load/store and replication tests for new 'canBoatsOfCompetitorsChangePerRace' attribute of regatta
2017-01-03 13:05:35 +01:00
fmittag
45452ac185
added canBoatsOfCompetitorsChangePerRace attribute to regatta (+corresponding load/store methods and admin UI)
2016-12-30 17:05:03 +01:00
Axel Uhl
f9b4ac7b50
passing through trackWind and correctByDeclination params into connectivity params
...
Change-Id: I7adbb4f2c84e5352c9f3891b23198b74ca2fce4c
2016-12-30 12:02:06 +01:00
Axel Uhl
704e4e2a64
refactored RaceTracker such that getRace[Identifier]s() is now getRace[Identifier](), alluding to the always-singular aspect of RaceTracker/RaceHandle
...
Change-Id: I50d202122c3021dd2f852762688d762fb3806d99
2016-12-29 18:10:36 +01:00
Axel Uhl
19d112115b
first working version of tracked race restoring with -Drestore.tracked.races=true;
...
Change-Id: I2c3968d772c7382589ada66c60874015f46f8996
2016-12-29 17:18:42 +01:00
fmittag
474295d281
Merge remote-tracking branch 'origin/master' into bug2822_boatcolors
...
# Conflicts:
# java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/AbstractGPSFixStoreTest.java
# java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/TrackedRaceLoadsFixesTest.java
# java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/TransientCompetitorStoreImpl.java
# java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LineAnalysisTest.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
# java/com.sap.sailing.server/src/com/sap/sailing/server/impl/PersistentCompetitorStore.java
2016-12-29 14:03:06 +01:00
Axel Uhl
7126902cf2
adding set of replicables or their IDs to master and replica descriptors and passing through to ReplicationServlet
...
Change-Id: I51a70718d94b161e747f2a887028fdeeb996f21a
2016-12-22 14:32:47 +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
fmittag
23340a0337
Merge remote-tracking branch 'origin/master' into bug2822_boatcolors
...
# Conflicts:
# java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/TransientCompetitorStoreImpl.java
# java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/LeaderboardDTODiffingTest.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorEditDialog.java
# java/com.sap.sailing.server/src/com/sap/sailing/server/masterdata/DummyTrackedRace.java
2016-11-10 19:17:24 +01:00
Axel Uhl
be4691d616
more renames
...
Change-Id: I4f5e55eafc100871c186f1c1ce43892c9fae6cfd
2016-10-13 17:09:52 +02:00
fmittag
00f7abc7c4
Merge remote-tracking branch 'origin/master' into bug2822_boatcolors
...
# Conflicts:
# java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/TrackedRaceLoadsFixesTest.java
2016-10-04 16:48:30 +02:00
Alexander Tatarinovich
c72a9923df
bug 1564 : Rename variables and refactoring
...
Change-Id: Icdb792cf2a863fe4874841114a5f4cb05b25847d
2016-09-27 16:07:00 +03:00
Alexander Tatarinovich
3312208fbc
bug 1564
...
Change-Id: Ibfaaa8d92513413b1c8164dcd5cc34567837ab11
2016-09-26 17:16:48 +03:00
Axel Uhl
b98f57eeb0
fixed GPS fix replication tests by setting the start of tracking to 0ms after the Epoch; fixes harm done by 2684c3c870
...
Change-Id: I0b1581de7ad9cb40bc93a2ab86fa34ec2ed45b1d
2016-09-14 16:49:26 +02:00
Axel Uhl
419a64c270
introduced new field controlTrackingFromStartAndFinishTimesCheckBox in RegattaImpl; see bug 3588
...
Change-Id: I702e611d0c85ecb12831ca09a4d3a73e00ec7396
2016-09-12 16:56:31 +02:00
fmittag
ede3d5707e
fixed two more tests
2016-08-30 14:29:57 +02:00
fmittag
bad7421935
Added draft implementation of regatta.getAllBoats()
...
Added CompetitorWithBoat utility class
Adapted all tests
2016-08-18 17:29:15 +02:00
fmittag
c41346d21c
- Implemented the new RaceDefinition constructor which only works with a Map<Competitor,Boat> instead Iterable<Competitor>
...
- Adapted the creation of competitors and boats for all tracking providers
- Adapted all tests
2016-08-17 17:01:48 +02:00
fmittag
5d7e3180e2
First implementation of CompetitorAndBoatStore (name is still CompetitorStore to minimize merge conflicts)
...
including persistence for boats and the new 'id' field of each boat.
Will add more tests now.
2016-08-12 16:27:01 +02:00
fmittag
74f43331a2
implemented 'shortName' attribute for Competitor to prepare to remove the misuse of the sailId for team names
2016-08-10 12:41:52 +02:00
Axel Uhl
92ff7cccda
Merge branch 'master' into bug3798
...
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
java/com.sap.sailing.www/release_notes_admin.html
Change-Id: I62653e839d19957e48a292497c8d13b29a90c0fe
2016-07-21 13:10:14 +02:00
Axel Uhl
4a62df1fd0
fixed several compilation issues after pulling through th maximumNumberOfDiscards field
...
Change-Id: I1b4afc391de68c148da6bf735917016719211dea
2016-07-21 12:56:41 +02:00
Axel Uhl
221cee122d
added maximumNumberOfDiscards throughout the Series maintenance, persistence, UI and replication chain
...
Change-Id: Id91a6e82f6445bb2de826d2fcf1ed7b5bf4ba853
2016-07-21 12:25:47 +02:00
Axel Uhl
d6419c51cb
wired user notifications to a new LeaderboardScoreCorrectionNotifier in RacingEventService; wired notifications with TrackedRaceReplicatorAndNotifier
...
Change-Id: I4ff77cf49700140b134dc95326a3f7a844958d95
2016-07-15 18:38:24 +02:00
Steffen Schaefer
eb66480c9f
Merge branch 'master' into foiling
...
Conflicts:
java/com.sap.sailing.server.test/src/com/sap/sailing/server/impl/MediaMasterDataExportTest.java
java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
2016-06-17 14:32:19 +02:00
Axel Uhl
1cb57307e3
add the local classloader to the master RacingEventService's master data class loaders to ensure lambdas can be de-serialized
...
Change-Id: If1fc062641307dfc6efa450aa865517b15e5234b
2016-06-15 07:48:38 +02:00
Axel Uhl
4bb9282ac5
added wait time; test for media track replication is now green
...
Change-Id: I85150784f11311faac626eca7ca3ae71021e1bb8
2016-06-13 10:43:13 +02:00
Axel Uhl
0cd82fb9f3
a failing test case for replicating the effects of a master data import with media tracks; some test refactoring and a new testsupport bundle
...
Change-Id: Ib63d4511e75e6a37f61e5feb6d9c05429e6bba4e
2016-06-10 16:31:05 +02:00
Papick Garcia Taboada
9416f5deed
Removed unneeded GPSFixStore usage
2016-06-09 18:35:16 +02:00
Steffen Schaefer
4597ee9882
Merge branch 'master' into foiling
...
Conflicts:
java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/RaceLogRaceTracker.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.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/shared/charts/AbstractCompetitorRaceChart.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/MultiCompetitorRaceChart.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/MultiCompetitorRaceChartSettings.java
java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
2016-06-09 08:52:37 +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
Benjamin Barth
29e625bece
Removed gpsFixStore field and constructor param from CreateTrackedRace
2016-05-23 17:32:04 +02:00