Commit Graph
2129 Commits
Author SHA1 Message Date
Steffen Schaefer 0a1b56765c Merge branch 'master' into foiling
Conflicts:
	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
2016-06-27 16:15:41 +02:00
Axel Uhl 6054ad9010 dependent start time updates now correctly set the race start time and notify listeners appropriately
Change-Id: I3f458c5dabf9da78581e786e35a01bc571d5d4cd
2016-06-23 20:09:13 +02:00
Steffen Schaefer eb66480c9f Merge branch 'master' into foiling
Conflicts:
	java/com.sap.sailing.server.test/src/com/sap/sailing/server/impl/MediaMasterDataExportTest.java
	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
2016-06-17 14:32:19 +02:00
Papick Garcia Taboada a1eb6857a3 Merge branch 'foiling' of ssh://sapsailing.com/home/trac/git into foiling 2016-06-14 15:55:59 +02:00
Papick Garcia Taboada 2a57e313fc Use sensor fix store in master data import operation 2016-06-14 15:55:53 +02:00
Steffen Schaefer ead64e9310 Refactored the lifecycle of RaceLogSensorFixTracker to it's own class
and changed the implementation to be based on the denotation in RaceLog
2016-06-14 12:41:00 +02:00
Steffen Schaefer 10e4e2feec Added getAttachedRaceLogs to TrackedRace 2016-06-14 12:39:26 +02:00
Papick Garcia Taboada 07da99810d Merge branch 'foiling' of ssh://sapsailing.com/home/trac/git into foiling 2016-06-14 08:51:36 +02:00
Steffen Schaefer 853c1ee316 Merge branch 'master' into foiling 2016-06-14 08:42:49 +02:00
Axel Uhl b199375825 Merge branch 'master' into bug2825 2016-06-13 10:56:47 +02:00
Axel Uhl 67329d130c moved the mediaTracksImported invocation to ImportMasterDataOperation.internalApplyTo so that it always happens for each import
Change-Id: I5cb93f7c540dddc960a2a14edd9e83b2f641427c
2016-06-13 10:40:44 +02:00
Axel Uhl 2645c552a2 formatting changes only
Change-Id: I5a4deba0ed30071b30a69707ecadc4de10b9c37b
2016-06-13 10:38:32 +02:00
Axel Uhl 0cd82fb9f3 a failing test case for replicating the effects of a master data import with media tracks; some test refactoring and a new testsupport bundle
Change-Id: Ib63d4511e75e6a37f61e5feb6d9c05429e6bba4e
2016-06-10 16:31:05 +02:00
Papick Garcia Taboada 9416f5deed Removed unneeded GPSFixStore usage 2016-06-09 18:35:16 +02:00
Axel Uhl ad8bbf7777 an untested implementation that transmits the leaderboard groups of a new event to the server upon creation
Change-Id: I9ae6c8cfa43bc4d451c61b125ffb6f480cbc5ce0
2016-06-09 14:05:42 +02:00
Papick Garcia Taboada 15ee54381b Refactored wait for loaders to finish method 2016-06-09 12:57:56 +02:00
Steffen Schaefer 4597ee9882 Merge branch 'master' into foiling
Conflicts:
	java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/RaceLogRaceTracker.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.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/shared/charts/AbstractCompetitorRaceChart.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/MultiCompetitorRaceChart.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/MultiCompetitorRaceChartSettings.java
	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
2016-06-09 08:52:37 +02:00
Axel Uhl 09b54e604d fixes regarding ConcurrentHashMap-->ConcurrentMap; use Iterable instead of Collection in MediaLibrary and related services
Change-Id: I71b2d1cef21cb9725001f1e84103644a8e076bc2
2016-06-07 18:23:32 +02:00
Axel Uhl 32daae4ad3 where concurrency support plays a role, changed field declarations from ConcurrentHashMap to ConcurrentMap which is sufficiently specific
Change-Id: I71254d96d495a1a8d79e009d70fd8928b720b31e
2016-06-07 17:08:07 +02:00
Axel Uhl 58fe2b8342 simplified MediaLibrary.updateMapByRace_Add
Change-Id: I65770d2c145ef8500d71d6374357028791f10375
2016-06-07 11:58:14 +02:00
Axel Uhl 2f5d6813b9 whitespace change only
Change-Id: Iff02931084b336f366a22d5b471e83994cd21ec7
2016-06-07 11:54:49 +02:00
Axel Uhl d27f243d3a added assert statements that validate constraints in MediaLibrary so far expressed only as a comment
Change-Id: I4ee9e5dc0f0c60ec1e6216e3b2b39ac766c13f0b
2016-06-07 11:53:35 +02:00
Steffen Schaefer bb3438d208 Merge branch 'master' into foiling 2016-06-07 08:12:34 +02:00
Axel Uhl 337ce15ef1 formatting changes only
Change-Id: I43c8bf3de168ffe02e2bb1d05a6b89c387969151
2016-06-03 12:04:57 +02:00
Steffen Schaefer d4344ea720 Merge branch 'master' into foiling 2016-06-02 09:51:26 +02:00
Axel Uhl 51bab1b93f fix for bug 3682: remove a leaderboard group from all events referencing it when removing the leaderboard group
Change-Id: Ifa4a66202a1506c42f74c29037e052fad95ba053
2016-06-01 17:42:07 +02:00
Axel Uhl d1af28800d fix for bug 3681, "greening" the test: removing an overall leaderboard from the server unlinks it from the respective leaderboard group
Change-Id: Id23a781a2e640d8ee68d68e6dae2ec2e85b30a82
2016-06-01 17:34:56 +02:00
Steffen Schaefer dafe1a47c2 Merge branch 'master' into foiling 2016-05-31 08:45:38 +02:00
Axel Uhl 53827a9359 fix for searching public events / leaderboards only (bug 3676)
Change-Id: I375fefcac041b3193b5768fca435c4a7032375a3
2016-05-30 12:10:14 +02:00
Benjamin Barth 29e625bece Removed gpsFixStore field and constructor param from CreateTrackedRace 2016-05-23 17:32:04 +02:00
Benjamin Barth e2d6af07dd Removed getter method for gpsFixStore from TrackedRace 2016-05-23 15:53:04 +02:00
Benjamin Barth 60bca7d374 Merge branch 'master' into foiling
Conflicts:
	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/DetailType.java
	java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/RaceLogRaceTracker.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.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/src/main/java/com/sap/sailing/gwt/ui/adminconsole/TrackFileImportWidget.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
