Commit Graph
173 Commits
Author SHA1 Message Date
Lukas Niemeier 422d24eaa5 Merge branch 'otracelog' into racecommittee_app
Conflicts:
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoRaceLogStoreImpl.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/RaceLog.java
	java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/MasterDataImportTest.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppConstants.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppPreferences.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/data/OnlineDataManager.java
2013-11-04 01:48:14 +01:00
Lukas Niemeier bb58d78236 Merge branch 'master' into racecommittee_app
Conflicts:
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.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
	java/com.sap.sailing.server.gateway/WEB-INF/web.xml
	java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java
2013-10-30 14:38:14 +01:00
Lukas Niemeier be66f2e380 # added some missing comments 2013-10-29 22:26:19 +01:00
Lukas Niemeier e94dcf286e # added replication tests 2013-10-29 22:17:51 +01:00
Lukas Niemeier 5230799349 # added replication to device configuratiom 2013-10-24 20:00:39 +02:00
Lukas Niemeier dda35a025c # fixed bug when persisting any device matchers 2013-10-24 19:36:12 +02:00
Lukas Niemeier 4418418545 # added persistence to device configurations 2013-10-24 19:24:24 +02:00
Lukas Niemeier 313085c456 # added server code to create, edit and delete device configurations 2013-10-23 16:02:09 +02:00
Lukas Niemeier 8a34842d14 # renamed TabletConfiguration to DeviceConfiguration 2013-10-16 16:04:17 +02:00
Lukas Niemeier 945b81d248 typo 2013-10-11 18:33:37 +02:00
Lukas Niemeier 7b1b1fd5df # configuration of min/max rounds allowed on course
# configuration of results mail recipient
2013-10-11 18:31:08 +02:00
Lukas Niemeier ccd6fa0159 # Added TabletConfiguration to hold configuration 2013-10-08 17:59:19 +02:00
Frederik Petersen 4f31e90ed3 Merge branch 'master' into polars
Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
2013-10-08 15:38:46 +02:00
Axel Uhl 0eacd07015 improved logging for long-held write locks 2013-10-07 15:10:45 +02:00
Simon Pamies 81ff53a2a2 Fixed missing start time finder 2013-10-03 12:28:35 +02:00
Axel Uhl e504187f7e fixing bug 1537 by also avoiding duplicate replication of course area additions 2013-10-02 18:05:06 +02:00
Frederik Petersen f15cd53ee4 Merge branch 'master' into polars 2013-10-01 10:19:58 +02:00
Axel Uhl 069204f2e2 introduced RaceLog.load(RaceLogEvent) which, as opposed to add(...), does not notify listeners about the changes 2013-09-25 20:23:17 +02:00
Axel Uhl eed2af9d90 added a failing test case for the NPE during the deserialization of competitor-specific race log events;
The problem is that the competitor ID may not be resolvable in the receiving DomainFactory's competitor cache.
The root cause is that the receiver tries to resolve the race log event in the first place instead of simply
storing the race log event in the RaceLog. The solution will be not to trigger events when storing the race log
events into the RaceLog during master data import.
2013-09-25 20:03:48 +02:00
Axel Uhl abdae7e871 tricky Merge branch 'master' into otracelog; some of the otracelog changes had selectively been applied to master; need to check branch validity first
Conflicts:
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppPreferences.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/data/OnlineDataManager.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/clients/LoadClient.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/data/parsers/ManagedRacesDataParser.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/services/sending/EventSenderTask.java
	mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/LoginActivity.java
2013-09-17 17:57:38 +02:00
Frederik Petersen 450bf7397a Merge branch 'master' into polars
Conflicts:
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/PolarSheetGenerationTest.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/polarsheets/PerRaceAndCompetitorPolarSheetGenerationWorker.java
	java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/PolarSheetGenerationServiceTest.java
2013-08-21 10:59:26 +02:00
Axel Uhl f1fa1d74f6 moved a few more distance and speed types to domain.common and fixed a grave bug in MeterPerSecondSpeed; added test for improved outlier filtering 2013-08-14 18:00:45 +02:00
Frederik Petersen 0334b34518 Merge branch 'master' into polars 2013-08-13 10:52:13 +02:00
Axel Uhl a6be7f0d23 fixed MarkImpl.toString() for null color 2013-08-07 15:56:38 +02:00
Frederik Petersen bd4e46ddaf Only display polar sheet data with appropriate confidence
-small fix for gwt-highcharts for accepting null values in point array
-Added confidence measure for polar sheet data

