Commit Graph
342 Commits
Author SHA1 Message Date
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
Armin Zamani a6d31b08c3 implemented caching of raceLogs in raceLogStore 2013-02-18 02:13:43 +01:00
Armin Zamani ddea60f570 Removed RaceLogStore from RaceColumn implementations and all subsequent
classes
2013-02-18 01:34:14 +01:00
Lukas Niemeier e03d4cfe0c # better racelogevent dispatching for serialization and persistence 2013-02-17 14:32:49 +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 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
fmittag c88d42bf61 - added new attribute "displayName" to a leaderboard. The display name is used so far for overall leaderboards to make it possible to display a different name if used in MetaLeaderboardColumns. Furthermore the display name is used in the leaderboardgrouppanel which finally kills an old hack to shorten ugly leaderboard names.
- Changed formatting of totalPoints in leaderboards to hide useless zeros (e.g. 2 instead of 2.00)
2013-02-12 16:12:34 +01:00
Armin Zamani fedd109b35 removed the listener method for raceLogEvents in RaceChangeListener,
changed signature for RaceColumn.getRaceLog to get the racelog for
columns in RegattaLeaderboard
2013-02-10 22:40:37 +01:00
Armin Zamani 8ac062f3f2 Introduced RaceLogStore to RaceColumnInSeries 2013-02-10 21:42:05 +01:00
Armin Zamani 991e7714fa Implemented the RaceLog calling in the RaceColumn 2013-02-10 02:40:39 +01:00
Armin Zamani 4a4d213d7a RaceLogStore changed to a real store with caching functionality.
Race Column creation methods carry RaceLogStore to RaceColumn
constructor
2013-02-10 01:56:40 +01:00
Armin Zamani f9ee5b38fb Strategy change: reverted all additions of a raceLogStore to in
RaceColumn creation calls
2013-02-10 00:01:10 +01:00
Armin Zamani a8dafe6a63 Next implementation step, added RaceLogStore parameter to
RacingEventService, updated all callees
2013-02-09 22:27:06 +01:00
Armin Zamani 1c49ec0e24 Changed persistence for racelog to store using the new
RaceColumnIdentifier instead of Regatta and RaceDefinition
2013-02-09 19:55:10 +01:00
Armin Zamani 0cb94ad321 Implemented the optional reference of leaderboards to a coursearea of an
event
2013-02-06 17:47:32 +01:00
Armin Zamani 02b225f307 Renamed RaceCommittee to RaceLog 2013-02-02 16:34:53 +01:00
Armin Zamani 12bf61007a CourseArea now implements WithID 2013-02-02 00:24:43 +01:00
Armin Zamani e0ac319d4d 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.swisstimingreplayadapter/src/com/sap/sailing/domain/swisstimingreplayadapter/impl/SwissTimingReplayToDomainAdapter.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRaceWithStartTimeAndRanks.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracRaceTrackerImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/DynamicTrackedRace.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/RaceChangeListener.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/AbstractRaceChangeListener.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/CrossTrackErrorCache.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/DynamicTrackedRegattaImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackBasedEstimationWindTrackImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRegattaImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/util/impl/LockUtil.java
	java/com.sap.sailing.domain/src/com/sap/sailing/util/impl/SmartFutureCache.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/LeaderboardDTOCache.java
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2013-01-28 15:28:42 +01:00
Fredrik Teschke 97b1ad82c7 Moved CollectionNameService into MongoDBService 2013-01-28 11:11:54 +01:00
Axel Uhl 0a1e0f13fb enhanced query for leaderboards not in a group to exclude overall leaderboards 2013-01-25 22:07:24 +01:00
Armin Zamani 29a669e296 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/src/com/sap/sailing/domain/base/impl/CourseImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/util/impl/SmartFutureCache.java
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/AdminApp.java
2013-01-25 22:06:14 +01:00
Jens Rommel 5c5c4b2b16 Merge remote-tracking branch 'external/master' into master-ext 2013-01-25 13:15:36 +01:00
Lennart Hensler 311576db6e Replaced the catches of Throwable with catches of Exception 2013-01-25 10:28:07 +01:00
Jens Rommel e1a5e1f024 On bug-1162: bug-1162 2013-01-22 11:02:12 +01:00
Armin Zamani 67fa3c01dc Merge branch 'master' into racecommittee_integrated
Conflicts:
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracRaceTrackerImpl.java
	java/com.sap.sailing.gwt.ui/build.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsoleEntryPoint.java
2013-01-21 21:36:36 +01:00
Fredrik Teschke e8c368fad0 Use String for internal mapping of collection name to class name 2013-01-21 09:36:46 +01:00