Commit Graph
121 Commits
Author SHA1 Message Date
Nicolas 13442394a8 Merge remote-tracking branch 'origin/master' into mark-rounding-inference
Conflicts:
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/AbstractTracTracLiveTest.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java
2014-08-19 10:16:49 +02:00
Axel Uhl 2dd99d09ac added LeaderboardGroup.displayName to JSON serialization process 2014-08-05 00:03:00 +02:00
Nicolas e8cdb7d630 Merge remote-tracking branch 'origin/master' into mark-rounding-inference
Conflicts:
	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.persistence/src/com/sap/sailing/domain/persistence/impl/MongoRaceLogStoreVisitor.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/RaceLogEventFactory.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/RaceLogEventRestoreFactory.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/RaceLogEventVisitor.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/impl/BaseRaceLogEventVisitor.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/impl/RaceLogChangedVisitor.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/impl/RaceLogEventFactoryImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/RaceColumnRaceLogReplicator.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java
	java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogEventSerializerTest.java
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/racelog/impl/RaceLogEventDeserializer.java
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogEventSerializer.java
2014-08-02 11:05:42 +02:00
Simon Pamies ade5b5a35f Added new high point scoring scheme that checks if additional scoring information is available and iff gives a score of 8 for the winner 2014-07-20 23:20:30 +02:00
Nicolas 1f91d41ea7 Merge branch 'master' into mark-rounding-inference
Conflicts:
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/FieldNames.java
	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/markpassing/AbstractMarkPassingTest.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/KW470MarkPassingTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/OBMR2012VRMarkPassingTest.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracRaceTrackerImpl.java
