Commit Graph
450 Commits
Author SHA1 Message Date
Axel Uhl ade850c42b removed SynchronizationUtil which is no longer needed after TracTrac made the getRaces() call thread safe 2014-05-21 00:35:19 +02:00
Axel Uhl c00c68597e ftes-rltracking merge had to adjust RacesHandle-->RaceHandle and added a missing gpsFixStore parameter to a constructor 2014-05-13 21:04:00 +02:00
Axel Uhl 5c2fc3b888 Merge branch 'master' into tracapi
Conflicts:
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/FlorianopolisMarkPassingTest.java
	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.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceTrackingConnectivityParametersImpl.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracRaceTrackerImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
	java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/SailingServiceImplMock.java
	java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindTracksTest.java
	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/AbstractServerReplicationTest.java
2014-05-13 20:21:33 +02:00
Fredrik Teschke fb0f187d55 Merge branch 'gpsfixstore-independent-of-race' into ftes-gpximport
Conflicts:
	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/SailingDomain.gwt.xml
	java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingRaceTrackerImpl.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/tracking/TrackedRace.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.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.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.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2014-05-01 23:05:08 +02:00
Axel Uhl 626bf0b672 as part of bug 1903, renamed RacesHandle to RaceHandle 2014-04-29 15:51:08 +02:00
Axel Uhl ebb7ed03b9 Merge branch 'master' into tracapi
Conflicts:
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceHandleImpl.java

The conflict was caused by the fix that avoids null values being part of the collection returned by RaceHandleImpl.getRaces(...).
This has a relationship with bug 1903 (Change RacesHandle to RaceHandle).
2014-04-29 15:48:52 +02:00
Axel Uhl a716539ca4 working towards a solution for bug 1910; use asynchronous connectivity for SailMasterConnectorImpl so the timeout can work 2014-04-29 13:38:42 +02:00
Axel Uhl 52e0bb12b4 factored construction of default regatta parameters for an IRace; used this to remove any existing tracked race from the correct default regatta 2014-04-11 00:54:46 +02:00
Axel Uhl 3dc0608f4b update race status properly (again) in TracTracRaceTrackerImpl.stop(boolean) 2014-04-10 00:33:08 +02:00
Axel Uhl 9e9e962ccc fixed mark position receiver so that it only looks for the one and only race it belongs to and not all races in the event 2014-04-09 14:06:06 +02:00
Axel Uhl 330778bd32 use race ID instead of event ID to create the default regatta;
Event objects with the TracAPI now really contain multiple events, therefore having multiple different boat
classes. The regatta must have a single boat class.
2014-04-08 17:05:40 +02:00
Axel Uhl 15ca302d5b use isMultiple() to detect gates 2014-04-07 13:51:08 +02:00
Fredrik Teschke 821f1307bf Merge remote-tracking branch 'origin/master' into gpsfixstore-independent-of-race
Conflicts:
	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/AbstractTimePoint.java
	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/DomainObjectFactoryImpl.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/racelog/RaceLog.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/impl/NoAddingRaceLogWrapper.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/impl/RaceLogImpl.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/tracking/impl/TrackImpl.java
	java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/EndToEndListeningStoreAndFowardTest.java
	java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SwissTimingFactory.java
	java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingFactoryImpl.java
	java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingRaceTrackerImpl.java
	java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingTrackingConnectivityParameters.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/AbstractMockedRaceMarkPassingTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/FlorianopolisMarkPassingTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/OBMRMarkPassingTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
	java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java
	java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/SailingServiceImplMock.java
	java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
	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/LeaderboardConfigPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RaceCourseManagementPanel.java
	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.server.replication.test/src/com/sap/sailing/server/replication/test/AbstractServerReplicationTest.java
	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
	java/com.sap.sailing.server/META-INF/MANIFEST.MF
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, Monitoring).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, No Tests).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch
	java/com.sap.sailing.server/SailingServer (Proxy).launch
	java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889).launch
	java/com.sap.sailing.server/SailingServer (Proxy, Remote Debug SAP VM).launch
	java/com.sap.sailing.server/SailingServer (Proxy, SwissTiming Live Simulation).launch
	java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/Activator.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2014-03-28 18:34:58 +01:00
