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
Axel Uhl
bbe1d26c66
whitespace/line ending changes only
...
Change-Id: I3fa9f3747202cec363e4676a06a48c12d473e486
2017-05-09 15:20:21 +02:00
Axel Uhl
fed1c3c469
adjusted test case such that the new restrictions for regatta creation are obeyed
2017-05-03 10:07:50 +02:00
Frank Mittag
fd8fee5d58
work commit in the middle of refactoring competitor.getBoat()
2017-04-28 09:08:14 +02:00
Axel Uhl
9ccd61ef67
fixed test cases
...
Change-Id: I60ef73c89e63ac0b05d70f148cc9ff837f3f2a4d
2017-04-11 16:13:11 +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
637786c106
fixed some compile errors after last master merge
2017-03-08 16:27:39 -03: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
80d6b83d95
adjusted WindTracks test to relaxed accuracy
...
Change-Id: I7cab91c4c83091f1049cc3b31cf60417d637d0a0
2017-03-07 20:25:28 +01:00
Axel Uhl
547e2e2372
after TracTrac changed what they return as stored URI, adjusted test case accordingly
...
Change-Id: Ib653da911857e88eba0366b5eaceb854d2b0f0e9
2017-03-06 16:48:25 +01:00
Axel Uhl
587a529a8f
fixed connectivity params loading tests by introducing a waitable future
...
Change-Id: If099c72964f9785df73ac80022eb514d177644a7
2017-03-04 12:39:37 +01:00
Axel Uhl
a615173f26
pass through the timeout parameter to the trackers; TracTrac receivers now use it; -1 means wait and is used for restore
...
Change-Id: Iee676ffceb44eb9459c51ba38cddbaf5ba40c9fb
2017-01-27 15:07:56 +01:00
Axel Uhl
844bd18681
fixed test case: TracTrac connectivity params now require a valid paramURL
...
Change-Id: Ie14112cdd0f7edf129985ddcab96bd5a45bcdd6d
2017-01-26 16:01:30 +01:00
Axel Uhl
9a8df602b4
fix for bug4040: computing update for storedURI/liveURI already in TracTrac connectivity params, keeping tracker ID and params ID equal
...
Change-Id: I8f86770286332a5198ab2ba57b83a52c67759008
2017-01-26 11:55:46 +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
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
2de65963c4
added tests for removing the connectivity params from the DB again
...
Change-Id: I0d0c8d34f1ac3e1e95951b356d3ae8877be4f78e
2016-12-29 13:22:11 +01:00
Axel Uhl
ce52b0cf05
added a test case for SwissTimingReplay connectivity params persistence
...
Change-Id: I5b32606540bb6c008cedfe8ee8c3423459f45680
2016-12-29 13:10:19 +01:00
Axel Uhl
f81fe95c6f
made connectivity params getters public so that handlers can access them from other bundles
...
Change-Id: I03906cfc4eb4b0c7eba3d7336f7f49a997d11a62
2016-12-29 11:10:55 +01:00
Axel Uhl
92c8da31c3
implemented successful test for Race Log tracking connectivity persistence
...
Change-Id: Id7ad561769fa1756865329b7bf66a65d30778fb1
2016-12-28 15:15:14 +01:00
Axel Uhl
9b85c73d93
registering race log tracking connectivity params persistence handler in RaceLog tracking bundle's activator
...
Change-Id: I2d7c188f57946eab0265807d4806049324aea930
2016-12-28 14:39:34 +01:00
Axel Uhl
eff61001a5
added OSGi registration of SwissTiming connectivity params handler to SwissTiming persistence bundle's activator
...
Change-Id: I1eb896cda5c42a319304d378a1054a3f4d17fe34
2016-12-28 14:17:46 +01:00
Axel Uhl
0887e2d1aa
introduced connectivity parameter persistence for SwissTiming live race tracking
...
Change-Id: If3a9911c1706739965784630eefc7fc6d6e8f440
2016-12-28 14:11:58 +01:00
Axel Uhl
87de492a1b
added more test verdicts for TracTrac connectivity parameter persistence
...
Change-Id: Ib4c12ee50c7f43a124a18f116b99bd472f7643e3
2016-12-28 12:01:50 +01:00
Axel Uhl
c949c21450
first attempt to load and store a TracTrac connectivity params object with service finder approach
...
Change-Id: I8a42e772a31ab074b561154ec42fa1ac28e79bb9
2016-12-28 11:49:22 +01:00
Axel Uhl
48ffb76e11
interims commit with a first test frame for connectivity params storage
...
Change-Id: I8263efba8cececfc2f5ec696eaaa66eb1dbf4dc4
2016-12-27 18:36:11 +01:00
Steffen Schaefer
790d809a29
Merge branch 'master' into bug2447
2016-12-01 10:13: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
Peter Siegmund
8fb8d3bf12
change protest time from start and duration to TimeRange (start/end)
2016-11-16 14:08:34 +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
Peter Siegmund
3535f4fb40
add duration to RaceLogProtestStartTimeEvent
2016-11-07 17:11:04 +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
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
97c25d6bcd
added baseURL property to EventBase
...
Change-Id: I0fbd92b14331918986d817fc86a06912ae8f603d
2016-07-15 13:56:07 +02:00