2016-05-19 14:02:20 +02:00
Axel Uhl 56f1ff8767 more tests and fixes for bug 3636
Change-Id: I4b2b8e55e787cfbafd598b95d3ae7566fceecd89
2016-05-18 15:50:25 +02:00
Axel Uhl b58adebaad using multiple threads from an executor service to calculate mark passing/candidate updates in parallel for multiple competitors
Change-Id: I1797eb7f927b4a497384bbc5347e3b41c2c8c9ee
2016-05-13 15:47:27 +02:00
Axel Uhl d16e46d02f Merge branch 'master' into translation
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties

Change-Id: I473b1d08739e18a794cfe8b72f7b2f813f3e8078
2016-05-12 18:46:17 +02:00
Axel Uhl 869abfcca9 Merge branch 'master' into bug3632 2016-05-12 13:50:47 +02:00
Axel Uhl 4865820046 fixing bug 3650 by using the top-level document's ClassName field for the boat class creation
Change-Id: I92a07396718db0393fe2034390eba008061be5a8
2016-05-12 13:45:08 +02:00
Papick Garcia Taboada a523f790d3 Moving update status to status event programming model with source 2016-05-04 15:21:56 +02:00
Benjamin Barth d0693002d1 Adjusted env.sh and replication related launch configs to replicate
RegattaLogSensorDataTrackerTrackedRegattaListener on start
2016-05-03 17:53:18 +02:00
Axel Uhl b0d5ea11b5 fixed initial setting of finishedTime on TrackedRace when race log is attached
Change-Id: I16d88063803150de5b42daa7c4a23c09665b4e82
2016-05-03 14:14:58 +02:00
Axel Uhl 441e45b6c4 Merge branch 'master' into bug3632 2016-05-03 09:26:42 +02:00
Steffen Schaefer d6c67ff0fd Merge branch 'master' into foiling
Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.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
2016-05-03 08:29:04 +02:00
Axel Uhl ecb7a6beba Merge branch 'bug3641' into translation 2016-05-03 00:46:20 +02:00
Axel Uhl 9d43227986 part three of bug3641: renamed realTotal to total; should be done now; let's wait for the tests
Change-Id: Ie91dbcd94fb52cba0a928389b3d531bf44750000
2016-05-02 16:33:58 +02:00
Axel Uhl a26b7f25cd renamed all totalPoints occurrences into netPoints
Change-Id: Iddf5e02a643b69e4f3f549b1757410cf61281185
2016-05-02 15:47:31 +02:00
Axel Uhl c5b494a0ba part one of swapping net/total point names: renamed all "net" to "realTotal"
Change-Id: Ia61d72e6c1c2323d2b9ad1e32c141b9a063e461d
2016-05-02 14:46:50 +02:00
Benjamin Barth 5af060bf7a Moved PathType to com.sap.sailing.domain.common to be able to i18n it 2016-05-02 14:36:51 +02:00
Axel Uhl e3866789d1 prepared passing through of finishedTime from RaceLog through RaceState, RaceStateChangedListener to DynamicTrackedRaceLogListener into DynamicTrackedRace;
this as preparation for filtering the candidates in the CandidateFinder for a range a bit before start and a bit after finish

Change-Id: I8115950f041c9816def938cdf98b191525fbc426
2016-04-29 15:56:21 +02:00
Steffen Schaefer 3d3ee72b0c Merge branch 'master' into foiling
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
2016-04-28 08:26:11 +02:00
Axel Uhl 726091f2df Merge remote-tracking branch 'server/translation' into translation 2016-04-27 17:49:45 +02:00