Lukas Niemeier
5df89c7e7e
Merge branch 'master' into racecommittee_integrated
...
Conflicts:
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/FieldNames.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/impl/MarkImpl.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java
java/com.sap.sailing.domain/META-INF/MANIFEST.MF
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/DomainFactory.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/RegattaLeaderboardImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/meta/MetaLeaderboardColumn.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRace.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/.settings/com.google.gwt.eclipse.core.prefs
java/com.sap.sailing.gwt.ui/SailingGWT.launch
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractLeaderboardDialog.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/FlexibleLeaderboardCreateDialog.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/FlexibleLeaderboardDialog.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/FlexibleLeaderboardEditDialog.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/LeaderboardDescriptor.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaLeaderboardCreateDialog.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaLeaderboardDialog.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaLeaderboardEditDialog.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.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/AbstractLeaderboardDTO.java
java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndLoadingEventsAndRegattas.java
java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF
java/com.sap.sailing.server/SailingServer (No Proxy).launch
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
java/pom.xml
2013-02-18 16:53:55 +01:00
Lukas Niemeier
36e4ae9e77
# cleanup
2013-02-18 15:38:05 +01:00
Lukas Niemeier
a84182c32c
# fixed lifecycle bug in ManagedRaceListFragment
2013-02-18 15:04:05 +01:00
Lukas Niemeier
1194542724
Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated
2013-02-18 14:44:38 +01:00
Lukas Niemeier
e5f619befe
# fixed pom
2013-02-18 14:44:27 +01:00
Lukas Niemeier
0c265c29a1
# test launches using eclipse launcher
2013-02-18 14:01:30 +01:00
Lukas Niemeier
c8d68a6d81
Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated
2013-02-18 13:27:07 +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
Lukas Niemeier
3e9df143c4
Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated
2013-02-18 12:22:10 +01:00
Lukas Niemeier
a744ad6c86
Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated
...
Conflicts:
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/AddToRaceLogJsonExportServlet.java
2013-02-18 02:27:48 +01:00
Lukas Niemeier
0684625910
# detail fragments are switched correctly...
2013-02-17 17:01:03 +01:00
Lukas Niemeier
4889e075d7
# cleanup
2013-02-17 14:44:40 +01:00
Lukas Niemeier
2763d11782
# removed obsolete servlets
2013-02-17 14:44:33 +01:00
Lukas Niemeier
351a835cc6
# tested integration of DomainFactory in deserialization
2013-02-17 14:39:02 +01:00
Lukas Niemeier
e03d4cfe0c
# better racelogevent dispatching for serialization and persistence
2013-02-17 14:32:49 +01:00
Lukas Niemeier
a3a27507b6
# ManagedRaceState now updates on every added event
2013-02-12 23:07:33 +01:00
Lukas Niemeier
d700b27668
# added PassChangeEvent (serialization still missing)
2013-02-12 23:07:09 +01:00
Lukas Niemeier
02c70e69b4
# added new RaceLogRaceStatus FINISHING
...
# added new generic event method to RaceLogListener
2013-02-12 22:55:18 +01:00
Lukas Niemeier
4112f6919c
# RaceLog now signals if add of event is successful
2013-02-12 22:23:58 +01:00
Lukas Niemeier
9053a8eab0
# added serializer and deserializer logic for RaceLogRaceStatus...
2013-02-12 20:24:22 +01:00
Lukas Niemeier
7d156071c8
# moved race status to RaceLogRaceStatus enum in domain
...
# added RaceLogRaceStatusEvent for change in status
# made RaceLogStartTimeEvent a subclass of RaceLogRaceStatusEvent
# aligned mongo and test classes
2013-02-12 20:20:57 +01:00
Lukas Niemeier
d05f7e3b10
# working toward status analysis of ManagedRace
2013-02-12 19:36:27 +01:00
Lukas Niemeier
c584016115
# migrated load failure alert code to new DialogFragment API
2013-02-12 19:19:32 +01:00
Lukas Niemeier
af8e3f72a4
# changed data api to httpurlconnection (because newer)
2013-02-12 19:01:12 +01:00
Lukas Niemeier
6da8b6c92c
# removed old api for displaying dialogs (LoginDialog)
...
# added offline resource loader...
2013-02-12 17:52:22 +01:00
Lukas Niemeier
b872aa1499
# minor code clean ups
2013-02-10 02:17:10 +01:00
Lukas Niemeier
e575ab9e0b
Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated
2013-02-10 02:08:15 +01:00
Lukas Niemeier
c5dcdbb8e9
# readded FinishedRaceFragment
2013-02-10 02:08:00 +01:00
Lukas Niemeier
26f401ed8f
Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated
2013-02-10 01:41:19 +01:00
Lukas Niemeier
2d8d8973b6
# readded SetTimeRaceFragment
2013-02-10 01:41:03 +01:00
Lukas Niemeier
2713a3f51a
# Reintroduced TickSingleton
...
# RaceInfoFragment is back
2013-02-09 23:53:41 +01:00
Lukas Niemeier
0a220b4e22
Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated
2013-02-09 20:01:56 +01:00
Lukas Niemeier
b806ed9e5e
# Readded servlet to receive RaceEvents
2013-02-09 20:01:25 +01:00
Lukas Niemeier
b9d0caf260
# serialize and deserialize BoatClass if RegattaLeaderboard
2013-02-09 19:46:51 +01:00
Lukas Niemeier
347c958b66
Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated
2013-02-09 19:03:01 +01:00
Lukas Niemeier
1fefd2ea17
# Added a (for now empty) shared domain bundle
...
# Another round of changes in the communication between app and server
# This time actual "race rows" are transmitted to the application - created by "transposing" the RaceColumns of a Leaderboard
# Each RaceRow contains it Fleet and several RaceCells. A RaceCell consists of a name and a RaceLog
# Removed a bunch of now unused data structures and serialization facilities
2013-02-09 19:02:46 +01:00
Lukas Niemeier
0f6b592530
# removed test file
2013-02-09 15:15:40 +01:00
Lukas Niemeier
8826614f76
# test
2013-02-09 15:14:52 +01:00
Lukas Niemeier
3176453ca2
# added lint file
2013-02-09 14:40:42 +01:00
Lukas Niemeier
5a87b8461d
# updated presentation
2013-02-08 15:32:34 +01:00
Lukas Niemeier
60fb4913ce
# added small presentation
2013-02-08 12:48:15 +01:00
Lukas Niemeier
c07723d55e
# added another test event to data loading in app
2013-02-08 11:17:39 +01:00
Lukas Niemeier
61dec32f17
# moved some code in gateway
2013-02-08 11:17:04 +01:00
Lukas Niemeier
ca61dc52e5
# cleaned up some EventsJsonExportServlet code
2013-02-08 01:31:24 +01:00
Lukas Niemeier
9ab84c5eb0
# working towards receiving racelogs...
2013-02-06 17:33:49 +01:00
Lukas Niemeier
5bf9cd4e10
# deserialization uses field names...
2013-02-05 19:39:44 +01:00
Lukas Niemeier
ba03950f23
# removed unused servlet
2013-02-05 19:30:23 +01:00
Lukas Niemeier
339f930a83
# reworked serialization to use Leaderboards rather than Regatta.getRaces...
...
# deserialization of all relevant types on app side
2013-02-05 19:29:12 +01:00
Lukas Niemeier
0d67d37adc
# moved getDefaultCourseArea up
2013-02-05 17:07:23 +01:00
Lukas Niemeier
0c23e55fdc
# added getDefaultCourseArea on Leaderboard
2013-02-05 16:03:59 +01:00
Lukas Niemeier
c40ca74218
# small fix in SeriesOfRegattaExtensionSerializer
...
# moved some code to method local vars
2013-02-05 14:01:12 +01:00
Lukas Niemeier
e2842c4b68
# serialization of FleetWithRaces
...
# used in regatta api of server
2013-02-05 12:28:39 +01:00
Lukas Niemeier
3f42b83215
# reused some utils
2013-02-05 12:28:01 +01:00
Lukas Niemeier
abcf92d2a6
# added FleetWithRaces (Fleet with knowledge of its RaceDefinitions)
2013-02-05 12:27:17 +01:00
Lukas Niemeier
5869468958
Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated
2013-02-05 10:51:16 +01:00
Lukas Niemeier
23a7aa41c6
# removed example event code
2013-02-03 00:39:51 +01:00
Lukas Niemeier
75f108ac1c
Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated
2013-02-03 00:13:24 +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
Lukas Niemeier
0d32aff524
# CourseArea serialization: id has to be a string to produce correct json output
2013-02-02 15:26:45 +01:00
Lukas Niemeier
061e695815
# events serializing ids of competitors (field involvedBoats)
2013-02-02 15:14:50 +01:00
Lukas Niemeier
e45040db9b
# added CourseAreaChangedEvent and serializers
2013-02-02 15:01:03 +01:00
Lukas Niemeier
7824b6fa91
# removed association between CourseArea and RaceDefinition (will be handled via CourseAreaChangedEvent)
2013-02-02 14:46:31 +01:00
Lukas Niemeier
90911b485a
Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated
...
Conflicts:
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/CourseAreaJsonSerializer.java
2013-02-02 14:37:53 +01:00
Lukas Niemeier
46dee69b84
# merged more ui code into new app
2013-02-02 14:36:39 +01:00
Lukas Niemeier
816c46d437
# cleared up the loading code (get rid of special loadclient interfaces)
...
# some comments and cleanup
2013-01-31 01:23:47 +01:00
Lukas Niemeier
bac8bd2bcd
# loading of events done
2013-01-30 19:09:28 +01:00
Lukas Niemeier
594acb1743
# resource handling and loading for events
2013-01-30 18:43:37 +01:00
Lukas Niemeier
3de188f98b
Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated
2013-01-30 17:43:30 +01:00
Lukas Niemeier
e8e6770879
# intermediate commit (working towards data loading)
2013-01-30 17:43:18 +01:00
Lukas Niemeier
1646d91d88
# readded skeleton of app to git
2013-01-30 16:57:01 +01:00
Lukas Niemeier
8d742e0bae
# removed some unused old code
2013-01-30 15:41:46 +01:00
Lukas Niemeier
458c583d9c
# some fixes for NPE
2013-01-29 20:29:16 +01:00
Lukas Niemeier
91006ec964
# clarified some serializer code (comment + modifiers)
2013-01-29 15:56:41 +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
549a5bce97
# deserialization of events (missing involved boats)
2013-01-22 02:56:02 +01:00
Lukas Niemeier
41eca38813
# more tests for serialization for RC
2013-01-22 02:17:07 +01:00
Lukas Niemeier
2a180a06f0
Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated
...
Conflicts:
.gitignore
2013-01-22 01:33:20 +01:00
Lukas Niemeier
4459824cd4
# some ignores for bin in mobile
...
# some test code for deserialization
2013-01-21 19:43:19 +01:00
Lukas Niemeier
b2c86be849
# test for serialization (currently only events)
2013-01-21 19:42:22 +01:00
Lukas Niemeier
c847ebda4a
# ignores for app
2013-01-16 18:58:47 +01:00
Lukas Niemeier
074214acef
# app structure
2013-01-16 18:58:21 +01:00
Lukas Niemeier
e658c06a28
# clean up for ignore rules
2013-01-16 18:56:32 +01:00
Lukas Niemeier
f119e71496
# adding the app
2013-01-16 18:38:49 +01:00
Lukas Niemeier
a7ad251a03
some ignores
2013-01-16 18:27:51 +01:00
Lukas Niemeier
f74af14730
# deserialization for event, coursearea, venue
2013-01-16 18:04:52 +01:00
Lukas Niemeier
d7bd59a61c
# moved racecommittee specific export servlets to own package
2013-01-16 17:26:06 +01:00
Lukas Niemeier
c24d19e284
# some ignores
...
# serialization details moved to final fields
2013-01-16 17:25:39 +01:00
Lukas Niemeier
6835508a87
Forgot the POM...
2013-01-14 10:36:56 +01:00
Lukas Niemeier
593279b122
fixed pom to include new project
2013-01-14 01:13:47 +01:00
Lukas Niemeier
bfb062128c
Serialization code for basic events
...
Integration in servlets
2013-01-14 01:12:38 +01:00
Lukas Niemeier
61bd5991d8
Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated
2013-01-02 19:55:58 +01:00
Lukas Niemeier
2c841ccd5a
# added serialization of base domain objects to shared (server + apps) bundle
2013-01-02 19:55:45 +01:00
Lukas Niemeier
4cc0741166
# added getEventById to RacingEventService
2013-01-02 19:55:06 +01:00
Lukas Niemeier
f62451aa3b
# added link to RaceDefinitions from CourseArea
2013-01-02 19:54:35 +01:00
Lukas Niemeier
e7da94bc2f
# some 1.7 -> 1.6 fixes
2012-12-05 16:07:37 +01:00
Lukas Niemeier