Axel Uhl
|
976cc7d9be
|
Merge branch 'master' into mark-rounding-inference
|
2015-03-31 16:28:42 +02:00 |
|
Axel Uhl
|
29aeccc612
|
fixed two bugs in RaceTimePanel/SliderBar relating to marker redraw; this was mostly a copy/paste problem with the drawTicks and drawMarkers methods
|
2015-03-31 16:27:17 +02:00 |
|
Peter Siegmund
|
99d767d1b0
|
Gradle: create build info in assets folder while build - no compile error within Eclipse - with helper function in AppUtils
|
2015-03-31 15:54:23 +02:00 |
|
Peter Siegmund
|
c1e64cc20b
|
Merge branch 'ubilabs--rcapp--develop' of ssh://sapsailing.com/home/trac/git into ubilabs--rcapp--develop
|
2015-03-31 15:05:21 +02:00 |
|
Peter Siegmund
|
030f130a8d
|
RCApp: Race Summary duration
|
2015-03-31 15:05:15 +02:00 |
|
Axel Uhl
|
49f437f17b
|
using an AbsolutePanel for the EditMarkPassings panel, solving bug 2611 regarding jerky resize behavior
|
2015-03-31 13:09:54 +02:00 |
|
Axel Uhl
|
3710f75916
|
updating waypoint list for mark passings in-place instead of replacing the list; fixes bug 2614
|
2015-03-31 10:20:44 +02:00 |
|
Axel Uhl
|
8ca96536dc
|
Merge branch 'master' into ubilabs--rcapp--develop
|
2015-03-31 07:46:34 +02:00 |
|
Axel Uhl
|
81fc752c06
|
Merge branch 'master' into mark-rounding-inference
|
2015-03-30 22:32:03 +02:00 |
|
Axel Uhl
|
590c479850
|
Merge remote-tracking branch 'server/ubilabs--rcapp--develop' into ubilabs--rcapp--develop
|
2015-03-30 22:08:06 +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 |
|
Peter Siegmund
|
147b94ff04
|
Gradle: preBuild taks generates git.xml in res - usable with getString(R.string.git_hash)
|
2015-03-30 15:56:49 +02:00 |
|
Peter Siegmund
|
cca4a4259c
|
RCApp: added missing translation
|
2015-03-30 15:34:14 +02:00 |
|
Peter Siegmund
|
15f41832a7
|
RCApp: show race summary
|
2015-03-30 15:10:51 +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 |
|
Alexander Ries
|
25c6fb0052
|
Merge remote-tracking branch 'origin/master' into ribdashboard
|
2015-03-30 13:02:59 +02:00 |
|
Alexander Ries
|
4034db48cc
|
removed possible null pointer in ribdashboardservice when loading competitors from leaderboard
|
2015-03-30 13:00:42 +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 |
|
Peter Siegmund
|
e03cae1d39
|
Merge branch 'master' into ubilabs--rcapp--develop
|
2015-03-30 10:47:18 +02:00 |
|
Peter Siegmund
|
bd384e10e4
|
RCApp: new race finished layout; unused images deleted
|
2015-03-30 10:46:53 +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 |
|