Vladislav Chumak
9db575b1a5
Added position to CompleteManeuverCurveWithEstimationData
2018-04-17 14:35:22 +02:00
Vladislav Chumak
7f3115cfc9
Merge remote-tracking branch 'origin/maneuver_refactoring'
2018-04-15 14:31:18 +02:00
Vladislav Chumak
8f86d0a862
Added deserialization for DetailedBoatClassJsonSerializer, fixed test
2018-04-13 19:02:34 +02:00
Vladislav Chumak
f702fea3d0
Implemented serialization/deserialization test for estimation data
2018-04-13 18:08:09 +02:00
Axel Uhl
22b4ec6535
Merge branch 'master' into bug4509
...
Change-Id: Ia63ce5f964be5471b00a5429d6984e141d742b4d
2018-04-13 15:55:28 +02:00
Axel Uhl
b4f1c8fb10
more getCompetitorStore()-->getCompetitorAndBoatStore() renames
...
Change-Id: I715aba1aeaef8a4bd180d73b026164abcbdba196
2018-04-13 09:01:27 +02:00
Axel Uhl
662fd99fad
Merge branch 'master' into bug4509
...
Change-Id: I68eacba973b9c1246aaf9b769f69bc7e96e93f2b
2018-04-12 14:23:56 +02:00
Axel Uhl
4c319f5f6c
renamed CompetitorStore to CompetitorAndBoatStore; renamed Competitor[WithBoat]DTO classes
...
Change-Id: Ib80cf877e63fd834a73e81f20fafa57f130cc0a7
2018-04-12 14:18:16 +02:00
Axel Uhl
1cf923a027
use DynamicCompetitor and DynamicBoat where necessary
...
Change-Id: Id06014ac0baba5ea2315894068003c80733f1b0e
2018-04-11 17:26:20 +02:00
Axel Uhl
e4e9cdb22c
changed CompetitorAndBoat[De]Serializer such that it is backward compatible for CompetitorWithBoat
...
Change-Id: Ia5717bdef5d9db7833b8d44df061dce524cecf85
2018-04-09 18:23:33 +02:00
Axel Uhl
06447318e5
bug4500: consolidated the two Competitor Json (De-)Serializers into one
...
Change-Id: I517a2649b6175f11f5e1c7b35fdc439f1982dca4
2018-04-09 16:39:17 +02:00
Axel Uhl
827824f699
re-added "boat" field to competitor serialization for backward compatibility
...
Change-Id: I01c2d405b5d261b032caefb261f0be18b2f9d026
2018-04-06 17:31:05 +02:00
Axel Uhl
360f72a6a7
Merge branch 'master' into bug2822_boatcolors
2018-03-24 08:49:11 +01:00
Axel Uhl
bd90f921dd
added Automatic-Module-Name headers to satisfy Oxygen.3 Java9 warnings rule
2018-03-24 01:45:37 +01:00
Axel Uhl
5c049c4564
fixed test case which requires different competitor IDs for competitors of different types now# Please enter the commit message for your changes. Lines starting
...
Change-Id: I7c0867a321ea2a8a4c9d79b6e78665c52dbbdf46
2018-03-20 23:29:38 +01:00
Frank Mittag
162392a435
Merge remote-tracking branch 'origin/master' into bug2822_boatcolors_merged_with_eol_changes
...
# Conflicts:
# java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
2018-02-27 15:17:45 +01:00
Kai Boernert
f505b10d50
removed RaceLogCourseAreaChangedEvent
2018-02-23 17:06:14 +01:00
Frank Mittag
62438c83d6
Merged RaceLogRegisterCompetitorEvent and RaceLogRegisterCompetitorAndBoatEvent into just RaceLogRegisterCompetitorEvent to make it easier to handle regattas with changing boats and non changing boats
2017-12-07 16:31:06 +01:00
Frank Mittag
d45de24610
Merge remote-tracking branch 'origin/master' into bug2822_boatcolors_merged_with_eol_changes
...
# Conflicts:
# java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/dto/CompetitorDTO.java
# java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/DomainObjectFactory.java
# java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
# java/com.sap.sailing.domain.test/resources/IncrementalLeaderboardDTO.ser
# java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/tracking/impl/BravoFixTrackSerializationTest.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/RegattaImpl.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/places/screens/liveraceloop/racemapwithleaderboard/LiveRaceWithRacemapAndLeaderBoardPlace.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/autoplay/client/utils/AutoplayHelper.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/LeaderboardSettingsFactory.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/MultiRaceLeaderboardSettingsDialogComponent.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/settings/client/leaderboard/SingleRaceLeaderboardSettingsDialogComponent.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/CompetitorRegistrationsPanel.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaLogImportSensorDataAndAddMappingsDialog.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/MultiRaceLeaderboardPanel.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/SingleRaceLeaderboardPanel.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/EmbeddedMapAndWindChartEntryPoint.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
# java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndLoadingEventsAndRegattas.java
# java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/CompetitorReplicationTest.java
# java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/RegattaReplicationTest.java
# java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
# java/com.sap.sailing.server/src/com/sap/sailing/server/impl/PersistentCompetitorStore.java
# java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2017-11-22 15:39:00 +01:00
Axel Uhl
6924ea32b8
bug 4356: included MergeState enum and field in CompetitorResult
...
Change-Id: I974bb5904c7e71efc142ac19e84b03a91b7ad045
2017-10-27 10:42:32 +02:00
Frank Mittag
48162c73be
major refacoring and cleanup of RaceLog and RegattaLog events needed for the new way of registering boats and competitors as separate entities -> UI is still not ready for it.
2017-08-25 17:09:00 +02:00
Frank Mittag
c295bce93c
added a couple of racelog events for competitor/boats assignments (not sure we will need all of them)
2017-07-12 17:05:17 +02:00
Steffen Schäfer
1542a36109
Merge branch 'master' into bug2822_boatcolors
2017-05-16 16:12:16 +02:00
Steffen Schäfer
67d310df4b
Merge branch 'master' into bug2822_boatcolors
...
# Conflicts:
# java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/SensorFixStoreAndLoadTest.java
# java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegOfCompetitorImpl.java
# java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/AdminConsolePage.java
# java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2017-05-16 15:59:24 +02:00
Steffen Schaefer
9123771f34
normalized line endings
2017-05-16 09:42:02 +02:00
Frank Mittag
fd8fee5d58
work commit in the middle of refactoring competitor.getBoat()
2017-04-28 09:08:14 +02:00
Axel Uhl
9ccd61ef67
fixed test cases
...
Change-Id: I60ef73c89e63ac0b05d70f148cc9ff837f3f2a4d
2017-04-11 16:13:11 +02:00
Axel Uhl
b11dca244e
bug3552: refactored Mark.color from String to Color
...
Change-Id: Iddcc26de68dd5c1ecd3fdcbb61e59810e879ae37
2017-04-11 11:20:46 +02:00
Frank Mittag
31e8164166
Merge remote-tracking branch 'origin/master' into bug2822_boatcolors
...
# Conflicts:
# java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/SensorFixStoreAndLoadTest.java
# java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/Competitor.java
# java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/TransientCompetitorStoreImpl.java
# java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/DomainFactory.java
# java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/DomainFactoryImpl.java
# java/com.sap.sailing.domain.swisstimingreplayadapter/src/com/sap/sailing/domain/swisstimingreplayadapter/impl/SwissTimingReplayToDomainAdapter.java
# java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/common/test/LeaderboardDTODiffingTest.java
# java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LineAnalysisTest.java
# 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/adminconsole/CompetitorEditDialog.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaWithSeriesAndFleetsDialog.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_zh_CN.properties
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
# java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceWithGPSFixStoreContentsReplicationTest.java
# java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/ApplyScoresFromRaceLogTest.java
2017-03-08 16:03:56 -03:00
fmittag
474295d281
Merge remote-tracking branch 'origin/master' into bug2822_boatcolors
...
# Conflicts:
# java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/AbstractGPSFixStoreTest.java
# java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/TrackedRaceLoadsFixesTest.java
# java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/TransientCompetitorStoreImpl.java
# java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LineAnalysisTest.java
# java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
# java/com.sap.sailing.server/src/com/sap/sailing/server/impl/PersistentCompetitorStore.java
2016-12-29 14:03:06 +01:00
Steffen Schaefer
790d809a29
Merge branch 'master' into bug2447
2016-12-01 10:13:47 +01:00
Axel Uhl
d334d44acd
fixed RaceLogEventSerializerTest after having introduced assertions for non-nullness of protest time range
...
Change-Id: Iddc4d571698172c37097eda738cf1e659dd64b1b
2016-11-30 12:20:00 +01:00
Steffen Schaefer
dd5d1fc745
Using junit and hamcrest from orbit / adjustments for different junit
...
bundle ID
2016-11-24 13:29:02 +01:00
Peter Siegmund
8fb8d3bf12
change protest time from start and duration to TimeRange (start/end)
2016-11-16 14:08:34 +01:00
Peter Siegmund
3535f4fb40
add duration to RaceLogProtestStartTimeEvent
2016-11-07 17:11:04 +01:00
fmittag
74f43331a2
implemented 'shortName' attribute for Competitor to prepare to remove the misuse of the sailId for team names
2016-08-10 12:41:52 +02:00
Axel Uhl
97c25d6bcd
added baseURL property to EventBase
...
Change-Id: I0fbd92b14331918986d817fc86a06912ae8f603d
2016-07-15 13:56:07 +02:00
Benjamin Barth
480544df7a
Merge remote-tracking branch 'origin/master' into bug2775
2016-06-09 16:32:49 +02:00
Axel Uhl
5f5a3c460e
introduced CourseDesignerMode field on RaceLogCourseDesignChangedEvent and field isWaypointSequenceValid on CourseDesignerMode;
...
this is to solve bug 3608 because course designs coming from the ByName course editor will no longer be used to update
a TrackedRace's course.
Change-Id: I8a1aa432f931838902c546a2365b68a8ca59b72e
2016-04-22 16:47:39 +02:00
Steffen Schaefer
2923d980ad
Merge remote-tracking branch 'origin/master' into bug2775
2016-04-19 08:45:34 +02:00
fmittag
ef7d84bd81
added a searchTag attribute to 'Competitor' to make it possible to 'tag' competitors for an easier search later on
2016-04-14 13:44:37 -04:00
Steffen Schaefer
c651316031
Moved SettingsToJsonSerializer to com.sap.sse.shared.android and added
...
com.sap.sse.shared.android.test
2016-03-15 15:02:07 +01:00
Steffen Schaefer
fbd6651866
bug 2775: Initial changes for reflection-free settings and serialization
2016-03-15 11:14:17 +01:00
Steffen Schaefer
fdb59c3ca5
Ported all event related tests to use the new media model
2016-03-02 11:10:03 +01:00
Steffen Schaefer
e3acfbf53b
Removed test for non locale dependent sailorsInfoWebsiteURL in
...
EventDataJsonSerializerTest because the field isn't serialized anymore
2016-03-01 16:09:28 +01:00
Steffen Schaefer
e23885f870
Adjusted JSON (de)serializer to handle multiple sailorsInfoWebsiteURLs
2016-02-24 13:13:43 +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
053268e0d5
enhanced RaceLogFinishPositioningConfirmedEvent and RaceLogFinishPositioningListChangedEvent by fields for score, rank, comment and finishing time
...
Change-Id: Ib751beb081a1eecfe462919eaa3ce6ea71e56cd3
2016-01-19 19:57:15 +01:00
Jan Broß
cf4c7ec95c
Removes RaceLogDevicMarkMapping (bug2851)
2015-12-10 18:07:06 +01:00
Jan Broß
7414026cde
Removes RaceLogDeviceCompetitorMapping (bug2851)
2015-12-10 18:00:27 +01:00
Vladislav Chumak
Axel Uhl
Frank Mittag
Kai Boernert
Steffen Schäfer
Steffen Schaefer
Peter Siegmund
Benjamin Barth
Jan Broß