Commit Graph
100 Commits
Author SHA1 Message Date
Axel Uhl 552fa6b07b added necessary locking before asking the raw fixes on tracks 2015-06-17 18:19:35 +02:00
Axel Uhl 8691ec0e7b added total distance traveled to EventStatisticsDTO 2015-06-17 16:18:31 +02:00
Axel Uhl 6ece53bb6d added number of GPS fixes, wind fixes and max speed to EventStatisticsDTO 2015-06-17 16:17:24 +02:00
Axel Uhl 0960c79835 Merge branch 'ubilabs--rcapp--master' 2015-06-17 15:01:42 +02:00
Axel Uhl f7d263a003 Merge remote-tracking branch 'server/master' 2015-06-17 15:00:44 +02:00
Axel Uhl 84de683a82 fixed imports to keep things compilable 2015-06-17 01:23:56 +02:00
Axel Uhl 3a698ab60d Merge branch 'master' into ubilabs--rcapp--develop
Conflicts:
	mobile/com.sap.sailing.android.shared/src/com/sap/sailing/android/shared/services/sending/ConnectivityChangedReceiver.java
2015-06-17 01:05:03 +02:00
Axel Uhl 5694d330dd Merge remote-tracking branch 'server/master' 2015-06-17 01:02:35 +02:00
Axel Uhl fe03b5f3fd manually cherry-picked the essential NPE avoidance from commit 612191da42 into master 2015-06-17 00:57:59 +02:00
Axel Uhl 0c76ad12ab factoring commonalities between the different onReset() implementations and (temporarily?) re-activating the "Reload" menu item 2015-06-16 23:44:26 +02:00
Axel Uhl ade3c5aed0 letting SessionActivity handle the reload menu item 2015-06-16 23:27:25 +02:00
Axel Uhl e76a8a954e some Javadoc 2015-06-16 23:22:40 +02:00
Axel Uhl 91cbb8b9d6 keep onReset() in LoginActivity alive in case the "Reload" menu item is re-activated 2015-06-16 22:53:12 +02:00
Axel Uhl 8a14c0a35f Merge branch 'ubilabs--rcapp--develop' into ubilabs--rcapp--bug-2777-proposal
Conflicts:
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/SessionActivity.java
2015-06-16 22:40:33 +02:00
Axel Uhl fe18bbeceb organized imports to avoid warnings
Conflicts:
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/SessionActivity.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/preference/GeneralPreferenceFragment.java
2015-06-16 22:39:10 +02:00
Axel Uhl 542df85766 Merge branch 'ubilabs--rcapp--develop' into ubilabs--rcapp--bug-2777-proposal 2015-06-16 22:37:33 +02:00
Axel Uhl 52c7c5806f organized imports to avoid warnings 2015-06-16 22:23:55 +02:00
Axel Uhl 430d31b75a Merge branch 'master' into ubilabs--rcapp--bug-2777-proposal 2015-06-16 21:46:33 +02:00
Axel Uhl 87e10b6b65 Merge branch 'master' into ubilabs--rcapp--develop 2015-06-16 21:42:20 +02:00
Axel Uhl c284747c2f removed obsolete .project file from com.sap.sailing.mongodb 2015-06-16 21:41:53 +02:00
Axel Uhl 65fdf3ba56 consolidated imports 2015-06-16 21:22:53 +02:00
Axel Uhl ddc738d5a5 added null safety to RaceSummaryFragment after having seen NPEs in debug mode when a race is reset while showing the summary fragment 2015-06-16 21:16:07 +02:00
Axel Uhl 113f5fd5f6 trying to fix aspect of bug 2953 explained in comment #12 2015-06-16 16:56:04 +02:00
Axel Uhl fa1558030a added comment on bug 2953 regarding InMemoryDataStore.INSTANCE.reset() invocation 2015-06-16 16:45:31 +02:00
Axel Uhl 56e8cdad4d consolidated imports to avoid warnings 2015-06-16 16:40:34 +02:00
Axel Uhl 184a476270 Fixed some Wiki typos 2015-06-16 07:43:13 +00:00
Axel Uhl 5876415287 More launch --> lounge replacements 2015-06-16 07:33:12 +00:00
Axel Uhl db44d1bc96 Typo (launch --> lounge) 2015-06-16 07:29:02 +00:00
Axel Uhl 6314d20a6a Merge remote-tracking branch 'server/master' 2015-06-11 18:50:46 +02:00
Axel Uhl c3ed992d0e fixing bug 2965: map doesn't zoom at race start which in fact was caused by a NPE trying to auto-unbox a null Integer to an int, finding out leg of competitor 2015-06-11 18:48:58 +02:00
Axel Uhl f0b98c260a added suggested course area names "Kilo" and "TV" 2015-06-11 12:49:29 +02:00
Axel Uhl 8674d5ba9b avoid two more warnings 2015-06-11 00:34:58 +02:00
Axel Uhl a00a48d989 Merge remote-tracking branch 'origin/master' 2015-06-09 16:46:16 +02:00
Axel Uhl c5ba2d0374 fixed issue in device configuration: activation of individual recall for regatta configurations didn't show properly in activated checkbox 2015-06-09 16:42:26 +02:00
Axel Uhl 9c4d8de148 fixed issue in device configuration: activation of individual recall for regatta configurations didn't show properly in activated checkbox 2015-06-09 16:28:27 +02:00
Axel Uhl d7d9a701e6 suppress all warnings that occurred in com.h6ah4i.android.widget.advrecyclerview which is an external project we don't maintain locally 2015-06-09 00:12:22 +02:00
Axel Uhl e42666802b use placekitten.com instead of placeholder.it which recently has proven to be a bit unreliable 2015-06-06 20:45:33 +02:00
Axel Uhl 69ccf01c14 bug 2932 fixed (typo in german string messages) 2015-06-06 17:03:16 +02:00
Axel Uhl 41e44b42dd Merge remote-tracking branch 'server/master' 2015-06-01 15:39:11 +02:00
Axel Uhl d58da9df13 fixed test case which now requires a valid VMG for which two fixes per competitor are required 2015-05-31 16:15:16 +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 1b743d9371 Merge branch 'master' into bug1018
Conflicts:
	java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch
