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
db878e1d17
Implemented the individual recall handling (automatic vs manual removal)
2013-04-08 22:53:32 +02:00
Armin Zamani
80beb65712
Some bug fixes in the App persistence manager, implemented missing race
...
log pass change event deserializer, implemented race abortion, removed
some unused code
2013-04-07 18:05:09 +02:00
Armin Zamani
aa0c113d3c
When a positioning list event exists, this list is read and displayed
...
when the finishing fragment is created. the changed event is also
created when a maxpointsreason is set by the race officer
2013-04-06 14:54:36 +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
3838e459bd
renamed the racelog analyzer package
2013-04-04 23:40:53 +02:00
Armin Zamani
9bebba4ebc
Moved the finish and finishing analyzers from app to android.shared
2013-04-04 23:33:37 +02:00
Armin Zamani
31b6b49a97
added the competitor list field to RaceCell and its implementation.
...
adapted the serializer and deserializer appropriately
2013-04-02 19:49:23 +02:00
Armin Zamani
a21efacd34
Moved the race log course design finder from app code to the android
...
share bundle. on the GWT side the course design is converted to a
RaceCourseDTO and added to the RaceInfoDTO
2013-03-28 00:52:23 +01:00
fmittag
7db566ebae
added (failing) test case for smartfuturechache in leaderboard json export
2013-03-25 16:10:02 +01:00
Armin Zamani
5aeb30b1c9
Merge branch 'master' into racecommittee_integrated
2013-03-22 15:13:45 +01:00
Axel Uhl
057a479586
Largely fixed bug 1023. While it doesn't show an additional column with the race count, LowPoint and HighPoint and all
...
their derived schemes rank a competitor better if it has more races; all races of those schemes are now always
considered valid for total points score. The old implementation is still in AbstractScoringScheme in case someone
needs them in a specific scheme.
2013-03-22 15:04:18 +01:00
Axel Uhl
0313c26a2d
in LockUtil, consider the possibility that a thread from which locks are to be carried over doesn't hold any
2013-03-22 14:03:05 +01:00
Armin Zamani
6d0660120b
Merge branch 'master' into racecommittee_integrated
2013-03-22 10:42:10 +01:00
Axel Uhl
3dfc8ca0e7
apply lock propagation also to write locks
2013-03-22 00:34:45 +01:00
Axel Uhl
f9292e64c3
added lock propagation to LeaderboardDTOCache and SmartFutureCache
2013-03-22 00:28:23 +01:00
Axel Uhl
e73b325db7
Merge remote-tracking branch 'server/master'
2013-03-21 23:59:20 +01:00
Axel Uhl
9b3f696620
use a ConcurrentHashMap to avoid issues in LockUtil caused by concurrent access to the lockCounts map
2013-03-21 23:48:08 +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
6abba47d29
Merge branch 'master' into racecommittee_integrated
...
Conflicts:
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/coursedata/impl/CourseDataJsonSerializer.java
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/coursedata/CourseBaseJsonSerializer.java
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/coursedata/CourseDataJsonSerializer.java
java/com.sap.sailing.server.gateway/WEB-INF/web.xml
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/EventDataJsonExportServlet.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/DataStore.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/InMemoryDataStore.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OfflineDataManager.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OnlineDataManager.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/ReadonlyDataManager.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/parsers/EventsDataParser.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/impl/FleetIdentifierImpl.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/impl/ManagedRaceImpl.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/LoginActivity.java
2013-03-21 21:19:27 +01:00
Armin Zamani
d1f64c456d
renamed "CourseData" to "CourseBase", "EventData" to "EventBase" and
...
"SeriesData" to "SeriesBase", and their impl-classes accordingly,
renamed "CourseDataJsonSerializer" to "CourseBaseJsonSerializer"
2013-03-21 18:30:30 +01:00
Axel Uhl
feaea37a0c
improved trace output for locking
2013-03-21 17:43:23 +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
Lukas Niemeier
02d2e39315
# RaceLogEvent knows when it was created
...
# Added failing DB Test for createdAt timestamp.
2013-03-20 00:10:20 +01:00
Armin Zamani
619f0fead9
Merge branch 'master' into racecommittee_integrated
...
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/rc/RaceGroupFactory.java
2013-03-19 19:08:36 +01:00
Armin Zamani
fdff49ebb8
Changed the analyzers to read only after aquiring the read lock
2013-03-19 01:30:27 +01:00
Armin Zamani
6c0ab235a0
Code cleanup
2013-03-17 19:12:25 +01:00
Armin Zamani
c6d96504ab
Implemented new race log event type for course changes
2013-03-12 12:34:25 +01:00
Axel Uhl
020cc5d4e6
fixing bug 1261: course changes erroneously detected
2013-03-06 12:06:49 +04:00
Fabian Tschirschnitz
f3757ca5e1
Merge branch 'racecommittee_regattaoverview' into racecommittee_integrated
2013-03-06 00:39:06 +01: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
ca738ad311
added some things to the gwt ui. moved Flags.java and RaceLogRaceStatus.java to domain.common
2013-03-05 16:10:03 +01:00
Lukas Niemeier
26e3a55ed8
# added tests for racelog and comparator
2013-03-05 12:11:25 +01:00
Lukas Niemeier
a423fb9e35
# added test bundle for domain.shared.android
2013-03-05 11:03:42 +01:00
Lukas Niemeier
79379e416a
Merge branch 'racecommittee_regattaoverview' into racecommittee_integrated
...
Conflicts:
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/racecommittee/domain/racelog/impl/PassAwareRaceLogImpl.java
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/racecommittee/domain/state/impl/analyzers/RaceStatusAnalyzer.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/deserialization/impl/RaceLogDeserializer.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/domain/state/impl/RaceStateImpl.java
2013-03-04 16:59:42 +01:00
Fabian Tschirschnitz
65a2ca80b5
added some rudimentary table to the gwt regattaoverview.
2013-03-04 00:56:18 +01:00
Lukas Niemeier
fdfc27278c
# working towards migration of Event Sending Services
2013-03-03 21:12:12 +01:00
Armin Zamani
b7f6803829
added Javadoc for SeriesWithRows
2013-03-03 15:01:34 +01:00
Armin Zamani
67375f2a5b
Solved some errors after merge
2013-03-01 15:47:43 +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
Axel Uhl
376e4d7063
adjusted some formatting and whitespaces
2013-02-28 18:09:18 -10:00
Lukas Niemeier
f26bb9b040
# some comments for racelog package
2013-02-27 00:49:31 +01:00
Lukas Niemeier
de039cbe3d
# added some comments to the racegroup package
2013-02-27 00:37:05 +01:00
Lukas Niemeier
741ecd2878
# on deserialization RaceLogImpl resets listener field
2013-02-23 22:56:38 +01:00
Armin Zamani
fmittag
Axel Uhl
Lukas Niemeier
Fabian Tschirschnitz
Lukas Niemeier