Armin Zamani
2f2ec1a9c3
organized import
2013-04-14 06:52:15 +08:00
Armin Zamani
c8953c6aad
Added first finisher time to the label in the app, score correction
...
confirmation is not thrown when blue flag down is pressed, added a test
for the passaware racelog
2013-04-14 06:51:08 +08:00
Armin Zamani
cc61f70b07
Merge branch 'master' into racecommittee_integrated
...
Conflicts:
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/AbstractTimePoint.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/ScoreCorrection.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/SettableScoreCorrection.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedLegOfCompetitor.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardEntryPoint.java
java/com.sap.sailing.server.gateway.test/META-INF/MANIFEST.MF
java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/JsonExportTest.java
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/LeaderboardJsonGetServlet.java
2013-04-11 13:39:51 +08: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
0b752acc2c
Steps towards score corrections in the leaderboard initiated by a race
...
log event
2013-04-06 21:50:36 +02:00
Armin Zamani
c6cefb328b
Merge branch 'master' into racecommittee_integrated
...
Conflicts:
java/com.sap.sailing.server.gateway/WEB-INF/web.xml
2013-04-04 17:06:06 +02:00
fmittag
678e7d18cb
Merge remote-tracking branch 'origin/master' into leaderboardCache
2013-04-04 10:37:48 +02:00
Axel Uhl
e2b3d43393
Tasks in the SmartFutureCache are now recycled with an extended update interval instead of canceled and re-scheduled if not yet started;
...
This solves bug 1314. A synchronized piece of code on the task attempts to update the interval in case the task hasn't read the interval
definition yet. If that doesn't succeed because the task has already consumed the old update interval definition, the existing future task
is left alone, and a new task with the extended update interval is created and scheduled.
2013-04-04 00:59:31 +02:00
Axel Uhl
0761af5e55
refactored SmartFutureCache towards a solution for bug 1314, re-using existing tasks with extended update interval instead of canceling and re-scheduling
2013-04-04 00:49:20 +02:00
Axel Uhl
8ff3810ada
added a "test case" (doesn't test anything) that reproduces the problem of bug 1314 with SmartFutureCache
2013-04-03 23:17:09 +02:00
Armin Zamani
931d2fe98e
Implemented the throughput of the TracTrac user name and password from
...
the AdminConsole to the CourseDesignChangeHandler in the TracTrac
adapter
2013-04-03 20:33:26 +02:00
fmittag
9f82edfb7b
Merge remote-tracking branch 'origin/master' into leaderboardCache
2013-04-02 09:16:56 +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
Axel Uhl
4d53a3d865
fixed smart future cache test which now failed due to more rigid locking policy;
...
can't suspend the cache(...) method which is holding the write lock while trying to read using get(...).
Now suspending the computeCacheUpdate method. This still lets get(...) read null, but during
computeCacheUpdate the write lock for the key isn't held by the cache yet. Therefore, the get can proceed.
2013-03-29 15:43:29 +01:00
Axel Uhl
465d618fbc
fixed smart future cache test which now failed due to more rigid locking policy;
...
can't suspend the cache(...) method which is holding the write lock while trying to read using get(...).
The get(...) method will simply block because a cache update is currently on its way.
2013-03-29 15:40:01 +01:00
Axel Uhl
12c9b3761b
fixed third of the leaderboard tests that failed due to the changed incurred by the fix for bug 1023
2013-03-29 15:15:49 +01:00
Axel Uhl
8922ccf470
fixed second leaderboard test case that broke because of the changes incurred by the fixes for bug 1023
2013-03-29 15:05:07 +01:00
Axel Uhl
b7182c4553
fixed the first of the leaderboard tests broken by the change in behavior requested by the fix for bug 1023
2013-03-29 14:56:41 +01:00
fmittag
d61d7f8644
Merge remote-tracking branch 'origin/master' into leaderboardCache
...
Conflicts:
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/DomainFactoryImpl.java
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/LeaderboardJsonGetServlet.java
2013-03-25 12:37:37 +01:00
Armin Zamani
6d0660120b
Merge branch 'master' into racecommittee_integrated
2013-03-22 10:42:10 +01:00
Armin Zamani
4e29bda14c
fixed a couple of merge errors
2013-03-21 22:11:57 +01:00
Axel Uhl
51ddeef2b8
working towards a solution against read-read locks when first reader waits for second reader (see bug 1313)
2013-03-21 21:22:01 +01:00
Armin Zamani
ab111912f9
the courseDesignUpdateURI is registered for RaceCourseReceiver in the
...
TracTrac Adapter
2013-03-20 20:40:30 +01:00
Armin Zamani
f924559542
introduced the course design update URI as part of the constructors for
...
tractrac race creation
2013-03-20 19:31:23 +01:00
Armin Zamani
8cb047681b
implemented listener of tracking provider for course design changes
2013-03-19 23:57:31 +01:00
Armin Zamani
6274127bcb
introduced a race log listener on TrackedRace to propagate changes on
...
the course design
2013-03-19 23:27:34 +01:00
Axel Uhl
228499231b
first compilable (yet entirely untested) version of a Leaderboard JSON export servlet with a SmartFutureCache
2013-03-07 11:32:18 +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
Fabian Tschirschnitz
65a2ca80b5
added some rudimentary table to the gwt regattaoverview.
2013-03-04 00:56:18 +01:00
Axel Uhl
ad969e44e7
Merge branch 'master' into racecommittee_integrated
...
Conflicts:
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverAnalysis505Test.java
java/com.sap.sailing.gwt.ui/SailingGWT.launch
2013-03-01 13:11:54 -08:00
Axel Uhl
10c027565c
fixing time zone in DateFormat for test so that there is no dependency on the executing computer's time zone setting
2013-03-01 12:49:45 -08:00
Armin Zamani
df145e18e1
Fixed bug: ScoreCorrection for leaderboard must not be null
2013-03-01 21:12:16 +01:00
Armin Zamani
b254437be3
Merge branch 'master' into racecommittee_integrated
...
Conflicts:
java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/DomainFactoryImpl.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseUpdateTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/RouteAssemblyTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindTest.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/DomainFactory.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceCourseReceiver.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/base/Course.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/DomainFactory.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/CourseImpl.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.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/TrackedRaceContentsReplicationTest.java
2013-03-01 15:10:49 +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
fmittag
4a90f84793
Merge remote-tracking branch 'origin/master' into passingSide
2013-02-27 16:05:59 +01:00
fmittag
510b9dda7d
Finalized implementation of the new passingSide for Waypoints
...
cleanup of getRaceCourse() method in Sailingservice and improvement of RaceCourseManagementPanel in gwt UI
2013-02-27 15:53:49 +01:00
Armin Zamani
a779640411
Merge branch 'master' into racecommittee_integrated
...
Conflicts:
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseUpdateTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/OnlineTracTracBasedTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReceiveMarkPassingDataTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReceiveTrackingDataTest.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/DomainFactory.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/leaderboard/impl/AbstractSimpleLeaderboardImpl.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/TrackedRegatta.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRegattaImpl.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.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindTracksTest.java
2013-02-26 13:26:25 +01:00
Axel Uhl
58ffefff5a
fixing bug 1239 by also passing TrackedRace along with addRaceDefinition
2013-02-26 11:32:48 +01:00
Armin Zamani
7729a311db
removed @Ignore for alle TracTrac Tests in domain tests
2013-02-25 00:19:24 +01:00
Armin Zamani
566916ece4
Merge branch 'racecommittee_integrated' of ssh://sapsailing.com/home/trac/git into racecommittee_integrated
...
Conflicts:
java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java
2013-02-24 23:19:50 +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
c506c10733
# test for attaching race logs to TrackedRaces
2013-02-24 21:45:26 +01:00
Lukas Niemeier
5e9bff4301
# on racecolumn link race log gets attached to TrackedRace
2013-02-24 21:06:08 +01:00
Lukas Niemeier
41605a58ac
# format
2013-02-24 21:05:20 +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
5debe4cf03
# another tractrac tests which never terminates...
2013-02-23 22:21:44 +01:00
Lukas Niemeier
49f2df24ac
# ignore some never ending tractrac-tests...
2013-02-23 22:19:22 +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
8b56cad5de
enhanced test case for column factor application in regatta leaderboard
2013-02-20 11:01:39 +01:00