Conflicts:
	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/PolarSheetsWindStepping.java
	java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/impl/WindSteppingImpl.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/BoatClassImpl.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/base/impl/ManeuverAngleTableImpl.java
2013-08-07 11:18:01 +02:00
Axel Uhl 5c72e6d251 enriched toString of RaceLogEvent by author info 2013-07-21 19:26:09 +02:00
Axel Uhl 832e73e2ff added RaceLogEventAuthor to RaceLogEvent and factored this through all constructor / factory / persistence / serialization code 2013-07-19 16:30:28 +02:00
Axel Uhl 8c4ffc756f introducing RaceLogEventAuthor with priority to decide precedences in competing multi-device scenarios 2013-07-19 15:21:48 +02:00
Axel Uhl e06da5e412 mark race log events transmitted by RaceGroupJsonExportServlet as delivered for the client 2013-07-18 23:53:18 +02:00
Armin Zamani 98d20345d5 Merge branch 'master' into racecommittee_app 2013-07-18 14:45:22 +02:00
Axel Uhl 3931d507e0 Merge branch 'master' into otracelog 2013-07-18 12:32:52 +02:00
Axel Uhl 9280d279e5 added toString() for RaceLogEvent; a first attempt to receive RaceLogEvents as response to the event sending request 2013-07-17 16:35:43 +02:00
Axel Uhl 40b2984fdd use constants consistently for servlet parameter names instead of using constant in one place and redundant string literal in another 2013-07-17 15:06:22 +02:00
Axel Uhl 313062c031 made RaceLogEvent fields final and private 2013-07-17 09:26:52 +02:00
Axel Uhl f194e91eac Merge branch 'racecommittee_app' into otracelog 2013-07-17 09:19:40 +02:00
Armin Zamani dbad878035 Removed additional getTimePoint() declaration in RaceLogEvent 2013-07-16 21:44:25 +02:00
Axel Uhl 55b3c9e028 Use URL-encoding for intent's RaceLogEvent to ensure there are no newlines contained; made clear where encoded and pure JSON version is passed 2013-07-16 16:04:25 +02:00
Axel Uhl e3a3002898 added add(RaceLogEvent, UUID) to RaceLog which delivers non-delivered race log events to a client with a UUID 2013-07-16 13:39:21 +02:00
Axel Uhl ada6f4b129 renamed anlyzation to analysis; some whitespace/formatting changes 2013-07-16 10:48:20 +02:00
Axel Uhl 48a83736b1 after a ConcurrentModificationException in LockUtil, turned the inner maps of lockCounts into a ConcurrentHashMap 2013-07-13 00:16:02 +02:00
Armin Zamani 4b40d90fd0 Merge branch 'racecommittee_app' into racecommittee_wind
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
2013-07-04 14:25:05 +02:00
Axel Uhl 50c0996dff switched from using Polyline to using Polygon for sidelines so that we support more than two marks as a sideline in general 2013-07-03 20:39:58 +02:00
Axel Uhl 135e677065 remove wind fixes from race committee wind source's track when race log is detached from tracked race 2013-07-03 13:09:23 +02:00
fmittag e0e4614751 initial version of sideline support (server side and drawing on map)
so far only sidelines modeled as gate are supported
2013-07-01 18:42:42 +02:00
Armin Zamani 314b12cbd7 Merge branch 'racecommittee_app' into racecommittee_wind 2013-06-27 23:13:07 +02:00
Fabian Tschirschnitz 64f7601354 added hotfix to solve problem with racecolumn reloading. 2013-06-27 18:56:43 +02:00
Armin Zamani 4d02b07304 Merge branch 'master' into racecommittee_app
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
2013-06-26 15:10:55 +02:00
Simon Pamies 81f9a007bb Added possibility to reload a racelog from database by using a button in the gwt ui 2013-06-26 13:54:28 +02:00
Armin Zamani a573ffb6fc Merge branch 'master' into racecommittee_app 2013-06-26 11:41:03 +02:00
Simon Pamies 2207fd8122 Extended logging 2013-06-26 10:34:40 +02:00