Steffen Schaefer
7df559f76d
Merge branch 'master' into foiling
...
Conflicts:
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java
2016-04-12 09:51:29 +02:00
Axel Uhl
078621f6d8
aftermath of adding boolean parameter to the DynamicTrackedRace.recordFix methods
...
Change-Id: Ic204092b12701ad70b7393fef6622d0fbf7576d5
2016-04-08 16:35:22 +02:00
Steffen Schaefer
8649feadd9
Merge branch 'master' into foiling
...
Conflicts:
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRaceWithStartTimeAndRanks.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.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java
java/com.sap.sailing.server/src/com/sap/sailing/server/masterdata/DummyTrackedRace.java
2016-04-07 09:05:56 +02:00
Steffen Schaefer
07cb2eae1e
It's now possible to track the attached RegattaLogs of a TrackedRace
...
using a new listener type
2016-04-06 15:08:43 +02:00
Benjamin Barth
e1706f98a7
Made method isWithinStartAndEndOfTracking of DynamicTrackedRace public
2016-04-01 15:53:18 +02:00
Steffen Schaefer
989a7e09cb
Changed sensorTracks in TrackedRace to use SensorTrack
2016-03-31 15:39:48 +02:00
Steffen Schaefer
a213e2a4b1
Changes for Java 1.7 compatibility
2016-03-31 14:01:01 +02:00
Jan Broß
5e143d205d
Merge master into bug3196
2016-03-30 14:39:11 +02:00
Jan Broß
6b135f7978
Move updateStartAndEndOfTracking to TrackedRaceImpl and set up some more handlers in DynamicTrackedRaceLogListener
2016-03-21 17:13:16 +01:00
Axel Uhl
1c56590b9b
TrackedRace: distinguishing between start time determined with or without inference from start mark passings;
...
this allows us to use only start times *without* start mark passing inference in the mark passing calculator
which otherwise would lead to a conceptual recursion where mark passings may be excluded because other mark
passings have previously been inferred at a later point, suggesting a later start, ruling out earlier start
mark passings.
Change-Id: I9b5a530e388bfbc3e0fb91845ec892f288d403bd
2016-03-08 01:28:42 +01:00
Benjamin Barth
3f05521094
Merge remote-tracking branch 'origin/master' into design2015
2016-02-04 11:02:22 +01:00
Axel Uhl
1bc29a9ec0
bug 3452: introducing an applyFilter parameter on DynamicTrackedRace.recordWind, forcing RaceLog-provided wind fixes into the race
...
Change-Id: Ie96ac8537650adb46285ebcc18a91dc70a6f7582
2016-02-02 21:14:43 +01:00
Benjamin Barth
d9313476d8
Reverted packaging type adjustment
2016-01-28 10:59:10 +01:00
Benjamin Barth
60ee025a47
Fixed packaging type of com.sap.sailing.gwt.ui.test
2016-01-26 13:25:40 +01:00
Benjamin Barth
1ad91529d6
Moved CacheDispatchTest to com.sap.sse.gwt.test
2016-01-26 13:23:56 +01:00
Papick Garcia Taboada
351b5810c4
Introduced shared package
2016-01-26 09:56:58 +01:00
Papick Garcia Taboada
012a627f42
Renamed packages
2016-01-26 09:28:33 +01:00
Steffen Schaefer
f2d03ed9cf
Merge branch 'master' into design2015
...
Conflicts:
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/client/StringMessages_zh.properties
2016-01-26 08:13:21 +01:00
Papick Garcia Taboada
6aff2799c4
Minor refactorings
2016-01-26 08:08:19 +01:00
Axel Uhl
c6ca28750d
removed method from DynamicTrackedRace contract that was only used by Impl class
...
Change-Id: I29b462c77de1b13932c31a39e43449b82d651d5c
2016-01-22 16:24:47 +01:00
Axel Uhl
f57aed7de6
Merge branch 'master' into bug3420
...
Conflicts:
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/FieldNames.java
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java
Change-Id: I7347ab0c849aa43f08eebca569c884b6986bf6d0
2016-01-22 15:39:16 +01:00
Axel Uhl
35af1394c6
Got the first tests for mark passing update from race log changes running
...
Change-Id: I857191e67ae8e408670832d02f1e1caab42d10a9
2016-01-22 15:15:03 +01:00
Papick Garcia Taboada
f1552a20fb
Initial dispatch move into SSE
2016-01-21 08:54:14 +01:00
Axel Uhl
e6fef6c04f
Merge branch 'master' into bug2851
...
Conflicts:
java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/FlexibleLeaderboardImpl.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingServiceAsync.java
Change-Id: Ifd8c60c6f7d2d2274a68681607a1b5df7b4040b7
2016-01-13 09:39:02 +01:00
Jan Broß
c39d8a9357
Remove wait for RaceLog from TrackedRace
2015-12-11 14:59:44 +01:00
Benjamin Barth
34740f12ab
Merge branch 'master' into bug3344
...
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java
2015-12-07 15:09:12 +01:00
Jan Broß
cd5274f654
Merge remote-tracking branch 'origin/master' into bug2851
2015-12-05 10:44:00 +01:00
Axel Uhl
781b29dcf9
Merge branch 'master' into bug3344
2015-12-04 12:24:41 +01:00
Steffen Schaefer
05aa98d84c
Merge branch 'master' into bug3345
...
# Conflicts:
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.java
# java/com.sap.sailing.gwt.ui/src/main/resources/com/sap/sailing/gwt/home/solutions/SailingAnalyticsNotes.html
2015-12-04 11:27:47 +01:00
Benjamin Barth
465de8dda2
Adjusted leaderboard calculation logic for meta leaderboard to show
...
current act as live in overall leaderboard view
2015-12-01 11:34:36 +01:00
Alexander Ries
567070c77f
solved master merge conflicts in DomainFactory
2015-11-25 11:20:46 +01:00
Jan Broß
07d999cc9e
Merge master into bug2851
2015-11-18 18:20:10 +01:00
Axel Uhl
f92f1eee39
pass through the leaderboard settings parameter for showing sail ID and competitor long name columns; use to suppress long name for small initial leaderboard sizes
2015-11-18 00:11:40 +01:00
Jan Broß
5136ceff78
Ping marks in RegattaLog
2015-10-30 13:57:17 +01:00
Papick Garcia Taboada
15674e8485
Fixed compile error
2015-10-22 23:58:25 +02:00
Papick Garcia Taboada
0ff124ccf4
Merge branch 'design2015' of ssh://sapsailing.com/home/trac/git into design2015
...
# By Benjamin Barth (7) and Steffen Schaefer (2)
# Via Benjamin Barth
* 'design2015' of ssh://sapsailing.com/home/trac/git:
Adjusted style of shared ErrorMessage
Moved shared ErrorPlace into respective package and abstracted ErrorActivity implementations
Refactored Activity implementations to use convenience AsyncCallback imnplementation
Refactored AbstractActivityProxy implementation to use convenience AsyncCallback imnplementation
Added AsyncCallback implementations for consistant error handling in Activities and ActivityProxies
Fixed layout of mobile EventOverviewStage
Fixed mobile navigation for single regatta and series events
Updated main.gss in gwt.theme to the current state of gwt.ui
Merged SharedRessources of desktop and mobile to fix rendering issues of shared widgets
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/AbstractEventActivity.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/EventActivityProxy.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/multiregatta/mediatab/MultiregattaMediaTabView.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/event/regatta/mediatab/RegattaMediaTabView.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/events/EventsActivity.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/events/EventsClientFactory.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/desktop/places/start/StartActivity.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/event/AbstractEventActivity.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/event/EventActivityProxy.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/SeriesActivity.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/mobile/places/series/minileaderboard/SeriesMiniOverallLeaderboardActivity.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/shared/places/searchresult/SearchResultActivity.java
2015-10-22 23:56:18 +02:00
Papick Garcia Taboada
e449377b33
Refactored communication layer into new packages (initial moving around)
2015-10-22 21:07:19 +02:00
Alexander Ries
25dd40680d
solved ribdashboard merge conflicts in SailingServiceAsync
2015-10-21 15:06:12 +02:00
Steffen Schaefer
9e7c832fe7
Merge remote-tracking branch 'origin/master' into design2015
...
Conflicts:
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
2015-10-19 16:21:41 +02:00
Papick Garcia Taboada
cc11c48098
Moved test to test fragment
2015-10-15 10:51:44 +02:00
Alexander Ries
9c7244602b
solved merge conflits in TracTracEventManagementPanel
2015-09-29 11:03:26 +02:00
Alexander Ries
7118e74129
handing through offsetToStartTimeOfSimulatedRace from TracTracEventManagamentPanel to Simulator
2015-09-29 10:26:57 +02:00
Benjamin Barth
fa3bcd39ff
Merge remote-tracking branch 'origin/master' into design2015
...
Conflicts:
java/com.sap.sailing.gwt.ui/SailingGWT Remote Profiling (Run-Mode
only).launch
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/home/client/place/event/partials/racelist/RaceListColumnFactory.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
2015-09-28 10:33:10 +02:00
Frederik Petersen
dfea54d398
Removed old PolarSheets.html and its backend functionality
...
replaced by datamining ui approach to polar generation.
see wiki soon...
2015-09-22 16:28:30 +02:00
Benjamin Barth
99a026e573
Refactoring - Moved shared Countdown utils to respective package
2015-09-10 12:35:58 +02:00
Axel Uhl
d1a459c0e9
updated target platform to contain LZ4 compression algorithm; use it in replication code
2015-07-27 17:40:33 +02:00
Axel Uhl
59b76b9848
let TrackedRaceImpl resolve against DomainFactory which now has a RaceLogResolver which is provided by RacingEventService;
...
in production mode, the RacingEventService constructors make sure that the DomainFactory uses the RacingEventService as
its RaceLogResolver. The resolver is used by TrackedRaceImpl to set its raceLogResolver after de-serialization
2015-07-19 15:26:18 +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
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
fe2a45ddf7
use default implementation for TrackedRace.takesWindFix, avoiding new overrides in test mocks
2015-06-19 00:55:04 +02:00