Axel Uhl
fe2a45ddf7
use default implementation for TrackedRace.takesWindFix, avoiding new overrides in test mocks
2015-06-19 00:55:04 +02:00
Axel Uhl
e7604d2eab
fixed the implementation of TrackedRaceImpl.takesWindFix to let previously failing test case pass
2015-06-19 00:33:43 +02:00
Axel Uhl
71432db23f
removed redundant else / if clause
2015-06-18 23:54:07 +02:00
Axel Uhl
87a9dce9dc
fixed calculation of latestEndTimePoint in TrackedRaceImpl.takesWindFix and made variables final where possible
2015-06-18 23:52:24 +02:00
Axel Uhl
b53c5ac5ad
method rename and Javadoc
2015-06-18 23:24:42 +02:00
Axel Uhl
99c02aac2c
fixed indentation
2015-06-18 23:14:37 +02:00
Axel Uhl
92191ea00e
organized import to avoid warning
2015-06-18 22:54:00 +02:00
Axel Uhl
85a0e95f0a
Merge branch 'master' into ribdashboard
2015-06-18 22:51:57 +02:00
Axel Uhl
770e23e578
Merge branch 'master' into jbross-dependent-race-start
2015-06-18 22:38:44 +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
Axel Uhl
2cc61f15dd
Merge branch 'master' into bug2970
2015-06-18 10:47:35 +02:00
Axel Uhl
32f44fc669
more logging in case MarkPassingCalculator thread terminates / ends
2015-06-18 01:26:50 +02:00
Axel Uhl
3c87e50919
fixing commit 2973 by adding synchronization on the competitor's candidate sets
2015-06-18 01:25:45 +02:00
Axel Uhl
3f5381ec9e
don't stop mark passing calculator only because race reaches status FINISHED. More events, e.g., form the RaceLog may be coming. Fixes bug 2974.
2015-06-18 01:20:35 +02:00
Axel Uhl
1579d0ef26
fixed NPE in CandidateChooserImpl
2015-06-18 00:24:40 +02:00
Axel Uhl
39baea5873
use a synchronized set to fix bug 2973; however, now I'm seeing a NPE at a different spot. Related?
2015-06-18 00:22:08 +02:00
Alexander Ries
0f9d156fd6
removed line that sets startOfTrackingReceived at the creation of trackedRace in TrackedRegattaImpl
2015-06-17 18:09:46 +02:00
Axel Uhl
294eb92b3b
fixing bug 2970 by pulling up ranking metrics list box in regatta dialog hierarchy and using in DefaultRegattaCreateDialog
2015-06-17 17:49:08 +02:00
Alexander Ries
2d7fbc72d6
added trackedrace null check in Flexibleleaderboard remove racecolumn before detaching raceexecutionprovderfrom tracked race
2015-06-17 11:12:36 +02:00
Alexander Ries
79aeb1c8a6
sovled master merge conflicts in dashboards EventLogo
2015-06-16 22:43:12 +02:00
Alexander Ries
50e1dfd5ba
added hasRaceExecutionOrdersAttached() to TrackedRaceImpl
2015-06-16 17:51:38 +02:00
Alexander Ries
d01cc74c75
removed getRaceExecutionOrderProvider() from TrackedRace interface
2015-06-16 17:42:08 +02:00
Alexander Ries
21b67b077e
RaceExecutionOrderProvder get removed from race if racecolumn get removed from flexibleleaderboardImpl
2015-06-16 16:37:43 +02:00
Alexander Ries
a110ff1102
added getRaceExecutionOrderProvider() to TrackedRace
2015-06-16 15:51:18 +02:00
Alexander Ries
6d8b8f25eb
race now record wind if there is only startOfRace or startOfTracking set and no previous race records the wind
2015-06-16 10:28:23 +02:00
Alexander Ries
b3d9b49b4f
Merge remote-tracking branch 'origin/master' into ribdashboard
2015-06-15 09:58:06 +02:00
Alexander Ries
cbaf85766d
added boolean takesWind(Wind wind) Method to TrackedRace and did some renaming
2015-06-14 18:43:17 +02:00
fmittag
5ceacab61a
removed some unused imports
2015-06-14 17:45:10 +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
Steffen Schaefer
e675abfb2b
Merge remote-tracking branch 'origin/master' into bug2913
...
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_cn.properties
2015-06-11 11:57:32 +02:00
Nick Klose
62cc37771c
Merge remote-tracking branch 'origin/master'
2015-06-10 15:01:49 +02:00
Steffen Schaefer
775a65b8b3
Improved migration code to set image sizes if available
2015-06-09 13:08:43 +02:00
Alexander Ries
223d3120a6
Refacoring with Axel
2015-06-08 15:52:54 +02:00
Alexander Ries
60bffc923e
Added javadoc to RaceExecutionOrderProvider
2015-06-08 13:21:09 +02:00
Jan Broß
02f29d1eea
Change return type of StartTimeFinder
2015-06-03 12:13:57 +02:00
Alexander Ries
c2a11cfd3b
Solved master merge conlicts in TrackedRace and Regatta plus some of their mocks
2015-06-02 09:29:08 +02:00
Axel Uhl
cc4d8c7e04
code formatting
2015-05-31 22:39:15 +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
37544c75dc
more null safety; allow null durations in leg comparator for time-on-time ranking metric
2015-05-31 13:36:09 +02:00
Axel Uhl
429a1ace1d
added more null safety and guarded against 0.0 VMG
2015-05-31 13:19:13 +02:00
Axel Uhl
a581b24d60
Merge branch 'master' into bug1018
2015-05-30 11:06:24 +02:00
Axel Uhl
f4a59060a6
Merge branch 'master' into bug2897
2015-05-30 07:31:23 +02:00
Axel Uhl
8f46585962
Merge branch 'master' into bug1018
2015-05-30 07:05:00 +02:00
Axel Uhl
e13d2232a2
added MediaType enum literal case statements for image and unknown;
...
my impression is that so far, MediaType was primarily for video source identification, not for images; this may be a mismatch
Conflicts:
java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/media/MediaType.java
2015-05-30 07:03:07 +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
Axel Uhl
ecb4ac2ccb
Merge remote-tracking branch 'server/master'
2015-05-30 06:37:44 +02:00
Axel Uhl
65776efe1d
working towards a solution for bug 2923 by centralizing the fetching of competitors for the ranking metric; however, we don't have the leaderboard available where we need it
2015-05-29 18:30:26 +02:00
Axel Uhl
Alexander Ries
fmittag
Steffen Schaefer
Nick Klose
Jan Broß