Axel Uhl ca627665ba fixed mark/gate creation by fixing how the number of marks of a control point is determined 2014-03-28 18:33:30 +01:00
Axel Uhl f1619edc54 load races on a per-race basis and not by looking at the event and then inferring the races;
IEvent in the new TracAPI now holds all IRace objects actually belonging to that event that have so
far been loaded through the TracAPI. Therefore it is no longer safe to simply look at all the races
of the IEvent when trying to load a single race.
2014-03-28 17:57:53 +01:00
Axel Uhl 82b7878500 fixed IEvent.getRaces() synchronization in a few remaining spots 2014-03-28 16:42:20 +01:00
Axel Uhl da4cacbe98 introduced a TracTrac-specific SynchronizationUtil that helps to avoid ConcurrentModificationExceptions with the new TracAPI 2014-03-28 16:37:30 +01:00
Axel Uhl f2acebb54c minor refactoring of ClientParamsPHP.isInitialized; use single point of exit pattern in two methods 2014-03-22 11:23:09 +01:00
Simon Pamies 4225bee05a Added fix for tracking start and end times coming from TracTrac 2014-03-22 12:20:31 +04:00
Axel Uhl b5a4b1cef3 eliminated compile errors from mongodb.test 2014-02-26 13:49:32 +01:00
Axel Uhl f38a348b16 Merge branch 'master' into tracapi
Conflicts:
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/AbstractTracTracLiveTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseUpdateTest.java
2014-02-26 13:34:34 +01:00
Simon Pamies b3e2d28753 Merged ess-singapore containing the temporary fix for the igtimi windbot gps miscalculation, the update of MAX_HOPS for tractrac stored data, the fix for the race committee app and max_speed for xml export 2014-02-24 10:19:13 +08:00
Axel Uhl 38ad72c3f4 use new getLiveDelay() method 2014-02-20 23:59:52 +01:00
Axel Uhl b6e19b6536 Merge branch 'master' into tracapi
Conflicts:
	java/pom.xml
2014-02-20 10:32:47 +01:00
Simon Pamies 3b7733a701 Added start time reset handler for TracTrac 2014-02-19 16:22:31 +08:00
Axel Uhl a92597e354 fixed live/stored URI for TracAPI also for race subscriber 2014-02-17 17:40:07 +01:00
Axel Uhl e3f53c3455 Merge remote-tracking branch 'server/master' into tracapi 2014-02-17 17:36:14 +01:00
Fredrik Teschke 78c848e594 added GPSFixStore concept to TrackedRace
- needs to be passed through RacingEventServiceImpl -> lots of changes in
  test cases
- changes in adapters, as GPSFixStore is also passed around in
  RaceAdapter etc.
2014-02-15 12:20:12 +01:00
Axel Uhl 0402cfe64c fetch delay once from the TracAPI model; this still lacks fetching delay updates as we did before by polling the clientparams.php file 2014-02-13 20:46:28 +01:00
Axel Uhl 97a1fc5d92 first working TracAPI-based tracking 2014-02-13 12:30:52 +01:00
Axel Uhl a930364367 all non-test projects compile 2014-02-12 16:11:56 +01:00
Axel Uhl 5891569380 continued with transition to TracAPI; all receivers have been migrated and compile by now; many more compile errors remain 2014-02-12 13:30:38 +01:00
Axel Uhl 3ab58caf51 continued on the journey to TracAPI; still many classes don't compile 2014-02-11 11:25:40 +01:00
Axel Uhl 41cd23d9b8 made old TracTrac tests compile, although the PHP parsing code will hopefully go away eventually 2014-02-11 09:34:40 +01:00
Axel Uhl bf429874ea started conversion from TTCM to TracAPI 2014-02-10 18:20:34 +01:00
Nick Klose 00fe58f6cd Merge remote-tracking branch 'origin/master' into mark-rounding-inference 2014-02-10 10:23:29 +01:00
Axel Uhl a216ef0795 made names of TracTracConnectionConstants consistent with their string representations 2014-02-08 23:34:32 +01:00
Axel Uhl 8a731d0187 Merge branch 'master' into mark-rounding-inference 2014-02-08 17:01:25 +01:00
Axel Uhl 9ab00518eb factored duplicate File creation 2014-02-08 16:58:50 +01:00
Hudson Continuous Build server bec8df2648 Merge branch 'plotting-test' into mark-rounding-inference 2014-02-08 01:06:44 +00:00
Axel Uhl e7a6bb3229 null-check for new raceStatus flag 2014-02-07 18:10:48 +01:00
Axel Uhl 64a0cc981c avoid redundant specification of TracTrac mtb cache dir property name 2014-02-07 18:09:12 +01:00
Axel Uhl f880542f19 Merge remote-tracking branch 'server/master' 2014-02-07 16:43:10 +01:00
Axel Uhl 88b7b90971 added comment on why it's now 8 tolerated process decreases in the TracTrac connector; update Proxy/8889 launch config 2014-02-07 16:42:27 +01:00
Nick Klose 9627017ecf Merge remote-tracking branch 'origin/master' into mark-rounding-inference 2014-02-07 11:18:18 +01:00
Simon Pamies 7360e41155 Revamped TracTracRaceTrackerImpl to make status of a race available to the tracker - this is useful to control caching 2014-02-06 18:55:21 +00:00
Nick Klose 25fd24b656 Merge remote-tracking branch 'origin/master' into mark-rounding-inference 2014-02-06 11:44:52 +01:00
Axel Uhl 796f407a11 increasing number for TTCM progress back-drops allowed before ERROR is signaled from 3 to 6 after conversation with Jorge 2014-02-05 15:23:18 +01:00
Nick Klose 6a89ca1d07 Fixed Activator and getCrossingBearing(). 2014-01-30 14:27:52 +01:00
Axel Uhl 31074ccf2d fixed bug regarding reading of passing instructions from course's metadata 2014-01-20 15:12:13 +01:00