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
d7a3fca6eb
moved assertion where it belongs: don't compare windward distances when one competitor has already finished the leg;
...
the marks may move, hence giving different windward distances for different time points for the same leg
2015-05-29 17:54:56 +02:00
fmittag
b642a882fa
Merge remote-tracking branch 'origin/master' into design2015
...
Conflicts:
java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch
java/com.sap.sailing.gwt.ui/SailingGWT.launch
2015-05-29 18:30:33 +03:00
Axel Uhl
d19b853152
fixed SailingGWT sdm.launch regarding regatta overview
2015-05-29 17:27:40 +02:00
Axel Uhl
8c411bf6e2
Merge branch 'master' into bug1018
...
Conflicts:
java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch
java/com.sap.sailing.gwt.ui/SailingGWT.launch
2015-05-29 16:51:59 +02:00
Axel Uhl
9aba87a8a8
Merge remote-tracking branch 'server/master'
2015-05-29 16:49:56 +02:00
Axel Uhl
3ffd736edf
fixed case where a competitor was identified as farthest ahead but hasn't started a leg for which a comparator is requested
2015-05-29 15:22:35 +02:00
Axel Uhl
6a3c4e1bae
added more null safety for unstarted races
...
Conflicts:
mobile/github-advrecyclerview_lib/.settings/org.eclipse.jdt.core.prefs
2015-05-29 14:50:05 +02:00
Jan Broß
329c0471bb
Removes superfluous exception
2015-05-29 14:45:23 +02:00
Axel Uhl
3f354f6417
fixed column list, fixing RACE_CALCULATED_TIME_AT_ESTIMATED_ARRIVAL_AT_COMPETITOR_FARTHEST_AHEAD
2015-05-29 14:22:35 +02:00
Axel Uhl
0dbfaba524
fixed live time for getQuickRanks(); added several null checks for cases where competitors haven't started their legs yet
2015-05-29 14:17:58 +02:00
Axel Uhl
1a6663af45
Merge branch 'master' into bug1018
2015-05-29 13:17:18 +02:00
Axel Uhl
c835c70275
fix attempt for bug 2922: deadlock due to TrackedRaceImpl.getMarkPassing locking the competitor mark passing collection;
...
the updateMarkPassing method locks competitor mark passings first, then the waypoint mark passings, while holding on to
the competitor mark passing collection's lock. Therefore, acquiring the competitor mark passing collection's lock is more
dangerous in "inner" methods that don't require more locks because callers may already hold on to the waypoint mark passing
lock, causing a deadlock with updateMarkPassing.
2015-05-29 13:16:12 +02:00
Jan Broß
acef2a0613
Rename DependentStartTimeFinder to StartTimeFinder
2015-05-29 13:11:47 +02:00
Jan Broß
48fd80919f
Simplifies accessing raceLog on Leaderboards
2015-05-29 11:10: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
Axel Uhl
9c5bf2c3b1
switched from "windward distance to leader" to "windward distance to competitor farthest ahead"
2015-05-28 17:10:04 +02:00
Axel Uhl
f522527d65
accelerated chart calculations by pre-calculating RankingInfo beforehand, then sharing
2015-05-28 16:12:09 +02:00
Axel Uhl
c9a43c5781
cache leg info about boat farthest ahead and calculate and cache the leader by calculated time for the leg in RankingInfo
2015-05-28 15:15:36 +02:00
Axel Uhl
f11c534892
compute current VMG only if average VMG is not available
2015-05-28 14:33:09 +02:00
Axel Uhl
e4e00fa228
turned competitorTracksOrderedByRank into a ConcurrentHashMap, avoiding synchronization
2015-05-28 14:32:35 +02:00
Frederik Petersen
18ec962a05
Merge both tacks in polar service
2015-05-28 14:24:32 +02:00
Axel Uhl
30a3b66c53
default time-on-time and time-on-distance values to 1.0 / 0.0, respectively, in BaseRegattaLinkImpl
2015-05-28 11:41:45 +02:00
Alexander Ries
5356f59bdb
return empty list instead of null if no values in getPrevousRacesInExecutionOrder()
2015-05-28 10:55:14 +02:00
Axel Uhl
82757a685c
pass RankingInfo through to getLegGapToLegLeaderInOwnTime as a preparation for a performance fix
2015-05-28 10:54:39 +02:00
Axel Uhl
38d757e9ff
Merge branch 'master' into bug1018
2015-05-28 10:18:12 +02:00
Steffen Schaefer
e07c585934
Merge remote-tracking branch 'origin/master' into design2015
...
Conflicts:
java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch
java/com.sap.sailing.gwt.ui/SailingGWT.launch
2015-05-28 09:55:11 +02:00
Alexander Ries
e1fb488635
Merge remote-tracking branch 'origin/master' into ribdashboard
2015-05-28 09:20:27 +02:00
Axel Uhl
11fd9f907d
getTrackedRaces() now also checks for write lock count
2015-05-28 00:23:02 +02:00
fmittag
Steffen Schaefer
Nick Klose
Alexander Ries
Jan Broß
Axel Uhl
Frederik Petersen