Axel Uhl
16e7ba3a81
Merge branch 'master' into tw2015
...
Conflicts:
java/com.sap.sailing.gwt.ui/SailingGWT.launch
2015-07-13 16:49:59 +02:00
Axel Uhl
7849cab0d5
fixed TAIFUN icon
2015-07-13 16:47:20 +02:00
Axel Uhl
4fb7991491
fixed regatta filter by leaderboard group in case leaderboard group is empty
2015-07-13 16:43:51 +02:00
Axel Uhl
94747760e2
extended wait period from 60s to 120s for Selenium tests
2015-07-13 16:16:10 +02:00
Axel Uhl
906aaa8762
fixing bug 3105: leaderboard group selection was inconsistent after renaming it
2015-07-13 16:01:22 +02:00
Axel Uhl
f513d6ded4
Merge branch 'design2015' into tw2015
2015-07-13 15:12:39 +02:00
Axel Uhl
174a24533a
Merge branch 'master' into tw2015
2015-07-13 13:19:08 +02:00
Axel Uhl
08dc922f52
added missing boat classes and boat class icons for TW2015
2015-07-13 13:17:33 +02:00
Axel Uhl
ffdf958348
fixed wind direction for test
2015-07-11 18:06:38 +02:00
Axel Uhl
a654bf7638
fixed compile error around getSailorInfoWebsiteURL in mobile EventActivity
2015-07-11 17:08:31 +02:00
Axel Uhl
edfa660635
Merge branch 'master' into design2015
2015-07-11 17:06:16 +02:00
Axel Uhl
9e840d1066
Merge remote-tracking branch 'server/master'
2015-07-11 16:46:37 +02:00
Axel Uhl
0f584552fd
bug3102: fixed locking in TrackedRegattaImpl.getTrackedRace(RaceDefinition), avoiding deadlock in case race is currently being loaded/added
2015-07-11 16:42:01 +02:00
Axel Uhl
1149a27686
Updated racelog tracking (markdown)
2015-07-10 20:41:46 +00:00
Axel Uhl
b36583225b
fixing bug 3101 by cropping wind queries to startOfTracking and endOfTracking / timePointOfNewestEveng
2015-07-10 22:27:04 +02:00
Axel Uhl
5da3c1576a
Updated smartphone tracking (markdown)
2015-07-10 13:10:57 +00:00
Axel Uhl
c7d8143925
Updated smartphone tracking (markdown)
2015-07-10 09:48:00 +00:00
Axel Uhl
d8970e10c1
Updated smartphone tracking (markdown)
2015-07-10 09:45:22 +00:00
Axel Uhl
0f33b69dc2
Updated home (markdown)
2015-07-10 09:26:22 +00:00
Axel Uhl
9587ac288f
Merge branch 'master' into tw2015
2015-07-10 10:33:43 +02:00
Axel Uhl
ec1e7bfe05
fixed boat class symbol for TRIAS; added alias names for International 14 boat class
2015-07-10 10:32:55 +02:00
Axel Uhl
9d652b0aa7
added failing test case for bug 3086 that is greened by the fix of the previous commit
2015-07-10 10:22:37 +02:00
Axel Uhl
d920ca9b0b
clarified WeakRaceLogChangedVisitor constructor behavior by adding a Javadoc comment
2015-07-10 10:14:50 +02:00
Axel Uhl
fd626e2db5
first part of a fix for bug 3086: added missing WeakRaceLogChangedVisitor registration as listener on race log
2015-07-10 10:07:21 +02:00
Axel Uhl
a5e3da5969
Merge branch 'design2015' into tw2015
2015-07-10 09:28:02 +02:00
Axel Uhl
42fe97827f
Merge branch 'master' into tw2015
2015-07-10 00:38:49 +02:00
Axel Uhl
d50e4495a2
fixed Laser2 image resource / file name
2015-07-10 00:38:00 +02:00
Axel Uhl
571b437265
added boat classes D_ONE, KIELZUGVOGEL, LASER2, O_JOLLE and TRIAS
2015-07-10 00:08:46 +02:00
Axel Uhl
879df81691
Updated amazon ec2 (markdown)
2015-07-09 18:55:40 +00:00
Axel Uhl
50b4344a6f
Merge branch 'design2015' into tw2015
2015-07-09 10:57:41 +02:00
Axel Uhl
8dc26fe410
Merge remote-tracking branch 'server/master'
2015-07-09 10:17:15 +02:00
Axel Uhl
01e83a2024
include dependent start time JSON deserializer in RaceLogEventDeserializer
2015-07-09 10:16:35 +02:00
Axel Uhl
7d5d083a40
renamed clumsy "windward distance ..." simply to "gap"
2015-07-09 10:11:44 +02:00
Axel Uhl
851e19e85f
added defaultSerialVersionUID for new race log event classes for start/stop tracking
2015-07-08 22:03:34 +02:00
Axel Uhl
c7d7dcff5a
use Duration for protest time; left hint to bug 3089
2015-07-08 19:10:51 +02:00
Axel Uhl
155acde4f6
bug 3085: added fleet colors Purple, Neon Green and Orange for Travemuender Woche
2015-07-08 16:39:57 +02:00
Axel Uhl
f458607942
some comment changes
2015-07-08 00:05:36 +02:00
Axel Uhl
797c7d63b5
Merge remote-tracking branch 'server/master'
2015-07-07 18:28:42 +02:00
Axel Uhl
c1425a5f47
fixing bug 3081 (NPE during ranking calculation when waypoint position is unknown) by adding null checks
2015-07-07 18:26:05 +02:00
Axel Uhl
e5c0e60214
Merge remote-tracking branch 'server/master'
2015-07-07 11:22:40 +02:00
Axel Uhl
a032146c63
use setCurrentlyFillingFromInitialLoadOrApplyingOperationReceivedFromMaster in finally clause and not only in exception handler
2015-07-07 11:16:08 +02:00
Axel Uhl
f11fdfe75f
added logging for operations replicated from replica to master
2015-07-07 11:15:45 +02:00
Axel Uhl
99f357cbfe
use ConcurrentHashMap for the score correction maps to avoid the ConcurrentModificationException logged in bug 3071.
2015-07-07 11:14:40 +02:00
Axel Uhl
5ec08a4716
improved CourseImpl.getFirstLeg so it throws NullPointerException less frequently in case the course is empty
2015-07-07 11:13:33 +02:00
Axel Uhl
a628234c70
fixing bug 3078 by adding null check for empty nationality
2015-07-07 11:06:56 +02:00
Axel Uhl
9df589ef89
Merge remote-tracking branch 'server/master'
2015-07-07 01:22:39 +02:00
Axel Uhl
122bfd9948
bug 3075: stop simulator when tracked race is removed from its tracked regatta
2015-07-07 01:21:38 +02:00
Axel Uhl
fe1a848b50
fixing bug 3073 by not propagating any getStartOfRace() value to the simulator's offset, thereby not promoting a race log-provided start time to a simulator offset
2015-07-07 00:02:51 +02:00
EC2 Server
8232b6e6e8
Merge remote branch 'origin/master'
2015-07-06 16:11:08 +00:00
EC2 Server
d2e9bacbbd
fixed sailing init.d script so it produces a valid 001-events.conf with the right ordering of macro invocations
2015-07-06 16:10:44 +00:00
EC2 Server
a74d811d84
Merge remote branch 'origin/master'
2015-07-06 15:38:26 +00:00
EC2 Server
71d3ba80bf
launch http server only once at the end; append more debug output to /var/log/sailing.*
2015-07-06 15:37:54 +00:00
EC2 Server
90942d4377
don't append internal-server-status config once per server but only once at all; fix EC2_INSTANCE variable before doing so
2015-07-06 14:41:23 +00:00
EC2 Server
995c0815dc
append /internal-server-status macro at the end of 001-events.conf to ensure health check with /index.html hits event-based rewrite first
2015-07-06 13:13:37 +00:00
EC2 Server
8e9967cb82
added sailing.sh script to be linked to from /etc/profile.d for initial set-up of Linux environment
2015-07-06 13:03:29 +00:00
Axel Uhl
52d9dc176e
fixed comparator for mark passings structures: when mark passings for a single competitors are to be managed,
...
only the time shall be considered, and a comparison with a mark passing that has equal time shall result in 0.
Only collections with mark passings from different competitors need to resolve by competitor in case times are
equal.
2015-07-03 22:54:09 +02:00
Axel Uhl
9c49a504b4
fixing another aspects of competitor ranking comparator in case of already finisihed race for one and not yet started race for another
2015-07-03 14:37:03 +02:00
Axel Uhl
a37fd177f4
fix for bug 2976: don't compare by number of mark passings but by the index of the current leg
2015-07-03 13:50:26 +02:00
Axel Uhl
028f3c1a42
implemented a failing test case for bug 2976
2015-07-03 12:03:43 +02:00
Axel Uhl
87d26c34b3
bug 3030: moved the listener notification for suppression change outside the block that is protected by the suppression write lock
2015-07-03 10:33:42 +02:00
Axel Uhl
fddd1d3c0b
removed unused field and organized imports to avoid warnings
2015-07-03 10:18:58 +02:00
Axel Uhl
b873500dcc
Merge branch 'master' into design2015-mobile
2015-07-03 10:18:07 +02:00
Axel Uhl
5df46baa1d
fixed typo in exception log message
2015-07-03 10:17:39 +02:00
Axel Uhl
e539c76ae9
Merge branch 'master' into design2015-mobile
2015-07-03 09:48:06 +02:00
Axel Uhl
0cccd0deb2
Merge branch 'master' into design2015
2015-07-02 19:43:41 +02:00
Axel Uhl
6d2c319b63
fix for nasty bug 3016: use a new DomainFactoryImpl for each test case execution to get a clean, empty CompetitorStore
2015-07-02 14:23:53 +02:00
Axel Uhl
10bb214083
fixing bug 3040 by adding null handling in TrackedLegOfCompetitorImpl.getAverageVelocityMadeGood
2015-07-02 13:57:21 +02:00
Axel Uhl
51f7facf47
removed a fefw more unnecessary NoWindException declarations
2015-07-02 10:17:19 +02:00
Axel Uhl
b7fb1d6dd6
minor formatting and mini refactoring
2015-07-02 10:13:03 +02:00
Axel Uhl
861138c139
Merge remote-tracking branch 'server/master'
2015-07-02 10:09:47 +02:00
Axel Uhl
44ce7f4974
fixing bug 3045 by introducing null checks
2015-07-02 10:07:23 +02:00
EC2 Server
bf4cac1f1a
add /internal-server-status to 001-events.conf; always launch httpd
2015-06-30 16:29:08 +00:00
Axel Uhl
f941a0dd1e
Merge branch 'master' into bug3050
2015-06-30 00:34:50 +02:00
Axel Uhl
60ad541c82
Merge branch 'bug3044'
2015-06-30 00:34:25 +02:00
Axel Uhl
e170ba983e
fixing problem 2) of comment #5 in bug 3050;
...
using a WeakRaceLogChangedVisitor instead of a RaceLogChangedVisitor
2015-06-30 00:24:53 +02:00
Axel Uhl
dadd84af54
fixed part 1 of bug 3050 comment #5 ;
...
the WeakRaceLogChangedListener cleaner thread now removes the weak references and the WeakRaceLogChangedListener
from the static map
2015-06-30 00:11:42 +02:00
Axel Uhl
6fd6c5a762
solving bug 3015 according to comment #12 ; only the replicables requested by the system property will have initialLoad requested and will be waited for
2015-06-29 13:44:54 +02:00
Axel Uhl
6d2f2ae3d0
improved logging output for replicables start-up
2015-06-28 14:07:40 +02:00
Axel Uhl
65b34a9471
increased start level of replication bundle from 4 to 5, making it start *after* all other bundles contributing replicables
2015-06-28 13:14:23 +02:00
Axel Uhl
22d8f8a65b
make sure that the replicables list used for URL construction is the same as the one for de-serializing the replicables
2015-06-28 13:00:44 +02:00
Axel Uhl
03074f3f28
resume replicator to apply queued messages even if there has been an exception for one of the replicables
2015-06-28 12:14:17 +02:00
Axel Uhl
e991a9b53b
always use the same order of replicables in startToReplicateFrom for all aspects of iterating over them
2015-06-28 12:06:04 +02:00
Axel Uhl
5edd00e600
using ConcurrentHashMap for TrackedRegattaImpl.raceListeners (this was previously not thread safe); replaced wait() by RaceListener
2015-06-28 11:14:23 +02:00
Axel Uhl
317b3748ac
Avoid warnings in RaceListFragment by organizing imports
2015-06-28 08:48:48 +02:00
Axel Uhl
9d0ef2d525
another fix for total distance: don't null result when unfinished race starts after query time point
2015-06-28 00:41:12 +02:00
Axel Uhl
1855d0cf6c
fix-fix for regatta leaderboard discards
2015-06-27 10:55:44 +02:00
Axel Uhl
dbdcdfebb0
fix for bug 3037: use int[0] to encode no discards on regatta; make regatta leaderboard dialog robust for null discarding threshold array
2015-06-27 10:16:29 +02:00
Axel Uhl
ffa6b1f6ca
fixed Total Distance problem for races in state FINISHED
2015-06-26 23:23:16 +02:00
Axel Uhl
f59c519e9a
generate fewer test strings in MarshallingObjectOutputStreamsTest to avoid memory problems during test execution
2015-06-26 12:05:52 +02:00
Axel Uhl
0a48333293
Merge remote-tracking branch 'server/master'
2015-06-26 11:30:39 +02:00
Axel Uhl
b0dbb42a30
Updated kieler woche 2015 (markdown)
2015-06-25 23:27:31 +00:00
Axel Uhl
f51f74c17b
added mockito dependency to rcapp project to let tests-jvm stuff build
2015-06-25 23:26:17 +02:00
Axel Uhl
3f6d650aba
Merge remote-tracking branch 'server/master'
2015-06-25 23:05:30 +02:00
Axel Uhl
2eda770fae
fixing NPEs in case a handicap race has no start time yet; see bug 3021
2015-06-25 21:49:39 +02:00
Axel Uhl
4215109f46
Added test that I expected to fail but that doesn't for bug 3015;
...
The test writes multiple ObjectOutputStreams into one OutputStream and
reads the object graphs using a sequence of ObjectInputStreams.
2015-06-25 21:28:25 +02:00
Axel Uhl
f170a0a13a
working towards an improvement for initial load serialization consistency: flush ObjectOutputStream before opening the next on the same underlying OutputStream
2015-06-25 19:15:11 +02:00
Axel Uhl
6d0bf325b1
Merge remote-tracking branch 'server/master'
2015-06-25 08:00:34 +02:00
Axel Uhl
676efead1f
added missing course read lock acquisition in AbstractRankingMetric; see also bug 3006 #3
2015-06-25 07:58:15 +02:00
Axel Uhl
c68179dd9a
conserve some memory by avoiding Double auto-boxing in polar service
2015-06-24 09:57:47 +02:00
Axel Uhl
c50288f623
fixed typo in a toString() method
2015-06-24 01:55:41 +02:00