Commit Graph
356 Commits
Author SHA1 Message Date
Frederik Petersen 967e3de29e MetaColumn factors are now imported with MasterDataImport
see bug #1605

also added an assert to the according OverallLeaderboard test case
2013-11-15 16:13:55 +01:00
Lukas Niemeier a9691de5e9 # use SharedDomainFactory instead of unreferencable DomainFactory 2013-11-14 15:58:28 +01:00
Lukas Niemeier 99a7f2c1ee # fixed evil cast in GateLineOpeneingTimeDeserializer 2013-11-13 22:40:31 +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 4681186e43 # BaseRaceLogEventDeserializer always deserializes an author, falls back to level 4 priority one when no one is given 2013-11-12 22:08:02 +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 c553802954 Merge branch 'master' into persistentCompetitors
Conflicts:
	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/AbstractPosition.java
2013-11-07 12:58:35 +01:00
Axel Uhl 86b8149c37 added failing test case for bug 1599 2013-11-07 12:41:21 +01:00
Axel Uhl 8f178fed90 whitespace change only 2013-11-05 17:17:45 +01:00
Nick Klose bc96fdf15a Fixed PassingInstructions going into Database 2013-11-05 17:06:42 +01:00
Nick Klose dedc137e7d Started merge of PassingInstructions and RoundingDirections 2013-11-05 10:00:52 +01:00
Frederik Petersen 6c3a9dd50f Added wind track serialization for master data import 2013-11-04 15:47:57 +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 fe8bd57a19 allow a competitor to be modified through the UpdateCompetitor operation 2013-10-31 18:10:56 +01:00
Axel Uhl 5068f0268a RacingEventServiceImpl now uses PersistentCompetitorStore and loads/stores competitors to DB 2013-10-31 13:21:01 +01:00
Lukas Niemeier bb58d78236 Merge branch 'master' into racecommittee_app
Conflicts:
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.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/server/SailingServiceImpl.java
	java/com.sap.sailing.server.gateway/WEB-INF/web.xml
	java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java
2013-10-30 14:38:14 +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
Lukas Niemeier 313085c456 # added server code to create, edit and delete device configurations 2013-10-23 16:02:09 +02:00
Fredrik Teschke f7a3f5c8df added competitor persistence; a first attempt to cherry-pick and merge this feature from the cmd-android-tracking branch
Conflicts:

	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.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/BoatJsonDeserializer.java
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/CompetitorDeserializer.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/impl/BoatJsonSerializer.java
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/tracking/impl/CreateCompetitorPostServlet.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java
2013-10-23 10:01:12 +02:00
Lukas Niemeier 8a34842d14 # renamed TabletConfiguration to DeviceConfiguration 2013-10-16 16:04:17 +02:00
Lukas Niemeier 945b81d248 typo 2013-10-11 18:33:37 +02:00
Lukas Niemeier 7b1b1fd5df # configuration of min/max rounds allowed on course
# configuration of results mail recipient
2013-10-11 18:31:08 +02:00
Lukas Niemeier ccd6fa0159 # Added TabletConfiguration to hold configuration 2013-10-08 17:59:19 +02:00
Axel Uhl e504187f7e fixing bug 1537 by also avoiding duplicate replication of course area additions 2013-10-02 18:05:06 +02:00
Axel Uhl 6283cd916d Merge branch 'master' into bug655 2013-09-25 20:24:03 +02:00
Axel Uhl eed2af9d90 added a failing test case for the NPE during the deserialization of competitor-specific race log events;
The problem is that the competitor ID may not be resolvable in the receiving DomainFactory's competitor cache.
The root cause is that the receiver tries to resolve the race log event in the first place instead of simply
storing the race log event in the RaceLog. The solution will be not to trigger events when storing the race log
events into the RaceLog during master data import.
2013-09-25 20:03:48 +02:00
Axel Uhl cce1c54d5e factored a TimePoint parameter into ScoreCorrection.getMaxPointsReason(...) as well 2013-09-23 17:28:46 +02:00
Axel Uhl 822aff3194 started work on bug 655 by adding TimePoint argument to isScoreCorrected API 2013-09-23 16:11:44 +02:00
Axel Uhl abdae7e871 tricky Merge branch 'master' into otracelog; some of the otracelog changes had selectively been applied to master; need to check branch validity first
Conflicts:
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.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
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/clients/LoadClient.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/parsers/ManagedRacesDataParser.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/services/sending/EventSenderTask.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/LoginActivity.java
2013-09-17 17:57:38 +02:00
fmittag 2fc41f002e refactoring of Webservice API to use JAX-RS as implementation technique
Added versioning for the webservices
2013-08-30 15:50:46 +02:00
Armin Zamani 2df5fc46b9 one missing move of milliseconds timepoint in a race log test, fixed wrong merge conflict resolution 2013-08-20 09:29:00 +02:00
Armin Zamani a139150617 Merge branch 'master' into racecommittee_app 2013-08-18 18:45:03 +02:00
Axel Uhl f1fa1d74f6 moved a few more distance and speed types to domain.common and fixed a grave bug in MeterPerSecondSpeed; added test for improved outlier filtering 2013-08-14 18:00:45 +02:00
Armin Zamani 9e452bd70c Merge branch 'master' into racecommittee_app
Conflicts:
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/WindJsonDeserializer.java
2013-08-13 21:01:20 +02:00
Axel Uhl d7ca5c2413 made tracker stopping after finishing loading a replay race null-safe 2013-08-13 14:50:47 +02:00
Axel Uhl 72c5113ca0 added regattaName to leaderboard group serialization so that all parameters are provided for other race-specific services 2013-08-13 14:49:44 +02:00
Frederik Petersen 98769fe4e5 Fixed small naming error in serializer and added test for overall
leaderboard import
2013-08-13 10:31:08 +02:00
Armin Zamani 41e849bf1e Merge branch 'master' into racecommittee_app 2013-08-12 21:35:42 +02:00
Axel Uhl f9fa0e35a8 fixed NPEs for non-overall leaderboard deserialization 2013-08-12 18:08:18 +02:00
Axel Uhl 8aa47bac1a support master data serialization for overall leaderboards 2013-08-12 17:40:08 +02:00
Simon Pamies d9dd484bd8 Finally fixing the problem with wrong wind inputs by handling Wind.getBearing() as it is meant (direction to where something goes) and reversing() whenever needed in the application (to make sure the UI consistently displays from value) 2013-08-09 19:13:45 +02:00
Armin Zamani 66296ea1e8 Merge branch 'master' into racecommittee_app 2013-08-08 23:30:35 +02:00
Axel Uhl d96988159e reverting commit ecd8cb2d55 which broke test RaceLogWindFixEventSerializerTest 2013-08-07 16:44:05 +02:00