Commit Graph
351 Commits
Author SHA1 Message Date
Peter Siegmund 5d39835862 fixed wrong merge conflict 2014-11-19 08:57:45 +01:00
Peter Siegmund fc5cabb080 Merge branch 'master' into android_apps
Conflicts:
	java/com.sap.sailing.gwt.ui/SailingGWT.launch
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/FlatSmartphoneUuidAndGPSFixMovingJsonDeserializer.java
	mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/services/TrackingService.java
2014-11-19 07:58:37 +01:00
Fredrik Teschke 4acf842890 add gpsfixes endpoint in REST API and update tracking app 2014-11-16 20:13:28 +01:00
Peter Siegmund bbfcaddd2d Merge branch 'master' into feature/android_tracking_app 2014-11-06 09:11:51 +01:00
Fredrik Teschke 273afd47b5 add info about revoked event to RevokeEvent for debugging purposes 2014-10-31 21:35:09 +01:00
Peter Siegmund a513c6752c insert ContentProvider for SQLite 2014-10-23 13:46:51 +02:00
Jens Rommel 111486410d Fiddlig with Java 8 compiler settings... 2014-10-17 11:40:54 +02:00
Fredrik Teschke f4618273a1 allow serializing competitor without team and boat 2014-10-10 13:41:01 +02:00
Fredrik Teschke ba21f6e70d add additional servlet to receive fixes in flat JSON serialization 2014-10-09 18:05:25 +02:00
Axel Uhl 62eb430b7c Merge branch 'master' into bug2080
Conflicts:
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/FleetDeserializer.java
2014-08-29 13:11:24 +02:00
Axel Uhl 7dc02f6540 use image size in conjunction with "stage" URL marker to determine stage image 2014-08-25 23:31:24 +02:00
Axel Uhl 1b46a87d79 serialize cached image sizes with EventBase so they are available in GWT front-end to decide what goes to the stage and what not 2014-08-25 22:49:00 +02:00
fmittag 10671231f1 fixed parsing of nullable Boolean in LeaderboardGroupBaseJsonDeserializer 2014-08-05 11:56:28 +02:00
fmittag f947732ed1 some cleanup of json deserializers:
turned methods like
  String name = object.get(CourseAreaJsonSerializer.FIELD_NAME).toString();
to
   String name = (String) object.get(CourseAreaJsonSerializer.FIELD_NAME);