2015-05-31 10:06:07 +02:00
Axel Uhl a581b24d60 Merge branch 'master' into bug1018 2015-05-30 11:06:24 +02:00
Axel Uhl 5883d19681 The fix for bug 2897 has slightly altered the timings; waiting 1s for tracked race to be assigned to the race column 2015-05-30 08:49:03 +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 044ae48875 added some null-safety to polar service 2015-05-30 06:33:28 +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
Axel Uhl d19b853152 fixed SailingGWT sdm.launch regarding regatta overview 2015-05-29 17:27:40 +02:00
Axel Uhl 80c8e3be9b fixed SailingGWT launches to design2015 branch's state 2015-05-29 17:12:28 +02:00
Axel Uhl 62eb098b0b fixed another name from "Corrected" to "Calculated" 2015-05-29 17:11:44 +02:00
Axel Uhl 1cfcfba100 renamed classes for calculated times from "Corrected" to "Calculated" 2015-05-29 17:04:15 +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
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
Axel Uhl 01f3c3050b added missing file QuickRanksDTO 2015-05-29 09:14:58 +02:00
Axel Uhl 53f1e1b7d6 fixed windward distance so it's not to the leader but to the boat farthest ahead 2015-05-28 19:28:33 +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
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
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
Axel Uhl 11fd9f907d getTrackedRaces() now also checks for write lock count 2015-05-28 00:23:02 +02:00
Axel Uhl 00b4a76f1c working on a solution for bug 2897: introduced NamedReentrantReadWriteLock for TrackedRegattaImpl.trackedRaces and notify listeners outside of locked area 2015-05-27 18:24:49 +02:00
Axel Uhl 5d1322746a Merge branch 'master' into bug2897 2015-05-27 18:00:09 +02:00
Axel Uhl df3deb1a15 fixed bracing/indentation after cherry-picking commit 8cf239e31a 2015-05-27 17:59:22 +02:00
Axel Uhl 6a20efa1d9 fixing bug 2906: wind listeners didn't get de-registered proprely when removing a race and when re-starting the wind status servlet;
this should solve the problem with duplicate key exceptions hammering the DB

Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/impl/WaypointPositionAndDistanceCache.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/ranking/AbstractRankingMetric.java
2015-05-27 17:57:20 +02:00
Axel Uhl b2f524c60e added handling of IRace.isInitialized() in RaceStartedAndFinishedReceiver which nulls out timings if isInitialized()==false; see bug 2895 2015-05-27 17:29:17 +02:00
Axel Uhl a6fa795f1f enhanced Javadoc and REST API doc for target time estimation 2015-05-27 17:29:07 +02:00
Axel Uhl 560eb61431 fixed bug 1447 by removing columns first, then inserting with index
Conflicts:
	java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch
