 Axel Uhl
|
81fc752c06
|
Merge branch 'master' into mark-rounding-inference
|
2015-03-30 22:32:03 +02:00 |
|
|
Axel Uhl
|
a75a4cdef3
|
made local variable final to express it will never change
|
2015-03-30 21:55:02 +02:00 |
|
|
Axel Uhl
|
980f18914f
|
make sure that if we have a replicator to wait for then we hold on to it in case it gets nulled out in between
|
2015-03-30 21:43:28 +02:00 |
|
|
Axel Uhl
|
e75b2e1985
|
it's important to always return the same classloader; otherwise, the classes and hence the objects won't be compatible / equal
|
2015-03-30 20:56:11 +02:00 |
|
|
Axel Uhl
|
9c5978ba4f
|
notify waiters if ReplicationReceiver is stopped for any reason, setting stopped to true; example: consumer closed exception
|
2015-03-30 20:51:12 +02:00 |
|
|
Axel Uhl
|
824f975ba8
|
renamed isQueueEmpty to isQueueEmptyOrStopped; don't set thread context class loader in ReplicationReceiver: it's set in the replicable itself
|
2015-03-30 20:28:36 +02:00 |
|
|
Axel Uhl
|
26a286f243
|
re-establishing the effects of c74a3092661236b13ff0b667e1f08cc3fac11d22; need to serve the replication service's monitor properly as queue drains
|
2015-03-30 18:28:31 +02:00 |
|
|
Axel Uhl
|
943d66a2c5
|
Merge branch 'master' into bug2743
|
2015-03-30 18:28:16 +02:00 |
|
|
Axel Uhl
|
273152b0b0
|
temporarily taking back the pre-mature attempt to wait for replication queues to drain during test execution (c74a309266)
|
2015-03-30 18:27:04 +02:00 |
|
|
Axel Uhl
|
236a878910
|
Merge branch 'master' into bug2743
|
2015-03-30 18:23:54 +02:00 |
|
|
Axel Uhl
|
e8c6164f96
|
avoid NPE in TrackedRaceImpl.getLineMarksAndPositions in case the leg determining the direction in which to pass waypoint is not successfully obtained
|
2015-03-30 17:22:38 +02:00 |
|
|
Axel Uhl
|
bc232925f1
|
use boolean instead of Boolean in getPolarResults
|
2015-03-30 16:41:11 +02:00 |
|
|
Axel Uhl
|
d5ade5742d
|
fixing NPE in case polars for non-existing race are requested
|
2015-03-30 16:38:21 +02:00 |
|
|
Axel Uhl
|
5f30a0b6cb
|
removed obsolete com.sap.sse.gateway reference from sailing feature.xml
|
2015-03-30 16:33:12 +02:00 |
|
|
Axel Uhl
|
c74a309266
|
fixed bundle name for mongo driver in com.sap.sailing.feature's feature.xml
|
2015-03-30 16:30:38 +02:00 |
|
|
Axel Uhl
|
ae53d23cc1
|
adjusted versions in feature.xml, particularly of mongodb.driver and gwt.osgi
|
2015-03-30 16:24:21 +02:00 |
|
|
Axel Uhl
|
21bb26ca71
|
Merge branch 'master' into bug2743
|
2015-03-30 14:02:08 +02:00 |
|
|
Axel Uhl
|
19a70efd34
|
Merge remote-tracking branch 'server/master'
|
2015-03-30 13:20:11 +02:00 |
|
|
Axel Uhl
|
b5ea074217
|
fixing deserialization for new raceStates weak hash map in TrackedRaceImpl
|
2015-03-30 13:16:38 +02:00 |
|
|
Axel Uhl
|
9001649b99
|
fixed waiting on Replicator's queue to become empty; this avoids the AlreadyClosedExceptions, it seems, but the testWindSourcesToExcludeReplication test still fails locally
|
2015-03-30 11:50:48 +02:00 |
|
|
Axel Uhl
|
b823ed058b
|
Merge branch 'master' into bug2743
|
2015-03-30 10:45:24 +02:00 |
|
|
Axel Uhl
|
b8ef26800f
|
improved replication test logging; improved Javadoc for RaceTracker.stop(...)
|
2015-03-30 10:44:08 +02:00 |
|
|
Axel Uhl
|
aa0ed9e815
|
partly reverting commit 21d5d33f78 to see what is causing the issue in Hudson
|
2015-03-30 10:10:07 +02:00 |
|
|
Axel Uhl
|
4f18c1c366
|
use any free server port for replication servlet in test mode
|
2015-03-30 02:09:38 +02:00 |
|
|
Axel Uhl
|
3f72d71201
|
Merge branch 'master' into mark-rounding-inference
|
2015-03-29 22:19:11 +02:00 |
|
|
Axel Uhl
|
1b6688d24a
|
trying to provide a solution for bug 2741 by re-structuring how a start-covering edge is assigned a cost based on difference to start time and distance comparison
|
2015-03-29 22:03:36 +02:00 |
|
|
Axel Uhl
|
9b2c41b32d
|
some refactoring in CandidateChooserImpl to make code more readable and re-usable
|
2015-03-29 21:31:31 +02:00 |
|
|
Axel Uhl
|
7b3f8722be
|
extended the wait time for replication test even more; locally it was green for 2s wait time...
|
2015-03-29 21:22:06 +02:00 |
|
|
Axel Uhl
|
06872cc3ec
|
Merge branch 'master' into mark-rounding-inference
Conflicts:
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java
|
2015-03-29 20:11:01 +02:00 |
|
|
Axel Uhl
|
3e689182a6
|
increased timeouts for previously failing replication tests; green now locally
|
2015-03-29 19:50:31 +02:00 |
|
|
Axel Uhl
|
023731f84f
|
fixing bug regarding replication of tracked race live delay: the change of a fixed delay wasn't properly notified to listeners, therefore not replicated
|
2015-03-29 18:30:03 +02:00 |
|
|
Axel Uhl
|
21d5d33f78
|
fixing re-opened bug 2707, now also for replication-related de-serialization in RacingEventServiceImpl, using the same class loader
|
2015-03-29 18:00:07 +02:00 |
|
|
Axel Uhl
|
297f91a098
|
Merge branch 'master' into mark-rounding-inference
|
2015-03-29 17:37:34 +02:00 |
|
|
Axel Uhl
|
cd86e0b13d
|
fix for bug 2742: recognize gate start by not applying fallback racing procedure but only actual racing procedure specifications
|
2015-03-29 17:23:52 +02:00 |
|
|
Axel Uhl
|
ec066db3ac
|
try to make tests run again; need a more sophisticated fix for bug 2741
|
2015-03-27 23:29:51 +01:00 |
|
|
Axel Uhl
|
65f8d322f9
|
Merge branch 'master' into mark-rounding-inference
|
2015-03-27 21:49:02 +01:00 |
|
|
Axel Uhl
|
7f74657fe9
|
added / improved comments
|
2015-03-27 21:48:45 +01:00 |
|
|
Axel Uhl
|
90fe698ab4
|
fixed sign issue: distances can be negative if they are computed relative to a line; need to use absolute value
|
2015-03-27 21:48:37 +01:00 |
|
|
Axel Uhl
|
a865100dda
|
avoid NPE by comparing Boolean to Boolean.TRUE, avoiding auto-unboxing of null value
|
2015-03-27 21:47:55 +01:00 |
|
|
Axel Uhl
|
2a3bc02d35
|
added / improved comments
|
2015-03-27 21:28:14 +01:00 |
|
|
Axel Uhl
|
ac57f14c1c
|
fixed sign issue: distances can be negative if they are computed relative to a line; need to use absolute value
|
2015-03-27 19:19:13 +01:00 |
|
|
Axel Uhl
|
7374531f98
|
avoid NPE by comparing Boolean to Boolean.TRUE, avoiding auto-unboxing of null value
|
2015-03-27 19:02:41 +01:00 |
|
|
Axel Uhl
|
3696888b98
|
fix for bug 2714 except for gate start: evaluating time gap between start time and start mark passing candidate --> closer means higher probability
|
2015-03-27 18:13:13 +01:00 |
|
|
Axel Uhl
|
7fb7a09188
|
tiny fix in toString reprensetation of CandidateImpl
|
2015-03-27 16:58:17 +01:00 |
|
|
Axel Uhl
|
fd0f6eadcf
|
fixed use of time point from fixed mark passing specification when reading from race log; minor refactoring saving a few HashMap look-ups
|
2015-03-27 16:28:50 +01:00 |
|
|
Axel Uhl
|
ba47883a59
|
Merge branch 'master' into mark-rounding-inference
Conflicts:
java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/MarkPassingUpdateListener.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java
|
2015-03-27 15:39:19 +01:00 |
|
|
Axel Uhl
|
3bfe5c149a
|
added short info to mark passing-related race log events; formatting; refactored common parts in CandidateFinderImpl
|
2015-03-27 15:36:59 +01:00 |
|
|
Axel Uhl
|
74e82c806c
|
Merge branch 'master' into mark-rounding-inference
|
2015-03-27 14:23:04 +01:00 |
|
|
Axel Uhl
|
7bbd9cf472
|
removed offending flag image
|
2015-03-27 14:21:56 +01:00 |
|
|
Axel Uhl
|
226b2da89b
|
in streamlet updates related to wind track resolution checks
|
2015-03-27 09:47:57 +01:00 |
|
|
Axel Uhl
|
26ad184a9f
|
fixing simulator issue with loading finished callbacks; loading finished callbacks are now notified immediately when simulator is running
|
2015-03-26 17:50:19 +01:00 |
|
|
Axel Uhl
|
9570a5d3f0
|
allow multiple loading completion listeners to subscribe at the same last event in queue
|
2015-03-26 17:41:47 +01:00 |
|
|
Axel Uhl
|
1d4d9640a0
|
also wait for queues to drain in TracTrac connector in non-preemptive stop(...) call
|
2015-03-26 16:54:11 +01:00 |
|
|
Axel Uhl
|
878b90eb89
|
perform check for completeness and status change from LOADING to TRACKING *after* setting the default LOADING state
|
2015-03-26 16:51:18 +01:00 |
|
|
Axel Uhl
|
ce4fabbaf2
|
Merge branch 'master' into bug2729
|
2015-03-26 16:36:49 +01:00 |
|
|
Axel Uhl
|
2bab13901d
|
use only fixes between start end end of tracking for mark passing calculation; preparing for a solution for bug 2737, allowing explicit start/endOfTracking to be set for a race
|
2015-03-26 15:58:30 +01:00 |
|
|
Axel Uhl
|
275c208b57
|
avoid NPE in XTE calculation of CandidateFinderImpl
|
2015-03-26 15:43:13 +01:00 |
|
|
Axel Uhl
|
d07ca4a2ea
|
complete fixing StringMessages after merge issues
|
2015-03-26 15:38:53 +01:00 |
|
|
Axel Uhl
|
d1334aaed1
|
restored StringMessages after massive merge problems
|
2015-03-26 15:37:27 +01:00 |
|
|
Axel Uhl
|
8d8ae6f16c
|
fixed merge issues such as references to the security infrastructure that changed
|
2015-03-26 15:01:40 +01:00 |
|
|
Axel Uhl
|
e1e047bd75
|
Merge branch 'master' into mark-rounding-inference
Conflicts:
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/WindTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/AbstractMockedRaceMarkPassingTest.java
java/com.sap.sailing.domain/META-INF/MANIFEST.MF
java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/CandidateFinder.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRace.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java
java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/regattaanalytics/RegattaAnalyticsDataManager.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/seriesanalytics/EventSeriesAnalyticsDataManager.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java
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_de.properties
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java
|
2015-03-26 14:51:48 +01:00 |
|
|
Axel Uhl
|
ad88cc2190
|
fixed issue with TimePoint arithmetic for inclusive intervals: adding 1ms to EndOfTime results in wrap-around and therefore empty intervals
|
2015-03-26 14:34:39 +01:00 |
|
|
Axel Uhl
|
f137e34315
|
offer show regatta log action also for race log tracking leaderboard list
|
2015-03-26 13:47:03 +01:00 |
|
|
Axel Uhl
|
385d213629
|
offer regatta log dialog
|
2015-03-26 13:41:06 +01:00 |
|
|
Axel Uhl
|
ac181a79e5
|
reverted quick fix for start/end of tracking setting during race log tracking
|
2015-03-26 11:43:11 +01:00 |
|
|
Axel Uhl
|
ab521dfb78
|
quick fix for start/end of tracking with race log tracking
|
2015-03-26 11:42:43 +01:00 |
|
|
Axel Uhl
|
74801f78e0
|
use ConcurrentHashMap instead of synchronized for competitorMappings and markMappings
|
2015-03-26 11:41:18 +01:00 |
|
|
Axel Uhl
|
0ef534d450
|
load Igtimi wind up to "now" when no end timpoint can be determined otherwise
|
2015-03-26 11:39:53 +01:00 |
|
|
Axel Uhl
|
ff3b6d4b0c
|
implemented DB migration from erroneous RACE_LOG_FROM/RACE_LOG_TO to REGATTA_LOG_FROM/REGATTA_LOG_TO
|
2015-03-26 08:06:01 +01:00 |
|
|
Axel Uhl
|
7ecfb6a5cf
|
fix for bug 2736: treat null distance properly
|
2015-03-25 23:01:12 +01:00 |
|
|
Axel Uhl
|
03b329a461
|
further work towards bug 2733, adding migration of deprecated RACE_LOG_FROM/RACE_LOG_TO time stamps in regatta logs
|
2015-03-25 23:00:33 +01:00 |
|
|
Axel Uhl
|
d5906b3179
|
first part of the fix for bug 2733: regatta log device mapping entries now use REGATTA_LOG_FROM/REGATTA_LOG_TO instead of RACE_LOG_FROM/RACE_LOG_TO.
|
2015-03-25 22:58:46 +01:00 |
|
|
Axel Uhl
|
41d1fd5266
|
show additional action items in RaceLog Tracking race column/fleet table
|
2015-03-25 13:48:40 +01:00 |
|
|
Axel Uhl
|
9e0fc72b42
|
made member private
|
2015-03-25 13:36:52 +01:00 |
|
|
Axel Uhl
|
f6d4e42aa7
|
updated release notes for new chart and column types
|
2015-03-25 13:36:33 +01:00 |
|
|
Axel Uhl
|
f04fb321a2
|
improved Igtimi logging in case HDG/HDGM are missing
|
2015-03-25 13:36:15 +01:00 |
|
|
Axel Uhl
|
f229b5a127
|
removed warnings by consolidating imports
|
2015-03-25 13:35:58 +01:00 |
|
|
Axel Uhl
|
c72792595d
|
clean up dist/ in release builds before build starts; avoid disk space leak
|
2015-03-24 23:10:41 +01:00 |
|
|
Axel Uhl
|
eb5cd532a7
|
introduced trackWind/correctByDeclination checkboxes in race log tracking tab, fixing bug 2727
|
2015-03-24 18:25:43 +01:00 |
|
|
Axel Uhl
|
c9d9a59ea1
|
implementing solution for bug 2728: adding last known position to marks list
|
2015-03-24 17:10:44 +01:00 |
|
|
Axel Uhl
|
05e500e95c
|
making mockable method public again; Mockito under Maven just can't do it otherwise
|
2015-03-24 14:32:24 +01:00 |
|
|
Axel Uhl
|
badbd749cd
|
consolidated imports to avoid warnings
|
2015-03-24 11:34:50 +01:00 |
|
|
Axel Uhl
|
5f8ceb6028
|
worked again on scoping the getRaceLogTrackingAdapter() method on LeaderboardResource more restrictively
|
2015-03-24 11:34:20 +01:00 |
|
|
Axel Uhl
|
9a81fe3e70
|
Merge branch 'jbross-buoy-tender'
Conflicts:
java/com.sap.sailing.dashboards.gwt/SailingDashboardsGWT sdm.launch
|
2015-03-24 11:16:47 +01:00 |
|
|
Axel Uhl
|
61945077a0
|
making method public to allow mocking (?)
|
2015-03-24 07:38:39 +01:00 |
|
|
Axel Uhl
|
6fd30c5725
|
improved web service documentation
|
2015-03-23 23:17:01 +01:00 |
|
|
Axel Uhl
|
ab0db8057a
|
slightly restructured tests that needed to see a method from the host bundle; made package protected
|
2015-03-23 23:01:13 +01:00 |
|
|
Axel Uhl
|
f8f3170daf
|
some comment changes
|
2015-03-23 22:48:58 +01:00 |
|
|
Axel Uhl
|
9b4babe883
|
removed flag PNG accidentally added; made method private that no-one else needs to see in TrackedRaceImpl
|
2015-03-23 22:41:32 +01:00 |
|
|
Axel Uhl
|
8267c32263
|
improved Javadoc for new TrackedRace.getTrack(Mark) and old TrackedRace.getOrCreateTrack(Mark); use new getTrack(Mark) in RacingEventServiceImpl
|
2015-03-23 22:30:30 +01:00 |
|
|
Axel Uhl
|
29284adfa4
|
consolidated acquisition of mark position from tracked races, regatta log and race logs
|
2015-03-23 22:25:40 +01:00 |
|
|
Axel Uhl
|
7500d8ed96
|
fixing the broken test for mark pinging; improved how mark tracks are located when pinging and how outlier avoidance is implemented
|
2015-03-23 21:33:56 +01:00 |
|
|
Axel Uhl
|
911cdeb86b
|
Merge branch 'master' into jbross-buoy-tender
Conflicts:
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java
|
2015-03-23 20:52:00 +01:00 |
|
|
Axel Uhl
|
21343eb3bd
|
Merge remote-tracking branch 'origin/bug2685'
|
2015-03-23 20:40:41 +01:00 |
|
|
Axel Uhl
|
cf99ef2c68
|
Merge branch 'bug2724' into jbross-buoy-tender
|
2015-03-23 18:20:51 +01:00 |
|
|
Axel Uhl
|
f6604516b6
|
changed which gwt modules get compiled locally
|
2015-03-23 18:20:39 +01:00 |
|
|
EC2 Server
|
9455b13f84
|
adjusted raceColumn to race_column
|
2015-03-23 17:14:47 +00:00 |
|
|
EC2 Server
|
afaea9a66d
|
adjusted URL after renaming raceColumn to race_column
|
2015-03-23 17:11:45 +00:00 |
|
|
Axel Uhl
|
fe46823c24
|
fixing bug 2724 by introducing Set to collect marks
|
2015-03-23 17:39:37 +01:00 |
|
|
Axel Uhl
|
60e1499b50
|
changed format and raceColumn parameter name for marks listing service
|
2015-03-23 17:25:45 +01:00 |
|