to make them null safe
2014-08-05 11:37:50 +02:00
Axel Uhl 2dd99d09ac added LeaderboardGroup.displayName to JSON serialization process 2014-08-05 00:03:00 +02:00
Axel Uhl c7b2aac868 Merge branch 'master' into bug2080 2014-07-27 13:56:53 +02:00
Axel Uhl 6edd663fdf cache wind with confidence in ShortTimeWindCache in TrackedRaceImpl, preparing for using COMBINED wind at course center of gravity 2014-07-25 11:12:38 +02:00
Simon Pamies 38e0b17e6a Introduced enum for AdditionalScoringInformationEvent that denotes the type of the information; extended various methods to include that type information; added string messages 2014-07-23 16:13:47 +02:00
Simon Pamies 49d66ee510 Also using UUID during deserialize to avoid creating new ones 2014-07-21 12:50:54 +02:00
Simon Pamies cca2866d76 Added deserializer, still needing to correctly implement revoke event 2014-07-21 01:06:00 +02:00
Simon Pamies ade5b5a35f Added new high point scoring scheme that checks if additional scoring information is available and iff gives a score of 8 for the winner 2014-07-20 23:20:30 +02:00
Fredrik Teschke 4f26add403 use SharedDomainFactory in deserializer 2014-06-24 14:42:37 +02:00
Axel Uhl 2fcd084f74 fixing bug 2003: after master data import of a leaderboard group, the overall leaderboard must be added to the RacingEventService 2014-06-16 22:30:02 +02:00
Axel Uhl 95ec12220a made JSON event deserialization null-safe for new attributes 2014-06-14 22:33:29 +02:00
Axel Uhl 89d8d4c7ba JSON serialization/deserialization of EventBase description/logoImagURL/sponsorImageURLs/officialWebsiteURL 2014-06-14 11:16:19 +02:00
Axel Uhl 42202bc996 added persistence support for the four new EventBase attributes logoImageURL, sponsorImageURLs, officialWebsiteURL and description 2014-06-14 11:03:28 +02:00
Simon Pamies 072fc9167f Fixed serialization error that leads to unparseable JSON - strings always must be serialized as strings to get the quotes 2014-06-08 18:18:41 +02:00
Axel Uhl 28824d449a provided a sample search entry point which now works, also remotely 2014-06-05 00:15:19 +02:00
Axel Uhl 291360ee38 added JSON serialization and deserialization support with tests for LeaderboardSearchResult[Base] 2014-06-04 21:22:27 +02:00
Axel Uhl feb287bde1 started to add LeaderboardBase to make the LeaderboardSearchResult consistent with EventBase, LeaderboardGroupBase and then LeaderboardBase 2014-06-04 18:27:13 +02:00
Axel Uhl cef959a91f adding leaderboard group context to search results 2014-06-04 17:22:06 +02:00
Axel Uhl 93fe1d338e a first search REST service for cross-server search 2014-06-04 17:04:01 +02:00
Axel Uhl c2ec54f607 added missing leaderboard search result JSON serializer 2014-06-04 16:18:05 +02:00
Axel Uhl 53a0b36e8e consolidated all Util stuff in com.sap.sse.common.Util now 2014-06-03 00:01:14 +02:00
Axel Uhl cb9354b1a0 moved Util from com.sap.sailing.common to com.sap.sse.common 2014-06-02 23:57:16 +02:00
Axel Uhl 0c47e86304 moved Pair and Triple from com.sap.sailing.common.Util to com.sap.sse.common.Util and introduced all missing dependencies on com.sap.sse.common 2014-06-02 23:31:26 +02:00
Axel Uhl c4cea6660d introduced com.sap.sse.common.Util as superclass of com.sap.sailing.common.Util and added com.sap.sse.common to the required bundles of all users of com.sap.sailing.common.Util 2014-06-02 23:17:49 +02:00
Axel Uhl 6ecc711ea6 stripped leaderboard group (ID, name, description) is now JSON-serialized with Event 2014-06-02 15:32:24 +02:00
Axel Uhl 1bab76b12a moved image and video URL stuff from Event to EventBase so it can be included in REST API serialization/deserialization 2014-05-31 01:42:28 +02:00
Axel Uhl d3c214d945 added missing serializer to git 2014-05-30 15:05:30 +02:00
Fredrik Teschke 4b4b61b6c5 Merge remote-tracking branch 'origin/master' into ftes-rltracking
Conflicts:
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/tracking/impl/TrackImpl.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/GPSFixTrackImpl.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
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
2014-05-09 20:30:32 +02:00
Fredrik Teschke 329c4556b4 fixed test error in deserializing device identifiers by reworking logic of placeholder device id 2014-05-08 18:24:16 +02:00
Axel Uhl 7ca425d4a2 added observer pattern for Competitor, Team, Boat and Person 2014-05-07 22:57:27 +02:00
Fredrik Teschke 0f1efe52db changed serializers to deal with switch serialization pair 2014-05-02 13:49:46 +02:00
Fredrik Teschke 6f557fc6cf don't have to correct for magnetic variation, as GPS gives course over ground 2014-04-29 13:29:39 +02:00
Axel Uhl 27f364323c removed obsolete TODO 2014-04-27 23:32:05 +02:00
Fredrik Teschke ec15b110c8 include race id in denoteForTrackingEvent -> allows choosing custom stable ID 2014-04-24 07:18:37 +02:00
Fredrik Teschke 821f1307bf Merge remote-tracking branch 'origin/master' into gpsfixstore-independent-of-race
Conflicts:
	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/AbstractTimePoint.java
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/MongoObjectFactory.java
	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.shared.android/src/com/sap/sailing/domain/racelog/RaceLog.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/impl/NoAddingRaceLogWrapper.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/impl/RaceLogImpl.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/tracking/impl/TrackImpl.java
	java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/EndToEndListeningStoreAndFowardTest.java
	java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SwissTimingFactory.java
	java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingFactoryImpl.java
	java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingRaceTrackerImpl.java
	java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingTrackingConnectivityParameters.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/AbstractMockedRaceMarkPassingTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/FlorianopolisMarkPassingTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/OBMRMarkPassingTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.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.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/SailingServiceImplMock.java
	java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsoleEntryPoint.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardConfigPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RaceCourseManagementPanel.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
	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/server/SailingServiceImpl.java
	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/AbstractServerReplicationTest.java
	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
	java/com.sap.sailing.server/META-INF/MANIFEST.MF
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Jetty on 8889, Monitoring).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, No Tests).launch
	java/com.sap.sailing.server/SailingServer (No Proxy, Remote Debug SAP VM).launch
	java/com.sap.sailing.server/SailingServer (Proxy).launch
	java/com.sap.sailing.server/SailingServer (Proxy, Jetty on 8889).launch
	java/com.sap.sailing.server/SailingServer (Proxy, Remote Debug SAP VM).launch
	java/com.sap.sailing.server/SailingServer (Proxy, SwissTiming Live Simulation).launch
	java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/Activator.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2014-03-28 18:34:58 +01:00
Fredrik Teschke 92aef41f0c introduced smartphone UUID identifier as standard, imei identifier for testing only 2014-03-28 11:42:42 +01:00
Fredrik Teschke 8028bb55b0 don't capture class object in exception, GWT can't deal with generic class object 2014-03-16 23:09:31 +01:00