Axel Uhl
1505247fde
trying to fix bug 1335 by removing *all* mark passings with guessed time points; doesn't work properly yet
2013-04-05 10:22:10 +02:00
Axel Uhl
08f3426da8
enhanced logging for TMDMessageQueue
2013-04-05 02:17:42 +02:00
Axel Uhl
2217031496
implemented fix for bug 1335 by introducing TMDMessageQueue, queuing TMD messages for which no start time existed
2013-04-05 02:03:20 +02:00
Axel Uhl
53da3614a3
don't produce MarkPassing objects with null time point; this causes severe trouble; instead, guess start time from wall time
2013-04-04 18:44:28 +02:00
Axel Uhl
c4bcca282f
on bug 1331, improved the way StoreAndForward handles EOF conditions;
...
When a receiving socket is closed, don't close the forwarding channels to the clients.
When EOF is received, stop receiving thread because obviously the receiving channel has been closed.
2013-04-03 22:38:26 +02:00
Axel Uhl
edb481b0ad
enhanced logging in case EOF / -1 is read from SailMaster
2013-04-03 13:46:23 +02:00
Axel Uhl
22734d4445
setting stopped to true in SailMasterConnectorImpl when the thread stops because of an exception so it can be re-started
2013-04-03 13:31:06 +02:00
Axel Uhl
9473c6db02
made SailMasterConnector robust against null messages returned by the transceiver
2013-04-03 13:28:29 +02:00
Axel Uhl
430551d3bc
synchronize access to StoreAndForward data structures; ensure re-connects every second from SailMasterConnectorImpl to SailMaster/StoreAndForward
2013-04-02 14:43:02 +02:00
fmittag
098c4a89b8
Merge remote-tracking branch 'origin/master'
2013-04-02 12:58:18 +02:00
fmittag
0c10b9e0ca
made the parsing of swisstiming messages more robust against broken messages by catching the exceptions and ignoring the message
2013-04-02 12:58:03 +02:00
Axel Uhl
6177b2d647
working towards multiple inbound SwissTiming SailMaster connections; see bug 1325
2013-04-02 12:54:04 +02:00
Axel Uhl
d50f7411ff
update status of SwissTiming race to FINISHED when stopping tracker
2013-04-01 17:15:05 +02:00
Axel Uhl
94c6a60614
become robust against CCG messages with missing device set-ups on marks
2013-04-01 11:55:02 +02:00
Axel Uhl
a04861f57b
fixing bug 1320: wind tracking for SwissTiming races didn't wait until race definition was created
2013-03-31 14:58:12 +02:00
Axel Uhl
feaea37a0c
improved trace output for locking
2013-03-21 17:43:23 +01:00
Axel Uhl
8609ff84d1
fixed competitor ID problem for SwissTiming; pesistence layer assumed it could put a Serializable ID into a DBObject which is not the case;
...
More generally, this raises the question where else we rely on Serializable going into MongoDB. Opened bug 1311
2013-03-20 11:28:20 +01:00
Armin Zamani
b254437be3
Merge branch 'master' into racecommittee_integrated
...
Conflicts:
java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/DomainFactoryImpl.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseUpdateTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/RouteAssemblyTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindTest.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/impl/DomainFactoryImpl.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceCourseReceiver.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/Course.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/DomainFactory.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/CourseImpl.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
java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/ServerReplicationTest.java
java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceContentsReplicationTest.java
2013-03-01 15:10:49 +01:00
Armin Zamani
d7f9bbbaf9
Just formatting: Changed tabs to spaces by formatting hole files (Ctrl +
...
I in Eclipse) that we might have touched while developing on this branch
2013-03-01 14:33:37 +01:00
fmittag
4a90f84793
Merge remote-tracking branch 'origin/master' into passingSide
2013-02-27 16:05:59 +01:00
fmittag
88a6ea4f65
work commit..
...
added passingSide for course waypoints (parsed from tractrac metadata) to all course/waypoint creation methods and course updates
next step is adaptation of tests and swisstiming adapter
2013-02-26 20:04:25 +01:00
Armin Zamani
a779640411
Merge branch 'master' into racecommittee_integrated
...
Conflicts:
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseUpdateTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/OnlineTracTracBasedTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReceiveMarkPassingDataTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReceiveTrackingDataTest.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/impl/TracTracRaceTrackerImpl.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/TrackedRegatta.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRegattaImpl.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.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindTracksTest.java
2013-02-26 13:26:25 +01:00
Axel Uhl
58ffefff5a
fixing bug 1239 by also passing TrackedRace along with addRaceDefinition
2013-02-26 11:32:48 +01:00
Armin Zamani
9d72f87f04
Implemented CourseArea as another field to be selected in the Admin
...
Console for Regattas and propagated it in the Regatta infrastructure
2013-02-24 23:17:21 +01:00
Armin Zamani
730b431912
further implementation of racelogstore in the sailing suite
2013-02-19 19:05:28 +01:00
Lukas Niemeier
e29e4e7806
# Reworked placement of RaceLog to have it on RaceColumn again
...
# All code paths needing a real RaceLog are changed to use MongoRaceLogStoreFactory
# MISSING: REPLICATION ON RACECOLUMN!!!
2013-02-19 00:50:56 +01:00
Lukas Niemeier
5df89c7e7e
Merge branch 'master' into racecommittee_integrated
...
Conflicts:
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/FieldNames.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/base/impl/MarkImpl.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.java
java/com.sap.sailing.domain/META-INF/MANIFEST.MF
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/DomainFactory.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/leaderboard/impl/RegattaLeaderboardImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/meta/MetaLeaderboardColumn.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/.settings/com.google.gwt.eclipse.core.prefs
java/com.sap.sailing.gwt.ui/SailingGWT.launch
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AbstractLeaderboardDialog.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/FlexibleLeaderboardCreateDialog.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/FlexibleLeaderboardDialog.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/FlexibleLeaderboardEditDialog.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/LeaderboardDescriptor.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaLeaderboardCreateDialog.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaLeaderboardDialog.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaLeaderboardEditDialog.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.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/AbstractLeaderboardDTO.java
java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndLoadingEventsAndRegattas.java
java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF
java/com.sap.sailing.server/SailingServer (No Proxy).launch
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
java/pom.xml
2013-02-18 16:53:55 +01:00
Armin Zamani
ddea60f570
Removed RaceLogStore from RaceColumn implementations and all subsequent
...
classes
2013-02-18 01:34:14 +01:00
Armin Zamani
8ac062f3f2
Introduced RaceLogStore to RaceColumnInSeries
2013-02-10 21:42:05 +01:00
Armin Zamani
7d6d72785e
removed all RaceLog methods from TrackedRace and TrackedRaceImpl and
...
DynamicTrackedRace
changed TrackedRaceImpl constructor again, all calling methods are
changed appropriately
2013-02-09 01:10:39 +01:00
Armin Zamani
02b225f307
Renamed RaceCommittee to RaceLog
2013-02-02 16:34:53 +01:00
Axel Uhl
171744a2c4
working towards solving bug 1184; introduced separate ID field in MarkImpl in addition to name
2013-02-01 18:01:02 +01:00
Armin Zamani
66424926c4
Merge branch 'master' into racecommittee_integrated
...
Conflicts:
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/CrossTrackErrorCache.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackBasedEstimationWindTrackImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/util/impl/SmartFutureCache.java
java/com.sap.sailing.freg.resultimport.test/bin/freg_html_export_sample.html
java/com.sap.sailing.gwt.ui/pom.xml
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/server/SailingServiceImpl.java
2013-01-30 16:36:08 +01:00
Axel Uhl
3e84566836
added progress indication for SwissTiming SailMaster connector
2013-01-29 14:14:51 +01:00
Armin Zamani
29a669e296
Merge branch 'master' into racecommittee_integrated
...
Conflicts:
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DomainObjectFactoryImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/CourseImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/util/impl/SmartFutureCache.java
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/AdminApp.java
2013-01-25 22:06:14 +01:00
Lennart Hensler
311576db6e
Replaced the catches of Throwable with catches of Exception
2013-01-25 10:28:07 +01:00
Armin Zamani
67fa3c01dc
Merge branch 'master' into racecommittee_integrated
...
Conflicts:
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracRaceTrackerImpl.java
java/com.sap.sailing.gwt.ui/build.properties
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsoleEntryPoint.java
2013-01-21 21:36:36 +01:00
Jens Rommel
08429d5a92
Turn test bundles to fragments.
...
- Builds with maven, except know local issue with selenium tests on my machine (due to Selenium/Firefox version mismatch)
- domain.test not suitable for a test fragment, since it contains larger parts of integration-tests using many different down-stream bundles.
2013-01-21 15:58:13 +01:00
Axel Uhl
c00efd6bf4
fixed more places where DateFormat's hh was used instead of HH
2013-01-18 19:31:34 +01:00
Armin Zamani
7deda8b123
Merge branch 'master' into racecommittee_integrated
...
Conflicts:
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/MongoObjectFactory.java
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/CollectionNames.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/FieldNames.java
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.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/DomainFactoryImpl.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/SwissTimingTrackingConnectivityParameters.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseUpdateTest.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/OnlineTracTracBasedTest.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/ReceiveMarkPassingDataTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ReceiveTrackingDataTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackBasedTest.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/impl/DomainFactoryImpl.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceCourseReceiver.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/TracTracRaceTrackerImpl.java
java/com.sap.sailing.domain/.classpath
java/com.sap.sailing.domain/.settings/org.eclipse.jdt.core.prefs
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/CourseArea.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Series.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/CourseAreaImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/CourseImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/RegattaImpl.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/leaderboard/meta/AbstractMetaLeaderboard.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/DynamicTrackedRace.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/DynamicTrackedRegatta.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/RaceChangeListener.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/TrackedRegatta.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/AbstractRaceChangeListener.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/CrossTrackErrorCache.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/DynamicTrackedRegattaImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/GPSFixTrackImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/MaxSpeedCache.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackBasedEstimationWindTrackImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegOfCompetitorImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRegattaImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/util/impl/LockUtil.java
java/com.sap.sailing.domain/src/com/sap/sailing/util/impl/RaceColumnListeners.java
java/com.sap.sailing.domain/src/com/sap/sailing/util/impl/SmartFutureCache.java
java/com.sap.sailing.gwt.ui/.settings/com.google.gwt.eclipse.core.prefs
java/com.sap.sailing.gwt.ui/build.properties
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/client/SailingService.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/LeaderboardDTOCache.java
java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingWindTracksTest.java
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/AdminApp.java
java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceContentsReplicationTest.java
java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerStartStopTest.java
java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerTest.java
java/com.sap.sailing.server/SailingServer (No Proxy).launch
java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/CreateTrackedRace.java
2013-01-10 18:28:46 +01:00
Axel Uhl
be5d8aa7a3
Merge branch 'master' into integration_tests
2013-01-09 23:10:26 +01:00
Axel Uhl
dcd27ccd79
don't thrown an exception in SailMasterConnectorImpl for message types that shall not trigger a notifyListeners...
2013-01-09 17:57:24 +01:00
Axel Uhl
211d1f9844
Merge branch 'master' into gwt25
...
Conflicts:
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/CompactWindImpl.java
java/com.sap.sailing.operationaltransformation/bin/com/sap/sailing/operationaltransformation/package.html
2013-01-09 17:16:07 +01:00
Lennart Hensler
5ab2fe025d
Removed warnings which came up with Eclipse 4.2 Juno. See Bug 1131 for more information.
2013-01-09 12:13:15 +01:00
Axel Uhl
7cc977f0ad
Merge branch 'master' into integration_tests
...
Conflicts:
java/.gitignore
java/com.sap.sailing.operationaltransformation/bin/com/sap/sailing/operationaltransformation/package.html
2013-01-09 09:35:57 +01:00
Axel Uhl
9e124fd30b
fix for bug 1114, using boat ID and boat class as key for SwissTiming competitors instead of only the sail number / boat ID
2013-01-08 16:11:28 +01:00
Axel Uhl
6a30a93e0d
Merge branch 'master' into gwt25
2013-01-08 15:18:41 +01:00
D049941
357c97ec72
Merge branch 'master' into 'integration_tests'
...
Conflicts:
java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/AbstractBearing.java
java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/DetailType.java
java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/MaxPointsReason.java
java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/Position.java
java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/Speed.java
java/com.sap.sailing.domain.common/src/com/sap/sailing/domain/common/WithID.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/MongoObjectFactory.java
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/DelayedLeaderboardCorrectionsImpl.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/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/MongoWindListener.java
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoWindStoreImpl.java
java/com.sap.sailing.domain.swisstimingadapter.persistence/src/com/sap/sailing/domain/swisstimingadapter/persistence/impl/CollectionNames.java
java/com.sap.sailing.domain.swisstimingadapter.persistence/src/com/sap/sailing/domain/swisstimingadapter/persistence/impl/FieldNames.java
java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/SimpleDomainFactoryTest.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/SwissTimingFactory.java
java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/DomainFactoryImpl.java
java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/RaceImpl.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.test/src/com/sap/sailing/domain/test/AbstractManeuverDetectionTestCase.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/AbstractTracTracLiveTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/CourseUpdateTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LeaderboardScoringAndRankingTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverAnalysis505Test.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverAnalysisIDMChampionsFinalTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverDetectionOnKielerWoche505Race2DataTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverDetectionOnMdM2011SemifinalTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/OnlineTracTracBasedTest.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/ReceiveMarkPassingDataTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/RouteAssemblyTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackBasedTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/TrackTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/WindEstimationOnStoredTracksTest.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/TracTracConnectionConstants.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/MarkPassingReceiver.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/MarkPositionReceiver.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/RaceCourseReceiver.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/Competitor.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Course.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/CourseListener.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/DomainFactory.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Event.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Mark.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/RaceDefinition.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Regatta.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/SpeedWithBearing.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/Waypoint.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/AbstractSpeedWithAbstractBearingImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/BoatClassImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/CourseImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/DomainFactoryImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/EventImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/KilometersPerHourSpeedWithBearingImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/MarkImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/RaceDefinitionImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/RegattaImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/base/impl/WaypointImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/DelayedLeaderboardCorrections.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/ScoringScheme.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractLeaderboardImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractScoringSchemeImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/HighPointExtremeSailingSeriesOverall.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/HighPointLastBreaksTie.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/LeaderboardTotalRankComparator.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/GPSFixTrack.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedLeg.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedLegOfCompetitor.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/CompactGPSFixMovingImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicGPSFixMovingTrackImpl.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.domain/src/com/sap/sailing/domain/tracking/impl/MaxSpeedCache.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/RaceRankComparator.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedLegOfCompetitorImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/TrackedRaceImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/WindTrackImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/util/CourseAsWaypointList.java
java/com.sap.sailing.expeditionconnector/src/com/sap/sailing/expeditionconnector/ExpeditionWindTracker.java
java/com.sap.sailing.feature.p2build/raceanalysis.product
java/com.sap.sailing.feature/feature.xml
java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/LeaderboardPanelMock.java
java/com.sap.sailing.gwt.ui/Leaderboard.css
java/com.sap.sailing.gwt.ui/Spectator.css
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/EventDialog.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/EventEditDialog.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/LeaderboardGroupConfigPanel.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RaceColumnsInLeaderboardDialog.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SailingEventManagementPanel.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SwissTimingEventManagementPanel.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/TracTracEventManagementPanel.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/AbstractEntryPoint.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/AbstractRegattaPanel.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/ColorMap.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/DetailTypeFormatter.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/client/TimePanel.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/CompareCompetitorsChartDialog.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardEntryPoint.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardPanel.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardSettings.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardSettingsDialogComponent.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LeaderboardUrlConfigurationDialog.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/LegColumn.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboardedit/EditableLeaderboardPanel.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboardedit/LeaderboardEditPage.java
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.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/AbstractLeaderboardDTO.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/CompetitorRaceDataDTO.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/CompetitorsRaceDataDTO.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/LeaderboardGroupDTO.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/LegEntryDTO.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/ManeuverDTO.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/MarkDTO.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/RaceColumnDTO.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/charts/AbstractChartPanel.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/charts/AbstractChartSettingsComponent.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/charts/ChartPanel.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/charts/LeaderboardRankChart.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/charts/MultiChartPanel.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/charts/MultiChartSettings.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/charts/MultiChartSettingsComponent.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/charts/WindChart.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/spectator/LeaderboardGroupOverviewPanel.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/spectator/LeaderboardGroupPanel.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/spectator/SpectatorEntryPoint.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/tv/TVViewController.java
java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndLoadingEventsAndRegattas.java
java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/TestStoringAndRetrievingLeaderboards.java
java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/RegattaReplicationTest.java
java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/TrackedRaceContentsReplicationTest.java
java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerStartStopTest.java
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, 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/operationaltransformation/AbstractAddRegattaOperation.java
java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/AddDefaultRegatta.java
java/com.sap.sailing.server/src/com/sap/sailing/server/operationaltransformation/AddSpecificRegatta.java
java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/RegattaDataPerLeg.java
java/pom.xml
2013-01-07 17:24:21 +01:00
Armin Zamani
9dd0bb7a76
Merge branch 'master' into racecommittee_integrated
...
Conflicts:
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.java
java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/SwissTimingRaceTrackerImpl.java
java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
2012-12-29 00:20:35 +01:00
Armin Zamani
6fd712e9de
Extended the TrackedRace Constructor by the RaceCommitteeStore, so that
...
a RC store has to be given at TrackedRace creation, necessary for
replication. All following TrackedRace constructor calls and calling
methods are adapted accordingly.
2012-12-28 15:50:36 +01:00
Axel Uhl
fmittag
Armin Zamani
Lukas Niemeier
Lennart Hensler
Jens Rommel
D049941