Commit Graph
410 Commits
Author SHA1 Message Date
Nick Klose b8e2351bbd Merge branch 'master' into mark-rounding-inference
Conflicts:
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracRaceTrackerImpl.java
	java/com.sap.sailing.gwt.ui/SailingGWT.launch
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
2013-11-06 16:10:41 +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 2be40c66f8 Merge branch 'master' into persistentCompetitors
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
2013-10-31 18:19:45 +01:00
Simon Pamies 5cc5e52030 Making sure that mongodb host name is always read from configuration 2013-10-31 13:03:59 +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
Lukas Niemeier a9bce35b6f Merge branch 'racecommittee_app' of ssh://sapsailing.com/home/trac/git into racecommittee_app 2013-10-29 22:48:18 +01:00
Lukas Niemeier acdc62d244 # added tests for device configuration (persistence) 2013-10-29 22:45:35 +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 fae59cac79 Introduced CompetitorStore with a transient implementation being used for now in DomainFactoryImpl;
RacingEventServiceImpl already has a PersistentCompetitorStore that will then have to be injected into the
DomainFactoryImpl used by RacingEventServiceImpl
2013-10-29 11:45:31 +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
Jens Rommel abd3f0dd44 Expanded read-only TrackedRace return type of get*Race() methods to mutable DynamicTrackedRace where appropriate.
According to Axel, the originally intended separation of read-onyl and mutable API via this approach turned out not to be as successful as expected.
2013-10-15 12:27:28 +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 60e86f9702 refactored creation of ScoreCorrectionImpl and subclass instances so that it happens in leaderboard constructors;
Prepares for the linking of the score correction object back to its leaderboard in the score correction's constructor.
This will allow for the detection of race column ordering and hence the default application of score corrections
depending on time point if there are tracked races before or after that time point for a given competitor.
2013-09-24 08:48:58 +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 5bcf0f6193 renamed "obsolete" to "deprecated" for deprecated RaceLogIdentifier format 2013-09-20 09:42:56 +02:00
Axel Uhl 4aa504741f made compile again 2013-09-17 21:30:22 +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
Lukas Niemeier daae947da0 # fixed usage of obsolete identifier code in other test 2013-09-17 01:15:28 +02:00
Lukas Niemeier 492947d2f1 Merge branch 'master' into racecommittee_app 2013-09-16 01:47:47 +02:00
Lukas Niemeier a84136418e # spelling 2013-09-16 01:40:22 +02:00
Lukas Niemeier 10ab2badae # fixed failing test TestStoringAndRetrievingRaceLogInLeaderboards by using a correct event identifier 2013-09-16 01:39:55 +02:00
fmittag 5ab7d5af96 unified usage of "require-bundle: org.junit4" for all test bundles 2013-09-02 11:47:06 +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
Lukas Niemeier e7ff49ac1a RaceLogIdentifier now builds identifier using a triple
Loading and storing aligned to change
DomainObjectFactoryImpl loads obsolete events too
2013-08-09 17:23:32 +02:00
Axel Uhl 832e73e2ff added RaceLogEventAuthor to RaceLogEvent and factored this through all constructor / factory / persistence / serialization code 2013-07-19 16:30:28 +02:00
Axel Uhl 8c4ffc756f introducing RaceLogEventAuthor with priority to decide precedences in competing multi-device scenarios 2013-07-19 15:21:48 +02:00
Axel Uhl 5a0375e69f added support for fetching competitors from clientparams.php 2013-07-12 14:53:41 +02:00
fmittag e0e4614751 initial version of sideline support (server side and drawing on map)
so far only sidelines modeled as gate are supported
2013-07-01 18:42:42 +02:00
Armin Zamani a3d39f3d62 Fixed CourseArea equality checks: Coursearea objects are created only once and maintained by the DomainFactory 2013-06-18 01:33:45 +02:00
Armin Zamani cccd75f0bb implemented new RaceLogWindFixEvent, extended persistence, serialization/deserialization, implemented tests 2013-06-15 12:08:11 +02:00
Armin Zamani e8923f8f9c renamed test methods in regatta racelog test (the method names were "...SimpleLeaderboard..." which is not correct for regatta tests 2013-06-12 19:03:41 +02:00
Armin Zamani 964178eac5 implemented a test to check if the old finishing list confirmed event can be loaded correctly 2013-06-12 18:58:33 +02:00
Armin Zamani 8f643709f4 Made RaceLogScoringReplicator safe against connectivity problems: RaceLogFinishPositioningConfirmedEvent contains now the confirmed list of competitors. When a finish positioning changed event is missing (due to connectivity problems), the final list which is used for score corrections is correct as no wrong, old positioning changed event is used 2013-06-12 14:33:16 +02:00
Lukas Niemeier 4a9cdcd021 refs bug 1125
# added ProtestStartTimeEvent (and tests and serializers and persistence)
2013-06-09 19:33:50 +02:00
Axel Uhl 166ab0d8b9 added startsWithZeroScore to RaceColumn and Series, with support in leaderboard total points implementation, persistence and replication 2013-06-08 00:32:43 +02:00
Axel Uhl 73b9f4bb70 changed return type of Leaderboard.getResultDiscardingRule() form ThresholdBasedResultDiscardingRule to ResultDiscardingRule 2013-06-06 10:21:04 +02:00
Axel Uhl a1cafa284e a few renames and persistence for Series result discarding rules 2013-06-05 18:11:58 +02:00
Armin Zamani 9a180f0e60 Changed App Event persistence manager to use an array list as cache instead of the fileContent 2013-04-30 10:28:00 +02:00
Lukas Niemeier dc63b554a5 # added RaceLogStartProcedureChangedEvent...
# ... and serializer...
# ... and deserializer...
# ... and persistence...
# ... and tests
2013-04-23 02:20:09 +02:00
Armin Zamani e6ddcadb36 Merge branch 'master' into racecommittee_integrated
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/regattaoverview/FlagImageCell.java
2013-04-22 18:34:40 +02:00
Fabian Tschirschnitz 3437581122 added gate line opening time feature to app. event post to server does still not work correctly. 2013-04-22 00:53:04 +02:00
Lukas Niemeier d955b49ea7 # correct loading of pathfinderevents
# passing tests for loading
2013-04-21 01:26:15 +02:00
Lukas Niemeier f3633a895f # added missing files from last move
# added factory method for restoring pathfinderevents
# added test for deserialization of pathfinderevent
2013-04-21 01:14:11 +02:00
fmittag 1199ff818d removed unnecessary dependencies to the org.eclipse.osgi bundle 2013-04-18 10:46:15 +02:00