Commit Graph
691 Commits
Author SHA1 Message Date
Axel Uhl 30a62a68fb started to work on bug2715 by adding a method on TrackedLegOfCompetitor and support method on TrackedRace to calculate distance travled specifically for gate starts 2015-03-20 11:27:03 +01:00
Jan Broß 966b17b178 PingMark Endpoint now takes a single GPSFix and should solemnly be used for pinging a mark 2015-03-20 10:14:14 +01:00
Axel Uhl 4b62fa899f Merge branch 'master' into bug2652
Conflicts:
	java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/RaceLogTrackingAdapter.java
2015-03-13 22:27:27 +01:00
Axel Uhl 330a889dd4 Merge branch 'master' into ubilabs--tracking_app--develop 2015-03-04 16:46:28 +01:00
Axel Uhl 56b75890d2 first working version of competitor image upload 2015-02-27 22:01:30 +01:00
Lennart Hensler 3fa30e7f1e Introduced the HasMarkPassingContext as data type 2015-02-26 15:21:29 +01:00
Fredrik Teschke 54739ed42f add endpoint for pinging marks via regattalog 2015-02-14 12:53:33 +01:00
Fredrik Teschke 9c375a3ae4 Merge remote-tracking branch 'origin/master' into android_apps_no_rcapp_changes
Conflicts:
	.gitignore
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	mobile/com.sap.sailing.android.shared/.classpath
	mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/LaunchActivity.java
2015-02-13 11:16:50 +01:00
Fredrik Teschke 4cb7b535c8 Merge branch 'ftes-mail-move-to-sse' into jbross-email-invitation
Conflicts:
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
	java/com.sap.sailing.server/SailingServer (Proxy).launch
	java/com.sap.sailing.targetplatform.base/features/target-base/feature.xml
	java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-remote.target
2015-02-13 08:29:41 +01:00
Axel Uhl 98d5235b47 upgraded all Mongo-using bundles to 2.13.0 driver 2015-02-12 16:00:15 +01:00
Nicolas 7e3aab3a33 Merge remote-tracking branch 'origin/master' into mark-rounding-inference
Conflicts:
	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
2015-02-11 17:58:59 +01:00
Axel Uhl 325d308482 simplified implementation of CompetitorImpl.hasEmail() 2015-02-11 16:26:07 +01:00
Fredrik Teschke 523ad4cc3e Merge branch 'ftes-tycho-to-java-7-in-common-and-shared-poms' into jbross-email-invitation 2015-02-10 03:10:29 +01:00
Fredrik Teschke c861fcbd74 upgrade poms of shared and common bundles to 1.7 compiler level 2015-02-10 03:09:27 +01:00
Fredrik Teschke 04608c2ae7 add email to constructor of CompetitorImpl and fix bug (competitor email not loading on startup) 2015-02-10 00:49:53 +01:00
Jan Broß 7900b27805 First draft of E-Mail sending service 2015-02-05 23:12:44 +01:00
Jan Broß 0e4775d51f Add email field to Competitor 2015-02-04 22:36:48 +01:00
Nicolas 71a0c68499 Merge remote-tracking branch 'origin/master' into mark-rounding-inference
Conflicts:
	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
2015-02-04 17:38:16 +01:00
Peter Siegmund b86411c441 Merge branch 'master' into android_apps 2015-01-26 09:37:54 +01:00
Fredrik Teschke ab0c06c8e7 Merge remote-tracking branch 'origin/master' into ftes-file-storage
Conflicts:
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
2015-01-25 18:09:22 +01:00
Nicolas 6402631c8f Merge remote-tracking branch 'origin/master' into mark-rounding-inference 2015-01-24 16:33:26 +01:00
Nicolas a6f0206f0d Merge remote-tracking branch 'origin/master' into mark-rounding-inference
Conflicts:
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindTest.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java
2015-01-23 16:12:17 +01:00
Fredrik Teschke 72a9d6890e add logic to update team image, both in MongoDB and also replicated 2015-01-23 11:14:15 +01:00
Peter Siegmund 353e83f270 Merge branch 'master' into android_apps 2015-01-23 10:08:08 +01:00
Axel Uhl 620058524a moved ArrayListNavigableSet from com.sap.sse.common to com.sap.sse.shared.android because NavigableSet is not available in GWT's JRE emulation 2015-01-22 17:10:27 +01:00
Axel Uhl 0c43f2b64b moved color stuff from com.sap.sailing.domain.common to com.sap.sse.common 2015-01-22 11:05:24 +01:00
Axel Uhl ba4d5b0f6c moved CountryCode stuff to SSE 2015-01-22 11:01:01 +01:00
Axel Uhl 9fb859a8b3 major refactoring, solving bug 2578 by introducing com.sap.sse.shared.android and moving useful stuff to it that will compile on Android 2015-01-22 10:57:00 +01:00
Axel Uhl 9cdd2af1f2 bug 2578: removing dependency of com.sap.sailing.domain.shared.android from com.sap.sse; it doesn't seem to be required, at least it still compiles 2015-01-22 08:38:31 +01:00
Axel Uhl 14412c8290 got the first working test case for maneuver-based wind inference; two more tests still fail with a slightly mismatching wind estimation; need to analyze further 2015-01-21 21:29:04 +01:00
Peter Siegmund c580c10f89 Merge branch 'bug2572' into android_apps 2015-01-14 17:02:18 +01:00
Nicolas cd748fa12b Merge remote-tracking branch 'origin/master' into mark-rounding-inference
Conflicts:
	java/com.sap.sailing.autoload/src/com/sap/sailing/autoload/TracTrac.java
	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
	java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoRaceLogStoreVisitor.java
	java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/TrackedRaceLoadsFixesTest.java
	java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/RaceLogRaceTracker.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/RaceLogEventVisitor.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/impl/AbstractRaceLogChangedVisitor.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/impl/BaseRaceLogEventVisitor.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/impl/RaceLogEventFactoryImpl.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/MultipleClassesInRegattaTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReachingLegTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/UnicodeCharactersInCompetitorNamesTest.java
	java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindTest.java
	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.tractracadapter/src/com/sap/sailing/domain/tractracadapter/DomainFactory.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/TracTracAdapter.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceTrackingConnectivityParametersImpl.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracAdapterImpl.java
	java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracRaceTrackerImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/RaceColumnRaceLogReplicator.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java
	java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.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/raceboard/RaceBoardPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
	java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogEventSerializer.java
	java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackRaceReplicationTest.java
	java/com.sap.sailing.server/src/com/sap/sailing/server/masterdata/DummyTrackedRace.java
