Frederik Petersen
9e1b3df73d
Fixed merge problems after merge of master into import_dbdata
2013-06-29 10:54:13 +02:00
Frederik Petersen
5963984323
Merge branch 'master' into import_dbdata
...
Conflicts:
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
2013-06-29 10:46:20 +02:00
Armin Zamani
0ed28673aa
Bug fix: Serializer threw an exception old confirmation events where the positioning was not set
2013-06-18 17:23:41 +02:00
Frederik Petersen
02e14d276a
Added more detailed serialization
...
enables us to transfer server master data from one instance to another.
-added nationality for persons
-added coach for teams
-added master data specific serialization classes
2013-06-18 14:00:00 +02:00
Armin Zamani
cccd75f0bb
implemented new RaceLogWindFixEvent, extended persistence, serialization/deserialization, implemented tests
2013-06-15 12:08:11 +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
Fabian Tschirschnitz
bb4c55003d
commented out RRS26 and GateLine start because of their current instability...
2013-05-25 17:04:30 +02:00
fmittag
2a689740f0
some cleanup and refactoring of the existing json export servlets and serializers
2013-05-16 16:02:19 +02:00
Lukas Niemeier
dc63b554a5
# added RaceLogStartProcedureChangedEvent...
...
# ... and serializer...
# ... and deserializer...
# ... and persistence...
# ... and tests
2013-04-23 02:20:09 +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
442b867232
# moved racelog deserialization stuff into own package to ensure symmetry with serialization package structure
2013-04-20 23:03:36 +02:00
Fabian Tschirschnitz
8e45e3a1b6
added gate start specific buttons (pathfinder and gatelineopeningtime) to ui. added pathfinder-event to domain. some other fixes. SORRY: serialization-test does not work.
2013-04-20 19:56:41 +02:00
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
Frederik Petersen
Armin Zamani
Lukas Niemeier
Fabian Tschirschnitz
fmittag
Lukas Niemeier
Axel Uhl