Commit Graph
586 Commits
Author SHA1 Message Date
Armin Zamani 79a39ef402 Merge branch 'master' into racecommittee_integrated
Conflicts:
	java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/GwtTestCaseColumnToggling.java
	java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/TestColumnSwapping.java
	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/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/server/SailingServiceImpl.java
	java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndLoadingEventsAndRegattas.java
	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/DelayedLeaderboardCorrectionsReplicationTest.java
	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/PrematureOperationReceiptTest.java
	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/ServerReplicationTest.java
	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackRaceReplicationTest.java
	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/LeaderboardDiscardingRulesTest.java
	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/OperationalTransformationTest.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/CreateFlexibleLeaderboard.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/CreateRegattaLeaderboard.java
2013-03-03 17:40:51 +01:00
fmittag be38ea453c Fixed several issues related to regatta leaderboard creation
- Replication issues
- Bug 1249 - Sort regattas in "Create regatta leaderboard" dialog
- Bug 1250 - Display name not applied by Create Regatta Leaderboard dialog
2013-03-03 14:53:19 +01:00
Armin Zamani 76a249ad23 Added some Javadocs for explanation of our implementation and renamed
some methods
2013-03-03 14:02:32 +01:00
Armin Zamani a96e692b5f changed SailingGWT.launch again after merge, removed wrong and
unnecessary additional workspace_bundles key
2013-03-01 15:52:25 +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
Lukas Niemeier c9452731ff # remove race log replicator listener on regatta remove 2013-02-27 00:08:35 +01:00
Armin Zamani b34298c6d8 replication: added missing connection of Regatta raceColumnlisteners in
RacingEventService to RaceLogRegplicator
2013-02-26 18:10:06 +01:00
Armin Zamani e055c9ee12 Merge branch 'master' into racecommittee_integrated
Conflicts:
	java/com.sap.sailing.gwt.ui/pom.xml
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2013-02-25 00:27:15 +01: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 e3b44ebdf9 # use new Replicator interface in CourseChangeReplicator 2013-02-24 19:18:26 +01:00
Lukas Niemeier d239dbd2d6 # register replicator only if FlexibleLeaderboard 2013-02-24 02:35:33 +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
Axel Uhl 2e5651b8bc added more replication logging on the serializing end 2013-02-23 08:15:26 +01:00
Axel Uhl 6dac249478 added replication-related logging 2013-02-23 08:13:40 +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 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 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 3aaa464f1b Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated 2013-02-19 19:32:20 +01:00
Armin Zamani ec9d5779a1 Changed RecordRaceLogEvent so that names are passed as strings 2013-02-19 19:17:28 +01:00
Lukas Niemeier 77b59cf6fa Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated
Conflicts:
	java/com.sap.sailing.domain.swisstimingreplayadapter/src/com/sap/sailing/domain/swisstimingreplayadapter/impl/SwissTimingReplayToDomainAdapter.java
2013-02-19 19:07:08 +01:00
Lukas Niemeier bd017c2865 # some cleanup 2013-02-19 19:06:47 +01:00
Armin Zamani 730b431912 further implementation of racelogstore in the sailing suite 2013-02-19 19:05:28 +01:00
Jens Rommel ce50ceee18 Added rome dependency to launch configs. 2013-02-19 15:32:11 +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 1e78be1dae Changed replication behaviour to new implementation 2013-02-18 02:19:35 +01:00
Armin Zamani 57689d36b9 added RaceLogStore to RacingEventService 2013-02-18 01:44:11 +01:00
Armin Zamani ddea60f570 Removed RaceLogStore from RaceColumn implementations and all subsequent
classes
2013-02-18 01:34:14 +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 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 a8c9449ae2 added race log store to AddRaceColumn Command class and fixed the
callees
2013-02-09 21:13:26 +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
Armin Zamani e0b3d6d5b7 added getCourseArea for course area id in RacingEventService interface 2013-02-08 13:34:20 +01:00
fmittag ec40fbcef0 added rome.jar to all launch configurations 2013-02-07 16:54:31 +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 48ce5e2e05 created overall leaderboard and added totalPoints column to both leaderboards 2013-02-06 14:45:04 +01:00
fmittag 7aedcde17c added new bundle com.sap.sailing.server.gateway.ess40 to root pom and all launch configurations 2013-02-05 18:51:53 +01:00
Axel Uhl e908b1da79 Merge remote-tracking branch 'server/master' 2013-02-04 18:05:49 +01:00
Axel Uhl 831caa2a5e fixed synchronization of wind loading and replication; see bug 1190 2013-02-04 18:04:21 +01:00