2015-01-08 05:27:20 +01:00
Axel Uhl 56a6dac5a8 Merge branch 'master' into boatclass-aliases 2015-01-05 21:28:19 +01:00
Fredrik Teschke 8cb4cf7ffc do not allow competitor to be null in RegisterCompetitorEvent 2015-01-05 09:45:58 +01:00
Axel Uhl a0da63625f added Elliott6m to BoatClassMasterData; search boat class under provided and canonicalized name 2015-01-04 11:50:29 +01:00
Axel Uhl cd2c0db907 use boat class display name from BoatClassMasterdata if available; needed to adjust one test case's verdict (505 --> 5O5) 2015-01-04 00:53:30 +01:00
Axel Uhl 3ae92c7afe looking up and registering BoatClass objects with name, display name and alternative names from BoatClassMasterdata 2015-01-03 11:58:17 +01:00
Fredrik Teschke d693090d81 Merge branch 'master' into regatta-log
Conflicts:
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/race/tracking/DeviceWithTimeRange.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/abstractlog/shared/analyzing/DeviceMappingFinder.java
	java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelogtracking/impl/DeviceMappingImpl.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/racelog/tracking/EmptyGPSFixStore.java
	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/trackfiles/impl/DeviceWithTimeRangeImpl.java
2014-12-24 12:45:22 +01:00
Fredrik Teschke a8e8d22857 move TimeRange to SSE 2014-12-24 12:27:58 +01:00
Fredrik Teschke bd8c8ff7cb remove DeviceWithTimeRange 2014-12-24 11:14:01 +01:00
Axel Uhl 608330e826 Merge branch 'master' into regatta-log
Conflicts:
	java/com.sap.sailing.gwt.ui/SailingGWT Remote Profiling (Run-Mode only).launch
	java/com.sap.sailing.gwt.ui/SailingGWT.launch
2014-12-22 14:22:32 +01:00
Axel Uhl 35b18c1312 implemented ConcurrentHashBag.Iterator.remove() and added test cases 2014-12-19 15:05:34 +01:00
Axel Uhl b0eb0bf0b0 replacing private int size by private AtomicInteger size; this avoids race conditions during decrement/increment operations 2014-12-19 14:37:13 +01:00
Fredrik Teschke a6c17ad1ec Merge remote-tracking branch 'origin/master' into regatta-log
Conflicts:
	java/com.sap.sailing.domain.racelogtrackingadapter.test/src/com/sap/sailing/domain/racelogtracking/test/impl/CreateAndTrackWithRaceLogTest.java
	java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/RaceLogRaceTracker.java
	java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/SwissTimingAdapter.java
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/AbstractRaceColumn.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
2014-12-19 14:31:41 +01:00
Axel Uhl 30b4657452 inlined Thread.currentThread() consistently 2014-12-19 09:43:03 +01:00
Axel Uhl 1a67e2b5b3 Merge branch 'master' into bug2502 2014-12-19 08:48:58 +01:00
Axel Uhl cdfe598c2a removed WithImage as it was used nowhere and implemented nowhere in a meaningful way 2014-12-19 08:47:47 +01:00
Axel Uhl a21e5159b8 added missing adding thread to readers collection in currently unused ReadLockWrapper.lock() method 2014-12-15 15:08:43 +01:00
Nicolas 639a8926af Merge remote-tracking branch 'origin/master' into mark-rounding-inference
Conflicts:
	java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.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
2014-12-14 17:01:29 +01:00
Axel Uhl de9d9f701d fixed NoSuchElementException checks in ArrayListNavigableSet 2014-12-12 23:19:09 +01:00