Axel Uhl
b0dbb42a30
Updated kieler woche 2015 (markdown)
2015-06-25 23:27:31 +00: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
Axel Uhl
91af95af74
in CompactGPSFixImpl keep original TimePoint reference, avoiding billions of CompactTimePoint object creations;
...
This seems too expensive, particularly in live mode. A distinction may be possible in the future between live races
and replay races where for replay races the time point is also "compactified" where access isn't that frequent and
server load isn't that high. See bug 3003.
2015-06-24 01:15:05 +02:00
Axel Uhl
2116c2db02
fixing bug 3002 by checking startTimePoint for null and returning null instead of asking leg type for a null time point
2015-06-23 20:23:50 +02:00
Axel Uhl
84d005549f
Merge remote-tracking branch 'server/master'
2015-06-23 20:12:32 +02:00
Axel Uhl
50260e45c0
fixing bug 3001 by pre-calculating the windward distances for each competitor before starting hte sorter
2015-06-23 20:11:08 +02:00
Axel Uhl
917afc9c3c
Merge branch 'master' into bug2996
2015-06-22 23:01:51 +02:00
Axel Uhl
eee85fb77b
Merge branch 'bug2995'
2015-06-22 22:36:40 +02:00
Axel Uhl
e102c4d404
fixing test issues with unserializable Mockito mocks for bug 2995
2015-06-22 22:34:10 +02:00
Axel Uhl
fc5b565cfb
fixing bug 2994 by always extrapolating based on average VMG as the competitor hasn't finished the leg at the request time point
2015-06-22 20:55:21 +02:00
Axel Uhl
5d9e8863ee
reverted to fixed version
2015-06-22 20:29:52 +02:00
Axel Uhl
59fd77f276
use the refactored AbstractRaceRankComparator in AbstractRankingMetric for the getWindwardDistanceTraveledComparator implementation
2015-06-22 18:41:07 +02:00
Axel Uhl
240e393ada
making RaceRankComparator re-usable for windward distance-based ranking in handicap racing
2015-06-22 18:31:32 +02:00
Axel Uhl
fa43319bce
after-math for bug2992: also add the leaderboard groups explicitly specified for export, even if they don't belong to any event
2015-06-22 17:33:35 +02:00
Axel Uhl
aa489ab35d
eliminated the effects of prematurely merging branch bug2977 into master; watch out when trying to finally merge bug2977 as it may already be considered merged
2015-06-22 16:57:49 +02:00
Axel Uhl
37f6f16dc9
trying to solve bug 2996 by first serializing all regattas, similar to how it's done for master data import
2015-06-22 15:49:08 +02:00
Axel Uhl
3194cc663b
Merge branch 'bug2995'
2015-06-22 15:04:20 +02:00
Axel Uhl
9cd1ab8919
fix for bug 2995: require handicap functions to be serializable
2015-06-22 14:59:10 +02:00
Axel Uhl
e2831de2e1
added a failing test case for bug 2995 and prepared a solution by introducing SerializableFunction
2015-06-22 14:50:02 +02:00
Axel Uhl
405f8c4bf9
fix for bug 2992: mark all leaderboard groups transitively across all events that will be touched by master data serialization as currently under export
2015-06-22 14:16:21 +02:00
Axel Uhl
002bc5d30b
Merge remote-tracking branch 'server/master'
2015-06-21 21:14:41 +02:00
Axel Uhl
3256301d63
Merge branch 'jbross-dependent-race-start'
2015-06-21 21:13:03 +02:00
EC2 Server
b4363fa79b
Fixed NPE
2015-06-21 12:31:25 +00:00
Axel Uhl
6089289b3e
Merge branch 'master' into jbross-dependent-race-start
2015-06-21 01:51:53 +02:00
Axel Uhl
a10e029c49
removed unused addDummyTrackedRace method from ImportMasterDataOperation; it was used before switching master data import to serialization
2015-06-21 01:50:47 +02:00
Axel Uhl
42dedcecfd
bug 2467 #19 : passing through RacingEventService as RaceLogResolver; added as transient field to TrackedRace, restored after initial load in RacingEventServiceImpl
2015-06-20 23:57:50 +02:00
Axel Uhl
d2113723a9
RacingEventServiceImpl now implements RaceLogResolver
2015-06-20 21:07:46 +02:00
Axel Uhl
e37a649a0a
Merge branch 'bug2977' into jbross-dependent-race-start
2015-06-20 19:40:14 +02:00
Axel Uhl
d852134642
require X-ray to be up in order to automatically infer its down time based on the start time
2015-06-20 19:36:14 +02:00
Axel Uhl
0ab329ba61
Merge branch 'bug2977' into jbross-dependent-race-start
2015-06-20 19:08:26 +02:00
Axel Uhl
7cd0d55454
solution proposal for bug2989: use getStartOfRace() instead of getStartTimeReceived() and default to "now" if no start time is known yet
2015-06-20 19:04:26 +02:00
Axel Uhl
da851fb24e
Merge remote-tracking branch 'server/master'
2015-06-20 18:55:01 +02:00
Axel Uhl
a78d7cd56a
fixed isIndividualRecallDisplayed() for bug2977
2015-06-20 18:45:18 +02:00
Axel Uhl
214751d09c
Merge branch 'master' into bug2977
2015-06-20 17:39:58 +02:00
Axel Uhl
798bb77978
fix for bug 2988: NPE in LeaderboardDTOCalculationReuseCache
2015-06-20 17:29:59 +02:00
Axel Uhl
bff98361d0
added a test case for bug 2986
2015-06-20 15:04:57 +02:00
Axel Uhl
75d4af4e55
Merge remote-tracking branch 'server/master'
2015-06-20 14:18:40 +02:00
Axel Uhl
ae27b4e3a2
fix for bug 2986: making TrackedRaceImpl.gpsFixStore transient and initialize it to EmptyGPSFixStore.INSTANCE in readObject
2015-06-20 14:15:45 +02:00
Axel Uhl
bf200242db
Merge branch 'master' into bug2981
2015-06-19 17:35:58 +02:00
Axel Uhl
b11f9aeaba
Updated kieler woche 2015 (markdown)
2015-06-19 15:14:18 +00:00
Axel Uhl
cb85e9d25a
Updated kieler woche 2015 (markdown)
2015-06-19 14:58:58 +00:00
Axel Uhl
a8449200de
Updated kieler woche 2015 (markdown)
2015-06-19 14:57:38 +00:00
Axel Uhl
7472abbd1b
fixed bug 2981 and added test case; null wind caching was faulty
2015-06-19 16:26:02 +02:00
Axel Uhl
6112b16b26
checked in launch configuration for RCApp unit tests
2015-06-19 13:11:20 +02:00
Axel Uhl
3b5de63375
construct managed race identifier in test case using ManagedRaceIdentifierImpl
2015-06-19 13:09:10 +02:00
Axel Uhl
39c738a66f
Merge branch 'ubilabs--rcapp--hotfix-master'
2015-06-19 10:56:02 +02:00
Axel Uhl
a422fc0ddf
added Javadoc
2015-06-19 10:55:44 +02:00
Axel Uhl
c76eb1f74e
Merge branch 'master' into ribdashboard
2015-06-19 02:06:30 +02:00
Axel Uhl
6ef7ca5e53
Merge branch 'jbross-dependent-race-start'
2015-06-19 02:02:32 +02:00
Axel Uhl
a7a52fbee8
re-consolidating ORC icon stuff into BoatClassMasterdata for now; major refactoring would be required otherwise
2015-06-19 01:56:10 +02:00
Axel Uhl
f20f915f8c
Merge remote-tracking branch 'server/master' with strategy "ours", eliminating bdfb763037270e509cb13ba75ebe3b6d5c1b76ca;
...
Commit bdfb763037
2015-06-19 01:30:03 +02:00
Axel Uhl
fe2a45ddf7
use default implementation for TrackedRace.takesWindFix, avoiding new overrides in test mocks
2015-06-19 00:55:04 +02:00
Axel Uhl
ba66852b7f
added several test cases for the different constellations of TrackedRace.takesWindFix
2015-06-19 00:47:43 +02:00
Axel Uhl
e7604d2eab
fixed the implementation of TrackedRaceImpl.takesWindFix to let previously failing test case pass
2015-06-19 00:33:43 +02:00
Axel Uhl
dcd826dd91
fixed test case construction: use two differently-named leaderboard columns
2015-06-19 00:19:24 +02:00
Axel Uhl
03c89e4b7c
fixed typo on string constant
2015-06-19 00:06:02 +02:00
Axel Uhl
71432db23f
removed redundant else / if clause
2015-06-18 23:54:07 +02:00
Axel Uhl
87a9dce9dc
fixed calculation of latestEndTimePoint in TrackedRaceImpl.takesWindFix and made variables final where possible
2015-06-18 23:52:24 +02:00
Axel Uhl
c58cd9ae21
added failing test case for takesWindFix
2015-06-18 23:51:05 +02:00
Axel Uhl
909978f345
code formatting
2015-06-18 23:39:38 +02:00
Axel Uhl
b53c5ac5ad
method rename and Javadoc
2015-06-18 23:24:42 +02:00
Axel Uhl
99c02aac2c
fixed indentation
2015-06-18 23:14:37 +02:00
Axel Uhl
92191ea00e
organized import to avoid warning
2015-06-18 22:54:00 +02:00
Axel Uhl
85a0e95f0a
Merge branch 'master' into ribdashboard
2015-06-18 22:51:57 +02:00
Axel Uhl
770e23e578
Merge branch 'master' into jbross-dependent-race-start
2015-06-18 22:38:44 +02:00
Axel Uhl
a6e0abdc9f
Merge branch 'bug2970'
2015-06-18 22:30:50 +02:00
Axel Uhl
eb79a79baa
fixed translation texts in RCApp
2015-06-18 20:01:08 +02:00
Axel Uhl
f7dff83a04
proposal for bug 2977: X-ray down time based on race start time, not on X-ray up
2015-06-18 19:57:43 +02:00
Axel Uhl
e8f622487f
fixed Selenium test case: the problem was that the substitution of '/' by '_' in default regatta names missed the test's expectation
2015-06-18 16:24:45 +02:00
Axel Uhl
9c319315a7
Merge branch 'master' into bug2970
2015-06-18 15:56:48 +02:00
Axel Uhl
86c156f7a9
Merge branch 'master' into jbross-dependent-race-start
2015-06-18 15:55:14 +02:00
Axel Uhl
bab6a51fc7
Merge remote-tracking branch 'server/master'
2015-06-18 15:54:35 +02:00
Axel Uhl
1ca11a4504
fixed post-merge issues, mostly changing race ID from Serializable to String in RCApp
2015-06-18 15:52:52 +02:00
Axel Uhl
d7c053314b
fixed merge problem to make compilable again
2015-06-18 13:47:03 +02:00
Axel Uhl
535654593c
Merge branch 'master' into jbross-dependent-race-start
...
Conflicts:
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
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/CalculateImageSizeFromUrlTest.java
java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogEventSerializerTest.java
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml
mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/DataStore.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/InMemoryDataStore.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/OfflineDataManager.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/dialogs/ProtestTimeDialogFragment.java
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/dialogs/RaceFinishingTimeDialog.java
2015-06-18 13:45:50 +02:00
Axel Uhl
2cc61f15dd
Merge branch 'master' into bug2970
2015-06-18 10:47:35 +02:00
Axel Uhl
32f44fc669
more logging in case MarkPassingCalculator thread terminates / ends
2015-06-18 01:26:50 +02:00
Axel Uhl
3c87e50919
fixing commit 2973 by adding synchronization on the competitor's candidate sets
2015-06-18 01:25:45 +02:00
Axel Uhl
3f5381ec9e
don't stop mark passing calculator only because race reaches status FINISHED. More events, e.g., form the RaceLog may be coming. Fixes bug 2974.
2015-06-18 01:20:35 +02:00
Axel Uhl
1579d0ef26
fixed NPE in CandidateChooserImpl
2015-06-18 00:24:40 +02:00
Axel Uhl
39baea5873
use a synchronized set to fix bug 2973; however, now I'm seeing a NPE at a different spot. Related?
2015-06-18 00:22:08 +02:00
Axel Uhl
39573c8928
using setInnerHTML instead of setInnerText in order to set labels to ; see bug 2972
2015-06-17 22:31:50 +02:00
Axel Uhl
294eb92b3b
fixing bug 2970 by pulling up ranking metrics list box in regatta dialog hierarchy and using in DefaultRegattaCreateDialog
2015-06-17 17:49:08 +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