2015-05-27 17:28:45 +02:00
Axel Uhl 19c54b8076 started to work on bug 1447 by adding Series.addRaceColumn flavor that accepts an insert index
Conflicts:
	java/com.sap.sailing.gwt.ui/.settings/com.google.gwt.eclipse.core.prefs
	java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch
2015-05-27 17:28:14 +02:00
Axel Uhl 6830d26571 use NamedReentrantReadWriteLock for accessing LeaderboardGroup.leaderboards collection; works towards solving bug 2897 2015-05-27 16:52:44 +02:00
Axel Uhl c07ed0fa71 updated the TracAPI 3.0.11 readme file 2015-05-27 15:59:04 +02:00
Axel Uhl e929fc12e0 updated TracAPI form 3.0.10 to 3.0.11; here to the release notes:
We have released a new version of the TracAPI 3.0.11 that is is 100%
compatible with the previous 3.0.x releases [1].

This is a final version. It fixes bugs in the implementation and it adds
a some features. These features add methods to the API, but they keep
the backward compatibility. This version provides a new JavaDoc version [2].

  1) Features

  - Adding the method IRace.setInitialized(boolean) that allows to load
control point positions although the race is not initialized (Requested
by Jorge Piera, 17/05/2015)

  1) Bugs

   - The subscription library sends (per each control point) an
"ControlPointPosition" event with the positions  of the parameters with
a time stamp equals to the tracking start time. If the control  point
is static (it doesn't have a tracker), it means that this control won't
exist until the tracking start time arrives: it is  not possible to open
a subscription connection before the tracking start time and see the
control point. But  if the control is static,  it has to exist during
all the event. Now when a control is static, the subscription library
sends a "ControlPointPosition" event with the event start time and then
it sends other "ControlPointPosition"  event with the tracking start
time. It allows to connect with future races and see the static controls
(Requested by Jakob Odum, 25/02/2015)

  - It is possible to add two or more subscriptions for the same
subscriber (Reported by Jorge Piera, 02/05/2015)

  - If a race is in a not initialized state and it is loaded using the
parameters file, the library assumes that the consumer application wants
to load the race and it changes its initialized attribute to true. This
assumption is  wrong. Now, if a race is not initialized it will continue
being uninitialized until the event administrator changes its state to
initialized (Reported by Axel Uhl, 17/05/2015)
2015-05-27 14:44:23 +02:00
Axel Uhl 61db1c7974 whitespace change only 2015-05-27 14:43:58 +02:00
Axel Uhl d53c96bc1a fixed BoatClassImageResolver after renaming the PIRAT boat class master data literal to PIRATE 2015-05-27 12:18:48 +02:00
Axel Uhl 73bce9c196 renamed "PIRAT" boat class master data to "PIRATE" 2015-05-27 09:35:19 +02:00
Axel Uhl bdfc52566f Merge branch 'master' into ubilabs--ios--develop 2015-05-26 15:28:10 +02:00
Axel Uhl 8cf239e31a fixing bug 2906: wind listeners didn't get de-registered proprely when removing a race and when re-starting the wind status servlet;
this should solve the problem with duplicate key exceptions hammering the DB
2015-05-25 13:32:32 +02:00
Axel Uhl 7e1c676c47 consolidated imports after rcapp merge to avoid warnings 2015-05-24 18:20:39 +02:00
Axel Uhl b1d7943f1d Merge branch 'ubilabs--rcapp--develop' into yes2015
Conflicts:
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/RacingActivity.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/raceinfo/RaceFlagViewerFragment.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/StartTimeFragment.java
2015-05-24 18:17:37 +02:00
Axel Uhl 8044eea8de Merge remote-tracking branch 'server/yes2015-with-design2015' into yes2015 2015-05-24 17:35:51 +02:00
Axel Uhl 6838581af5 added handling of IRace.isInitialized() in RaceStartedAndFinishedReceiver which nulls out timings if isInitialized()==false; see bug 2895 2015-05-24 15:11:31 +02:00
Axel Uhl 0ff04f1548 enhanced Javadoc and REST API doc for target time estimation 2015-05-24 13:49:34 +02:00
Axel Uhl 34f34ee940 Merge remote-tracking branch 'server/ubilabs--rcapp--develop' into yes2015 2015-05-24 07:58:14 +02:00
Axel Uhl 73bd044d86 fixed issue in device configuration: activation of individual recall for regatta configurations didn't show properly in activated checkbox 2015-05-23 23:48:22 +02:00
Axel Uhl 82bde5e456 Merge remote-tracking branch 'server/yes2015' into yes2015 2015-05-23 22:38:00 +02:00