Nick
|
15fe949b4b
|
Merge remote-tracking branch 'origin/master'
|
2015-07-04 21:16:46 +02:00 |
|
Axel Uhl
|
a37fd177f4
|
fix for bug 2976: don't compare by number of mark passings but by the index of the current leg
|
2015-07-03 13:50:26 +02:00 |
|
Axel Uhl
|
b7fb1d6dd6
|
minor formatting and mini refactoring
|
2015-07-02 10:13:03 +02:00 |
|
Axel Uhl
|
e170ba983e
|
fixing problem 2) of comment #5 in bug 3050;
using a WeakRaceLogChangedVisitor instead of a RaceLogChangedVisitor
|
2015-06-30 00:24:53 +02:00 |
|
Axel Uhl
|
dadd84af54
|
fixed part 1 of bug 3050 comment #5;
the WeakRaceLogChangedListener cleaner thread now removes the weak references and the WeakRaceLogChangedListener
from the static map
|
2015-06-30 00:11:42 +02:00 |
|
Nick
|
b2c9a44a57
|
Added RaceLogEvents for End and Start of tracking. Renamed unconsistent RaceLogEvents for MarkPassing editing.
|
2015-06-28 09:46:21 +02:00 |
|
Peter Siegmund
|
437e32d652
|
Merge branch 'bug3016' into ubilabs--rcapp--develop
|
2015-06-26 15:51:52 +02:00 |
|
fmittag
|
9c3230e0cf
|
added an getShortInfo() for the ProtestStartTimeEvent to see more info in the RaceLogDialog in the admin console
|
2015-06-24 18:21:30 +02:00 |
|
Axel Uhl
|
c50288f623
|
fixed typo in a toString() method
|
2015-06-24 01:55:41 +02:00 |
|
Axel Uhl
|
16dc4c17a4
|
aftermath of merge
|
2015-06-22 22:48:02 +02:00 |
|
Axel Uhl
|
09013efb0c
|
Merge branch 'master' into bug2977
Conflicts:
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/state/racingprocedure/impl/BaseRacingProcedure.java
|
2015-06-22 22:47:48 +02:00 |
|
Axel Uhl
|
aea90a0360
|
trying to solve bug2977 only, still explicitly writing the inidividual recall finished flag event into the race log
|
2015-06-22 17:22:55 +02:00 |
|
Axel Uhl
|
aa489ab35d
|
eliminated the effects of prematurely merging branch bug2977 into master; watch out when trying to finally merge bug2977 as it may already be considered merged
|
2015-06-22 16:57:49 +02:00 |
|
Axel Uhl
|
06fa04734d
|
fixed Javadoc
|
2015-06-22 16:32:41 +02:00 |
|
Axel Uhl
|
d852134642
|
require X-ray to be up in order to automatically infer its down time based on the start time
|
2015-06-20 19:36:14 +02:00 |
|
Axel Uhl
|
a78d7cd56a
|
fixed isIndividualRecallDisplayed() for bug2977
|
2015-06-20 18:45:18 +02:00 |
|
Axel Uhl
|
214751d09c
|
Merge branch 'master' into bug2977
|
2015-06-20 17:39:58 +02:00 |
|
Axel Uhl
|
f7dff83a04
|
proposal for bug 2977: X-ray down time based on race start time, not on X-ray up
|
2015-06-18 19:57:43 +02:00 |
|
Axel Uhl
|
535654593c
|
Merge branch 'master' into jbross-dependent-race-start
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.domain.test/src/com/sap/sailing/domain/test/CalculateImageSizeFromUrlTest.java
java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogEventSerializerTest.java
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml
mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml
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/ui/fragments/RaceFragment.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/dialogs/ProtestTimeDialogFragment.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/dialogs/RaceFinishingTimeDialog.java
|
2015-06-18 13:45:50 +02:00 |
|
Peter Siegmund
|
80611086a0
|
Merge branch 'master'
|
2015-06-16 16:10:23 +02:00 |
|
Steffen Schaefer
|
cd048416ee
|
Fixed calculation if an event has media
|
2015-06-15 16:04:53 +02:00 |
|
Peter Siegmund
|
f6f6a1d1b8
|
Merge branch 'master' into ubilabs--rcapp--develop
|
2015-06-15 15:06:26 +02:00 |
|
Jens Rommel
|
308bee5174
|
Fixed backward-compatibility bug with image URL migration.
|
2015-06-15 12:51:46 +02:00 |
|
fmittag
|
427b1a2263
|
replace usage of getLogoImageURL with usage of new Image descriptor for logos
|
2015-06-14 17:32:50 +02:00 |
|
fmittag
|
706c882e47
|
improved using already known image sizes in case of migration of imageURLs to new image format
|
2015-06-14 16:55:33 +02:00 |
|
fmittag
|
9decf43909
|
reworked images and videos of event -> removed double maintenance of imageURLs, videoURLs, sponsorImageURLs -> they are now always calculated from images and videos
|
2015-06-14 16:21:28 +02:00 |
|
fmittag
|
8125b4f3d4
|
bigger cleanup of image and video management of an event
|
2015-06-14 14:27:53 +02:00 |
|
fmittag
|
0e85f3c32d
|
removed methods to add or remove imageURL, sponsorImageURL and videoURLs as they are now derived always from the corresponding images and videos
|
2015-06-12 17:44:33 +02:00 |
|
Axel Uhl
|
1d1f190d73
|
fixed dependent start time test cases after the introduction of StartTimeFinderResult
|
2015-06-04 17:06:59 +02:00 |
|
fmittag
|
4a78e194a2
|
added loading and storing of the videos and load/store test
|
2015-06-04 12:59:33 +02:00 |
|
Axel Uhl
|
1cead7b0e4
|
made StartTimeFinderResult an immutable value object
|
2015-06-04 10:56:51 +02:00 |
|
Jan Broß
|
38fd4a556b
|
Implements cycle detection and StartTimeFinderResult
|
2015-06-03 14:33:26 +02:00 |
|
Jan Broß
|
02f29d1eea
|
Change return type of StartTimeFinder
|
2015-06-03 12:13:57 +02:00 |
|
Axel Uhl
|
ff5ffbb4af
|
fixed persistence for RaceLogDependentStartTimeEvent and added test case; fixed nextStatus loading for RaceLogStartTimeEvent
|
2015-06-02 17:45:38 +02:00 |
|
Axel Uhl
|
a51a8ca202
|
add race log listener only once in case a RaceState has a dependent start time
|
2015-06-02 16:55:09 +02:00 |
|
Axel Uhl
|
d4d99cb22c
|
use try/finally for locking race log iteration
|
2015-06-02 16:54:07 +02:00 |
|
Jan Broß
|
6aefd294ef
|
Fixes failing test case testInitialRegistrationOfRaceState
|
2015-06-02 12:03:53 +02:00 |
|
Peter Siegmund
|
4e1db79fa9
|
Merge branch 'master' into ubilabs--rcapp--refactoring
|
2015-06-01 16:28:19 +02:00 |
|
Axel Uhl
|
bbfdc51512
|
formatting / whitespaces only
|
2015-05-31 20:18:28 +02:00 |
|
Axel Uhl
|
bc897e982d
|
Merge branch 'master' into jbross-dependent-race-start
|
2015-05-31 16:34:33 +02:00 |
|
Axel Uhl
|
4365699ea6
|
Merge branch 'master' into bug1018
Conflicts:
java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch
java/com.sap.sailing.gwt.ui/SailingGWT.launch
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_cn.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/client/StringMessages_ru.properties
|
2015-05-30 06:41:22 +02:00 |
|
Jan Broß
|
ed0515cdc7
|
Fixes some NPEs and adds test for DependentStartTimeFinder
|
2015-05-29 16:21:22 +02:00 |
|
Jan Broß
|
52b7ec767d
|
Adds initial version of listening to other raceStates without deadlock detection
|
2015-05-29 15:21:08 +02:00 |
|
Jan Broß
|
329c0471bb
|
Removes superfluous exception
|
2015-05-29 14:45:23 +02:00 |
|
Jan Broß
|
acef2a0613
|
Rename DependentStartTimeFinder to StartTimeFinder
|
2015-05-29 13:11:47 +02:00 |
|
Jan Broß
|
a8f332f1b6
|
Adds methods for setting a dependent start time to RaceStateImpl
|
2015-05-29 10:56:49 +02:00 |
|
Jan Broß
|
636272b053
|
Merge remote-tracking branch 'origin/master' into jbross-dependent-race-start
|
2015-05-29 08:46:47 +02:00 |
|
Peter Siegmund
|
db29aab39e
|
Merge branch 'ubilabs--rcapp--develop' into ubilabs--rcapp--refactoring
|
2015-05-28 16:39:40 +02:00 |
|
Peter Siegmund
|
d0523ff71e
|
Merge branch 'master' into ubilabs--rcapp--develop
|
2015-05-28 10:54:21 +02:00 |
|
Axel Uhl
|
38d757e9ff
|
Merge branch 'master' into bug1018
|
2015-05-28 10:18:12 +02:00 |
|