Commit Graph
45 Commits
Author SHA1 Message Date
Axel Uhl 7b6ef0f246 added missing hamcrest dependency to serialization.test manifest 2013-04-11 14:46:43 +02:00
Axel Uhl 34bab83ba2 Merge remote-tracking branch 'server/master'
Conflicts:
	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/META-INF/MANIFEST.MF
	java/com.sap.sailing.server.gateway.serialization.test/build.properties
2013-04-11 14:13:34 +02:00
Axel Uhl 91af0a81ec fixed serialization.test mockito dependencies; added logging for start of tracking 2013-04-11 13:57:15 +02:00
Armin Zamani b501d1ca6f Merge branch 'racecommittee_integrated' of
ssh://armin@sapsailing.com/home/trac/git into racecommittee_integrated

Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java
2013-04-11 00:28:12 +02:00
Armin Zamani ca811614e2 Added the MaxPointsReason to the finishing list, now a pair of
competitor and maxpointsreason is used for the positionings
2013-04-06 11:27:04 +02:00
Armin Zamani 84aad68fce Introduced new race log event finish positioning confirmed event 2013-04-06 00:05:22 +02:00
Armin Zamani ea881bf348 introduced the deserialization of competitors as part of race log events 2013-04-05 22:37:31 +02:00
Armin Zamani db26b0aab7 implemented the new event FinishPositioningListChanged, now it can be
replicated, serialized and deserialized and persisted
2013-04-05 15:23:38 +02:00
Armin Zamani 22dddc900f more simplifications for competitor serialization and deserialization 2013-04-01 21:02:06 +02:00
Armin Zamani 1c16a630a7 implemented competitor serialization (team is serialized, boat
serialized, nationality serialized)
2013-04-01 19:16:28 +02:00
Armin Zamani 4e29bda14c fixed a couple of merge errors 2013-03-21 22:11:57 +01:00
Armin Zamani d2eb988050 remaining changes after merge 2013-03-21 21:19:57 +01:00
Armin Zamani d1f64c456d renamed "CourseData" to "CourseBase", "EventData" to "EventBase" and
"SeriesData" to "SeriesBase", and their impl-classes accordingly,
renamed "CourseDataJsonSerializer" to "CourseBaseJsonSerializer"
2013-03-21 18:30:30 +01:00
Lukas Niemeier 2b2d4d01aa # RaceLogStartTimeEvent now sets 'nextStatus' on its own
# some renaming in RaceLogEventFactory to reduce name-bloat
# database load restores createdAt timestamp correctly
2013-03-20 01:08:27 +01:00
Lukas Niemeier b2639e0379 # added failing serialization test 2013-03-20 00:14:03 +01:00
Lukas Niemeier 968cc32c16 # cleanup of RaceLogEventFactory usage 2013-03-19 17:50:54 +01:00
Armin Zamani 9df2ce5fec added a test for the serialization and deserialization of course design
change events
2013-03-17 21:32:55 +01:00
Armin Zamani d3f0bad002 Added a serializer for the course Design changed event 2013-03-13 01:15:29 +01:00
Armin Zamani aaf73deea5 Extended Data Management in app to handle mark loading 2013-03-07 17:13:31 +04:00
Fabian Tschirschnitz f90a198e04 moved Flags.java and RaceLogRaceStatus.java to common and added them to SailingDomain.gwt.xml. 2013-03-06 00:38:04 +01:00
Lukas Niemeier 0af3d0c6dd # moved some classes 2013-03-04 18:01:50 +01:00
Lukas Niemeier 79379e416a Merge branch 'racecommittee_regattaoverview' into racecommittee_integrated
Conflicts:
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/racecommittee/domain/racelog/impl/PassAwareRaceLogImpl.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/racecommittee/domain/state/impl/analyzers/RaceStatusAnalyzer.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/deserialization/impl/RaceLogDeserializer.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/state/impl/RaceStateImpl.java
2013-03-04 16:59:42 +01:00
Lukas Niemeier 57ae38befb # working on test for chooser 2013-03-04 16:50:10 +01:00
Lukas Niemeier c1f9b0b662 # added serializer for RaceLogPassChangeEvent 2013-03-04 16:48:35 +01:00
Lukas Niemeier d58a304b77 # moved some tests
# added test for CourseAreaChangedEventSerializer
2013-03-04 16:07:47 +01:00
Lukas Niemeier 0c893fc8ad # removed unused method 2013-03-04 15:33:41 +01:00
Lukas Niemeier 751061ebfb # this branch uses mockito now - please reload your target platform
# venue tests added
2013-03-04 15:33:28 +01:00
Lukas Niemeier a5d0787f24 # removed unused imports 2013-03-03 23:12:34 +01:00
Lukas Niemeier 1bec6cd816 # fixed serialization of flagevents 2013-03-03 23:12:00 +01:00
Armin Zamani d7f9bbbaf9 Just formatting: Changed tabs to spaces by formatting hole files (Ctrl +
I in Eclipse) that we might have touched while developing on this branch
2013-03-01 14:33:37 +01:00
Lukas Niemeier aff3083555 # cleanup 2013-02-27 00:39:05 +01:00
Armin Zamani 9d99a37424 changed ignore for empty serialization tests, ignored failing
leaderboard renaming test
2013-02-26 18:14:16 +01:00
Lukas Niemeier bd017c2865 # some cleanup 2013-02-19 19:06:47 +01:00
Lukas Niemeier a229765845 # moved everything used by Android projects of com.sap.sailing.domain into new bundle com.sap.sailing.domain.shared.android
# updated com.sap.sailing.domain to Java 1.7 again
# split of Event (see EventData) and Course (see CourseData) to minimize shared code with android
# to avoid sharing RaceColumn and Leaderboard (and its dependencies) Android projects work with RaceGroups (consisting of SeriesWithRows -> consisting of RaceRows -> consisting of RaceCells -> consisting of RaceLogs). A RaceGroup is basically a data-only view on transposed RaceColumns. See RaceGroupFactory for conversion from Leaderboard to RaceGroup. Future work: use Regatta instead of Leaderboard to convert to RaceGroup
2013-02-18 13:26:32 +01:00
Armin Zamani baf3fa8bc0 removed unneccessary tests, since the race log is no longer part of the
tracked race (need to be rewritten somewhere else), added two ignored
dummy methods to two serialization tests so that they do not fail
anymore
2013-02-18 02:49:09 +01:00
Lukas Niemeier e2842c4b68 # serialization of FleetWithRaces
# used in regatta api of server
2013-02-05 12:28:39 +01:00
Lukas Niemeier ad6b6fa37c Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated
Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/racecommittee/RaceCommitteeEventFactory.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/racecommittee/impl/RaceCommitteeEventFactoryImpl.java
	java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/RaceLogEventTest.java
	java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/RaceLogFlagEventSerializerTest.java
	java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/RaceLogStartTimeEventSerializerTest.java
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/BaseRaceLogEventDeserializer.java
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/RaceCommitteeFlagEventDeserializer.java
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/RaceCommitteeStartTimeEventDeserializer.java
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/BaseRaceLogEventSerializer.java
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/RaceCommitteeEventSerializer.java
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/RaceCommitteeStartTimeEventSerializer.java
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/RaceLogFlagEventSerializer.java
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/EventTrackJsonExportServlet.java
2013-02-03 00:13:16 +01:00
Lukas Niemeier c5241f3468 # Prepared: RegattaRaces API filters by course area
# More app code migrated from old version into new code base
2013-02-02 23:48:46 +01:00
Armin Zamani 02b225f307 Renamed RaceCommittee to RaceLog 2013-02-02 16:34:53 +01:00
Lukas Niemeier 061e695815 # events serializing ids of competitors (field involvedBoats) 2013-02-02 15:14:50 +01:00
Armin Zamani 12bf61007a CourseArea now implements WithID 2013-02-02 00:24:43 +01:00
Lukas Niemeier 125316deed # serialization of course and all of its data 2013-01-29 04:09:25 +01:00
Lukas Niemeier ad9568b0d5 # moved de/serializer to impl package
# easier de/serialization of rcevents
2013-01-29 04:08:50 +01:00
Lukas Niemeier 41eca38813 # more tests for serialization for RC 2013-01-22 02:17:07 +01:00
Lukas Niemeier b2c86be849 # test for serialization (currently only events) 2013-01-21 19:42:22 +01:00