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
Fabian Tschirschnitz
65a2ca80b5
added some rudimentary table to the gwt regattaoverview.
2013-03-04 00:56:18 +01:00
Lukas Niemeier
fdfc27278c
# working towards migration of Event Sending Services
2013-03-03 21:12:12 +01:00
Armin Zamani
b7f6803829
added Javadoc for SeriesWithRows
2013-03-03 15:01:34 +01:00
Armin Zamani
67375f2a5b
Solved some errors after merge
2013-03-01 15:47:43 +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
Axel Uhl
29ed4192ed
reverted unnecessary Java 1.7-->1.6 migrations; applied single return policy; some whitespace changes
2013-03-01 00:13:59 -08:00
Axel Uhl
376e4d7063
adjusted some formatting and whitespaces
2013-02-28 18:09:18 -10:00
Lukas Niemeier
f26bb9b040
# some comments for racelog package
2013-02-27 00:49:31 +01:00
Lukas Niemeier
de039cbe3d
# added some comments to the racegroup package
2013-02-27 00:37:05 +01:00
Lukas Niemeier
741ecd2878
# on deserialization RaceLogImpl resets listener field
2013-02-23 22:56:38 +01:00
Armin Zamani
78068bb02e
Fixed problem of empty course area field for leaderboards after loading
2013-02-22 19:17:57 +01:00
Armin Zamani
e0aff489c2
implemented loading of new race log events
2013-02-20 01:14:41 +01:00
Lukas Niemeier
bd017c2865
# some cleanup
2013-02-19 19:06:47 +01:00
Lukas Niemeier
5f0eff895c
# code cleanup
2013-02-19 01:01:45 +01:00
Lukas Niemeier
e29e4e7806
# Reworked placement of RaceLog to have it on RaceColumn again
...
# All code paths needing a real RaceLog are changed to use MongoRaceLogStoreFactory
# MISSING: REPLICATION ON RACECOLUMN!!!
2013-02-19 00:50:56 +01:00
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
e5f619befe
# fixed pom
2013-02-18 14:44:27 +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
75959bd0df
added src folder with dummy file to shared android project
2013-02-09 21:17:28 +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
Fabian Tschirschnitz
Armin Zamani
Axel Uhl