2014-06-17 13:51:39 +02:00
Axel Uhl dff2a9b792 added test case for handling of null values in JSON event serialization that failed before the previous fix 2014-06-14 22:33:37 +02:00
Axel Uhl 89d8d4c7ba JSON serialization/deserialization of EventBase description/logoImagURL/sponsorImageURLs/officialWebsiteURL 2014-06-14 11:16:19 +02:00
Axel Uhl 42202bc996 added persistence support for the four new EventBase attributes logoImageURL, sponsorImageURLs, officialWebsiteURL and description 2014-06-14 11:03:28 +02:00
Nicolas 7204d8081c Merge remote-tracking branch 'origin/master' into mark-rounding-inference 2014-06-08 16:55:10 +02:00
Nicolas 2cc1912b4e Implemented serialization for SuppressedMarkPassingsEvent too. 2014-06-08 16:16:31 +02:00
Nicolas 207b685c0e Enabled (de)serialization of FixedMarkPassingEvents. 2014-06-07 17:47:10 +02:00
Axel Uhl 53a0b36e8e consolidated all Util stuff in com.sap.sse.common.Util now 2014-06-03 00:01:14 +02:00
Axel Uhl cb9354b1a0 moved Util from com.sap.sailing.common to com.sap.sse.common 2014-06-02 23:57:16 +02:00
Axel Uhl 0c47e86304 moved Pair and Triple from com.sap.sailing.common.Util to com.sap.sse.common.Util and introduced all missing dependencies on com.sap.sse.common 2014-06-02 23:31:26 +02:00
Axel Uhl c4cea6660d introduced com.sap.sse.common.Util as superclass of com.sap.sailing.common.Util and added com.sap.sse.common to the required bundles of all users of com.sap.sailing.common.Util 2014-06-02 23:17:49 +02:00
Axel Uhl 590032d7f3 fixed test fixture for event serialization by adding leaderboard groups collection 2014-06-02 20:11:51 +02:00
Axel Uhl 0fee219a73 avoid warnings 2014-06-02 15:36:08 +02:00
Axel Uhl 6ecc711ea6 stripped leaderboard group (ID, name, description) is now JSON-serialized with Event 2014-06-02 15:32:24 +02:00
Axel Uhl 8d5ac1aef7 fixed event JSON serialization tests; mocks needed to mock image/video URLs as well 2014-05-31 10:51:36 +02:00
Fredrik Teschke ec15b110c8 include race id in denoteForTrackingEvent -> allows choosing custom stable ID 2014-04-24 07:18:37 +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
Fredrik Teschke a716775c44 added closing event for open ended device mappings 2014-03-16 20:46:16 +01:00
Lennart Hensler 0e272885ac Merge remote-tracking branch 'origin/master' into dataMining 2014-03-09 15:58:34 +01:00
Axel Uhl a77832e8b1 adjusted event (de)serialization tests so that serializer / deserializer are tested in conjunction;
Testing only the serializer doesn't catch deserialization errors for specific attribute states after
serializing them.
2014-03-07 18:10:07 +01:00
Fredrik Teschke a6581093d8 added DefineMarkEvent 2014-03-07 10:54:21 +01:00
Lennart Hensler 66d008630f Merge remote-tracking branch 'origin/master' into dataMining 2014-03-01 17:50:51 +01:00
fmittag b5bff27a10 Added startDate and endDate as new properties of the 'Event' domain class (including edit UI) 2014-02-24 16:04:33 +01:00
Lennart Hensler e398889d88 Cleaned the sse bundle extraction 2014-02-21 10:59:28 +01:00
Fredrik Teschke f96cb785ad added RegisterCompetitorEvent for race log 2014-02-15 22:15:51 +01:00
Fredrik Teschke cca68ccf67 renamed CreateRaceEvent to more fitting StartTrackingEvent 2014-02-15 18:52:45 +01:00
Fredrik Teschke 971a0405a2 added RaceLog events for RaceLog-based tracking 2014-02-10 09:08:01 +01:00
Nick Klose 85b411d047 Fixed more tests. 2014-01-29 17:41:40 +01:00
Nick Klose 96075f5cc1 Merge branch 'master' into mark-rounding-inference
Conflicts:
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/FieldNames.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/SharedDomainFactory.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/AbstractTracTracLiveTest.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/DomainFactory.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/DomainFactoryImpl.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
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/impl/DomainFactoryImpl.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/coursedesign/CourseElementListAdapter.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/adapters/coursedesign/DraggableCourseElementListAdapter.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/dialogs/coursedesign/ESSCourseDesignDialog.java
2013-12-09 13:22:09 +01:00
Lukas Niemeier 69ff32e1d8 # extended GateLineOpeningTime to store Golf-Down time
# added configuration to enable setting the Golf-Down time
# implemented Start prerequisites for all RacingProcedures
2013-12-02 18:33:08 +01:00
Lukas Niemeier 34b852f0c4 # changed RaceLogEvent#getTimePoint to return createdAt (was logical timestamp before) 2013-11-18 22:05:18 +01:00
Lukas Niemeier ea384e4c12 # added CompetitorResults to replace generic list on competitor positions and results
# working towards replacing old RaceState with new RaceState
2013-11-13 14:37:50 +01:00
Lukas Niemeier 8db5b51102 Merge branch 'racecommittee_app' into racecommittee_app_startphases 2013-11-12 16:22:57 +01:00
Nick Klose 9f3855e621 Merge branch 'master' into mark-rounding-inference
Conflicts:
	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/src/com/sap/sailing/domain/base/impl/DomainFactoryImpl.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
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/impl/DomainFactoryImpl.java
2013-11-11 13:59:39 +01:00
Lukas Niemeier dac0fd3494 # added SharedDomainFactoryImpl implementing SharedDomainFactory
# DomainFactoryImpl extends SharedDomainFactoryImpl (code reuse)
# Split SharedDomainFactory and CompetitorStore interfaces (no more forwarding)
2013-11-11 03:40:09 +01:00
Lukas Niemeier ea69b28ad2 Merge branch 'master' into racecommittee_app
Conflicts:
	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/CollectionNames.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/base/SharedDomainFactory.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/DomainFactoryImpl.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.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogCourseDesignChangedEventSerializerTest.java
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/RaceGroupJsonExportServlet.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/impl/DomainFactoryImpl.java
2013-11-11 03:00:31 +01:00
Lukas Niemeier c0cbb17785 # renamed StartProcedureType to RacingProcedureType
# tested new Comparator including author
2013-11-11 00:58:31 +01:00
Axel Uhl 86b8149c37 added failing test case for bug 1599 2013-11-07 12:41:21 +01:00
Nick Klose dedc137e7d Started merge of PassingInstructions and RoundingDirections 2013-11-05 10:00:52 +01:00
Nick Klose 8540a7081b Finished ControlPointWithTwoMarks 2013-11-04 14:40:59 +01:00
Lukas Niemeier 422d24eaa5 Merge branch 'otracelog' into racecommittee_app
Conflicts:
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoRaceLogStoreImpl.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/RaceLog.java
	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppConstants.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppPreferences.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OfflineDataManager.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OnlineDataManager.java
2013-11-04 01:48:14 +01:00
Axel Uhl 5068f0268a RacingEventServiceImpl now uses PersistentCompetitorStore and loads/stores competitors to DB 2013-10-31 13:21:01 +01:00
Axel Uhl 576cc1e5d5 fixed serialization test after changing from NauticalSide to PassingInstructions 2013-10-30 17:12:47 +01:00
Axel Uhl 4c64c8588d more compiles, but still not all 2013-10-29 18:03:37 +01:00
Axel Uhl 596b7476f3 DOESN'T COMPILE: started major refactoring NauticalSide-->PassingInstructions for Waypoint; please complete 2013-10-29 17:58:15 +01:00
Axel Uhl 3da17302f8 removed DomainFactory.INSTANCE use except from test cases; renamed MongoFactory to PersistenceFactory 2013-10-28 17:26:26 +01:00