Armin Zamani
0a23a1498f
worked on Java doc
2013-04-14 12:46:19 +08:00
Armin Zamani
28d6d05de7
Added more javadoc and comments for code explanations
2013-04-14 12:01:40 +08:00
Armin Zamani
7a57e77157
Merge branch 'master' into racecommittee_integrated
2013-04-14 10:10:16 +08:00
Simon Pamies
2b6a9beb87
Moved implementation of getLeaderboardsNotInGroup away from $where
...
implementation. It has two drawbacks: First MongoDB 2.4 no longer
supports global access to objects like db. The other one is that plain
$where calls are knwon to be very inefficient because they wake up all
objects in the collections they're working on without ever using
indexes.
2013-04-14 00:44:03 +08:00
Armin Zamani
704bf9d095
Changed competitor in PositioningListEvent to a plain group of
...
competitor id and competitor name
2013-04-13 08:38:55 +08:00
Armin Zamani
502a15d0a5
Changed getTrackedRegatta.getRegatta.getId to the tractrac event id,
...
given by getTracTracEvent
2013-04-12 16:40:49 +08: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
f8779b156e
implemented persistence load of the
...
RaceLogFinishPositioningListChangedEvent + testing
2013-04-05 20:37:02 +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
ac1acc6d18
Merge branch 'master' into racecommittee_integrated
...
Conflicts:
java/com.sap.sailing.domain.tractracadapter.persistence/src/com/sap/sailing/domain/tractracadapter/persistence/impl/DomainObjectFactoryImpl.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardConfigPanel.java
2013-04-01 01:01:12 +02:00
Simon Pamies
3b497e7e95
Moved away from calling logger.throwing because this logs with level FINER that is not catched in most logging configurations. Used logger.log(level, message, throwable).
2013-03-29 15:19:03 +01:00
Armin Zamani
4e29bda14c
fixed a couple of merge errors
2013-03-21 22:11:57 +01:00
Lukas Niemeier
4ddfc7f8ac
Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated
2013-03-20 01:39:06 +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
Armin Zamani
44d78fadd9
Merge branch 'master' into racecommittee_integrated
...
Conflicts:
java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch
2013-03-19 22:05:33 +01:00
Axel Uhl
ce81b899d4
fixing bug 1310 by removing the overall leaderboard from the DB when removing the leaderboard group
2013-03-19 18:19:57 +01:00
Axel Uhl
6bef155bc5
Quick fix for bug 1310: return null as leaderboard loading result when trying to load an overall leaderboard as a flexible leaderboard
2013-03-19 18:15:29 +01:00
Lukas Niemeier
968cc32c16
# cleanup of RaceLogEventFactory usage
2013-03-19 17:50:54 +01:00
Armin Zamani
36d98c5080
Introduced a persistence test for the course design changed events in
...
race logs
2013-03-12 17:45:31 +01:00
Armin Zamani
c6d96504ab
Implemented new race log event type for course changes
2013-03-12 12:34:25 +01:00
Armin Zamani
1bea958c4d
Merge branch 'master' into racecommittee_integrated
...
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
2013-03-06 10:30:22 +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
Simon Pamies
6a9d419dd2
Make sure that index is set on regatta name for wind tracks
2013-03-05 20:27:15 +01:00
Axel Uhl
52f50e99ac
fixing bug 1253 (NPE when editing races of regatta series)
2013-03-04 11:57:39 +01:00
Fabian Tschirschnitz
65a2ca80b5
added some rudimentary table to the gwt regattaoverview.
2013-03-04 00:56:18 +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
Armin Zamani
1cf98ae228
escaped racelogidentifier when stored in database and requested for
...
loading of events
2013-02-27 11:37:25 +01:00
Armin Zamani
ab41dba5a2
Merge branch 'master' into racecommittee_integrated
...
Conflicts:
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/MongoObjectFactoryImpl.java
java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingLeaderboards.java
2013-02-27 08:58:26 +01:00
Axel Uhl
f667db3864
fix for bug 1242 by escaping race column names as well as fleet names
2013-02-26 18:59:08 -10:00
Armin Zamani
9d72f87f04
Implemented CourseArea as another field to be selected in the Admin
...
Console for Regattas and propagated it in the Regatta infrastructure
2013-02-24 23:17:21 +01:00
Lukas Niemeier
1595409c90
# RacingEventService uses RaceLogReplicator to replicate all incoming RaceLogEvents on RaceLogs
...
# Currently only RaceLogs of RaceColumns in Leaderboards supported
# Added some tests
2013-02-24 02:31:23 +01:00
Armin Zamani
fe2ca8196d
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/leaderboard/impl/FlexibleLeaderboardImpl.java
2013-02-23 23:46:22 +01:00
Armin Zamani
2998aae3e5
Removed CourseArea from RegattaLeaderboard, the courseAreaId is now only
...
a property of flexible leaderboards, for edit flexible leaderboard
dialog the coursearea and event is correctly preselected
2013-02-23 23:37:18 +01:00
Lukas Niemeier
6868f3f6d4
# race logs are set after RaceColumn is bound to its container (FlexibleLeaderboard or Regatta)
2013-02-23 22:26:39 +01:00
Armin Zamani
8cae8c7895
Added a test for persistence of race log events in flexible
...
leaderboards. the storing and loading for every race log event type is
tested.
2013-02-23 01:14:37 +01:00
Armin Zamani
b1e82d2866
Changed concept of holding race logs to make it safe for
...
replication's initial load
2013-02-22 22:03:39 +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
f13a8fc469
Merge branch 'master' into racecommittee_integrated
...
Conflicts:
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardScoringAndRankingTest.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/tracking/impl/TrackedRegattaImpl.java
java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/TestColumnSwapping.java
java/com.sap.sailing.gwt.ui/build.properties
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/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/LeaderboardGroupDialog.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/AbstractLeaderboardDTO.java
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2013-02-22 15:51:13 +01:00
Axel Uhl
720048059f
switched order of updating DynamicRaceDefinitionSet and adding tracked race to regatta; fixed deserialization issue with DelayedLeaderboardCorrectionsImpl
...
The deserialization issue led to NPEs; the listeners field was transient and not re-initialized after de-serialization.
This has led to the NPE in a replica.
2013-02-21 09:26:25 +01:00
Armin Zamani
e0aff489c2
implemented loading of new race log events
2013-02-20 01:14:41 +01:00
Armin Zamani
dd8af38f23
added persistence for new race log event types passchange,
...
courseAreachange, etc.
2013-02-20 00:15:52 +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
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
Simon Pamies
0d78d4e7bc
Added test for regatta race association, also removing association when
...
regatta gets removed
2013-02-18 12:35:36 +01:00