Commit Graph
1160 Commits
Author SHA1 Message Date
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
Armin Zamani c0e39d0348 made RaceLogStore in Series and Flexible Leaderboard transient 2013-02-22 15:20:25 +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
Axel Uhl 40c41cd1b5 don't use the display name as default for getName in regatta leaderboard if not null; always use regatta name instead 2013-02-21 01:45:20 +01:00
Armin Zamani 8168a784a1 Merge branch 'master' into racecommittee_integrated
Conflicts:
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/BoatClassImpl.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.server/SailingServer (No Proxy).launch
2013-02-20 01:32:14 +01:00
Lukas Niemeier ac424f091e # renaming of parameter 2013-02-19 20:04:33 +01:00
Lukas Niemeier 0f688eb0e7 # added two separate operations for adding events to Leaderboards and Regattas
# made RaceLogIdentifier contain RaceLogIdentifierTemplate
2013-02-19 20:00:49 +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
fmittag aa7392cc2d Merge remote-tracking branch 'origin/master' into buoyzone_drawing
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
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
2013-02-18 17:50:32 +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
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
Armin Zamani ddea60f570 Removed RaceLogStore from RaceColumn implementations and all subsequent
classes
2013-02-18 01:34:14 +01:00
Lukas Niemeier 0684625910 # detail fragments are switched correctly... 2013-02-17 17:01:03 +01:00
Lukas Niemeier e03d4cfe0c # better racelogevent dispatching for serialization and persistence 2013-02-17 14:32:49 +01:00
fmittag 5d6a5ddc58 removed double implementation of attribute displayName in RegattaLeaderboard 2013-02-14 10:40:53 +01:00
Axel Uhl 1d84d1bab1 Merge remote-tracking branch 'server/master'
Conflicts:
	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_de.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
2013-02-13 17:38:30 +01:00
fmittag 166d8f89f2 Merge remote-tracking branch 'origin/master' into buoyzone_drawing
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
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
2013-02-13 10:05:53 +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 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 2835d31357 added the record race log event operation 2013-02-11 00:03:13 +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 5e964f5f4e removed import by organizing import 2013-02-10 02:43:14 +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
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
Armin Zamani 7d6d72785e removed all RaceLog methods from TrackedRace and TrackedRaceImpl and
DynamicTrackedRace
changed TrackedRaceImpl constructor again, all calling methods are
changed appropriately
2013-02-09 01:10:39 +01:00
Frederik Petersen 8fd2e7f7e3 Changed PolarSheetGeneration workers to be simple Runnables
rather than FutureTasks, since the results are continuosly pushed to the
result container
2013-02-08 15:35:35 +01:00
Frederik Petersen d30aea90ec PolarSheetGeneration is now happening on a per windspeed basis 2013-02-08 11:28:58 +01:00
Frederik Petersen faa30981b0 Added start/stop timepoint optimization to polar sheet generation 2013-02-07 09:21:20 +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
fmittag 1505b504e0 Merge remote-tracking branch 'origin/master' into buoyzone_drawing
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
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
2013-02-06 16:54:01 +01:00
Frederik Petersen 53f7b30089 Merge branch 'master' into polarsheets 2013-02-06 08:59:13 +01:00
Axel Uhl 6ad1152631 Merge remote-tracking branch 'origin/master' 2013-02-05 20:55:03 +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
Frederik Petersen b75d043a79 Added some comments to polar sheet generation logic 2013-02-05 16:13:46 +01:00
Lukas Niemeier 0c23e55fdc # added getDefaultCourseArea on Leaderboard 2013-02-05 16:03:59 +01:00
Lukas Niemeier abcf92d2a6 # added FleetWithRaces (Fleet with knowledge of its RaceDefinitions) 2013-02-05 12:27:17 +01:00
Axel Uhl 831caa2a5e fixed synchronization of wind loading and replication; see bug 1190 2013-02-04 18:04:21 +01:00
Frederik Petersen 9852b7fe52 Merge branch 'master' into polarsheets
Conflicts:
	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.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
2013-02-04 16:44:55 +01:00
Frederik Petersen d2c9b76977 Added test-case for PolarSheet Generation 2013-02-04 16:41:04 +01:00
Axel Uhl e75ade6de5 use ConcurrentHashMap for windTracks; it may be concurrently targeted by the thread loading wind tracks in the background 2013-02-04 15:11:05 +01:00