 Nicolas
|
e247087cc2
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/leaderboard/AnalyticsView.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsoleFeatures.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java
|
2014-11-18 13:26:19 +01:00 |
|
|
Nicolas
|
72fd3353d5
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
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
java/com.sap.sailing.domain/META-INF/MANIFEST.MF
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
|
2014-11-03 03:05:47 +01:00 |
|
|
Nicolas
|
dd0a2eaeb2
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
|
2014-10-02 22:07:41 +02:00 |
|
|
Nicolas
|
d8d1c32a04
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
|
2014-09-30 18:48:50 +02:00 |
|
|
Nicolas
|
628cf211b5
|
FixedRaceLogTracker.
|
2014-09-30 18:46:26 +02:00 |
|
|
Nicolas
|
b28c28fd1f
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
|
2014-09-30 14:02:23 +02:00 |
|
|
Nicolas
|
dc80d295e0
|
Changed creation of MPC to TrackedRace constructor parameter.
|
2014-09-30 14:01:26 +02:00 |
|
|
Nicolas
|
3fca293cc8
|
Fixed TrackedRace errors.
|
2014-09-28 20:59:46 +02:00 |
|
|
Nicolas
|
7521f46c9e
|
Enabled suspension of MPC.
|
2014-09-28 18:15:35 +02:00 |
|
|
Nicolas
|
69c0442364
|
Removed save button, edits now get calculated immedeatly.
|
2014-09-28 17:45:15 +02:00 |
|
|
Nicolas
|
7df597e28b
|
Working draft of editor.
|
2014-09-28 10:28:15 +02:00 |
|
|
Nicolas
|
a29ca21be3
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
|
2014-09-28 10:04:27 +02:00 |
|
|
Nicolas
|
f1c7a76510
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
|
2014-09-28 08:51:06 +02:00 |
|
|
Nicolas
|
f75727be84
|
Changed EditMarkPassingsPanel. 4 buttons for adding and removing fixed and
suppressions.
|
2014-09-27 19:28:06 +02:00 |
|
|
Nicolas
|
1d3c7c85c0
|
Merge remote-tracking branch 'origin/mark-rounding-inference' into mark-rounding-inference
Conflicts:
java/com.sap.sailing.autoload/src/com/sap/sailing/autoload/TracTrac.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/mock/MockedTrackedRace.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/DomainFactoryImpl.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/StringMessages.properties
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/server/SailingServiceImpl.java
|
2014-09-26 19:04:45 +02:00 |
|
|
Nicolas
|
69c7a81d2b
|
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/StringMessages_de.properties
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java
|
2014-09-26 18:32:52 +02:00 |
|
|
Nicolas
|
479b69bb03
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
Conflicts:
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/UnicodeCharactersInCompetitorNamesTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRace.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.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/home/client/place/leaderboard/AnalyticsView.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/leaderboard/TabletAndDesktopLeaderboardView.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/leaderboard/LeaderboardViewer.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/shared/leaderboard/MetaLeaderboardViewer.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/leaderboard/LeaderboardPanel.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.server.replication.test/src/com/sap/sailing/server/replication/test/TrackRaceReplicationTest.java
|
2014-09-22 19:17:44 +02:00 |
|
|
Nicolas
|
f88f4147b7
|
Suppression working.
|
2014-09-14 22:02:26 +02:00 |
|
|
Nicolas
|
67e41ee4ec
|
Fixed NPE.
|
2014-09-14 18:35:39 +02:00 |
|
|
Nicolas
|
387ea6ab7f
|
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/server/SailingServiceImpl.java
|
2014-09-14 18:24:21 +02:00 |
|
|
Nicolas
|
530078b6e3
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
|
2014-09-07 16:28:12 +02:00 |
|
|
Nicolas
|
befb773191
|
Changing MPs now works, suppressing and removing still faulty.
|
2014-09-07 16:27:19 +02:00 |
|
|
Nicolas
|
863d955339
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
|
2014-09-07 09:58:46 +02:00 |
|
|
Nicolas
|
4065a02b25
|
Fixed a Date/TimePoint issue.
|
2014-09-07 09:58:20 +02:00 |
|
|
Nicolas
|
25af4cc1b0
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
|
2014-09-06 18:12:46 +02:00 |
|
|
Nicolas
|
be6de509f3
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
|
2014-09-06 10:58:33 +02:00 |
|
|
Nicolas
|
b1f4332c63
|
First finished draft of MP-editing, still needs testing.
|
2014-09-06 10:57:51 +02:00 |
|
|
Nicolas
|
8daee1cf25
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
|
2014-09-05 14:25:14 +02:00 |
|
|
Nicolas
|
0683596816
|
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/server/SailingServiceImpl.java
|
2014-08-31 20:37:48 +02:00 |
|
|
Nicolas
|
e82d21382d
|
Editing Panel now checks the race log for previous edits. (Not working
yet).
|
2014-08-25 20:06:35 +02:00 |
|
|
Nicolas
|
f8f82b1a27
|
Added null check.
|
2014-08-25 17:15:46 +02:00 |
|
|
Nicolas
|
04838f5bc3
|
Merge branch 'master' into mark-rounding-inference
Conflicts:
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/leaderboard/LeaderboardPanel.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
|
2014-08-24 17:06:42 +02:00 |
|
|
Nicolas
|
829982e7c7
|
Got RaceLog in LeaderboardPanel.
|
2014-08-24 16:26:41 +02:00 |
|
|
Nicolas
|
929be44d41
|
Moved MP-Panel to LeaderboardPanel.
|
2014-08-24 15:30:42 +02:00 |
|
|
Nicolas
|
16e0290246
|
MarkPassings now are displayed in the editor, RaceLog connection is still
missing.
|
2014-08-21 18:20:32 +02:00 |
|
|
Nicolas
|
800b3699c9
|
Worked on editing UI-
|
2014-08-20 19:17:47 +02:00 |
|
|
Nicolas
|
13442394a8
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
Conflicts:
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/AbstractTracTracLiveTest.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java
|
2014-08-19 10:16:49 +02:00 |
|
|
Nicolas
|
923f6e4c28
|
Changed EditMarkPassingsChart to Panel.
|
2014-08-19 10:11:53 +02:00 |
|
|
Nicolas
|
965e12801c
|
Edited JavaDocs and variables in MPC.
|
2014-08-02 11:49:15 +02:00 |
|
|
Nicolas
|
e8cdb7d630
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
Conflicts:
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.persistence/src/com/sap/sailing/domain/persistence/impl/MongoRaceLogStoreVisitor.java
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/RaceLogEventFactory.java
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/RaceLogEventRestoreFactory.java
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/RaceLogEventVisitor.java
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/impl/BaseRaceLogEventVisitor.java
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/impl/RaceLogChangedVisitor.java
java/com.sap.sailing.domain.shared.android/src/com/sap/sailing/domain/racelog/impl/RaceLogEventFactoryImpl.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.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/racelog/RaceLogEventSerializerTest.java
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/racelog/impl/RaceLogEventDeserializer.java
java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/racelog/impl/RaceLogEventSerializer.java
|
2014-08-02 11:05:42 +02:00 |
|
|
Nicolas
|
d59ea0d460
|
Added MarkPassings button and started editing panel.
|
2014-08-02 10:55:27 +02:00 |
|
|
Nicolas
|
cb51193670
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
|
2014-07-20 09:30:53 +02:00 |
|
|
Nicolas
|
d722f354c6
|
Deleted tab in AdminConsole again as there is an better way to add the
contained features.
|
2014-07-19 19:56:09 +02:00 |
|
|
Nicolas
|
d8615abb4c
|
Added Ignore TracTrac MarkPassings CheckBox in
TracTracEventManagementPanel.
|
2014-07-19 12:19:07 +02:00 |
|
|
Nicolas
|
0c503da93a
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
|
2014-07-19 08:15:45 +02:00 |
|
|
Nicolas
|
5db4e3b35c
|
Added Tab in AdminConsole for managing MarkPassings.
|
2014-07-18 22:08:54 +02:00 |
|
|
Nicolas
|
3ca2fcc112
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
Conflicts:
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/MarkPassingCalculatorPerformanceTest.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/markpassingcalculation/MarkPassingUpdateListener.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/impl/DynamicTrackedRaceImpl.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceLogListener.java
java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java
java/com.sap.sailing.server/SailingServer (No Proxy).launch
|
2014-07-18 13:16:47 +02:00 |
|
|
Nicolas
|
7507d452c2
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
|
2014-06-29 10:11:46 +02:00 |
|
|
Nicolas
|
5bcce01bab
|
Merge remote-tracking branch 'origin/master'
|
2014-06-29 09:55:44 +02:00 |
|
|
Nicolas
|
b495d11b0e
|
Merge remote-tracking branch 'origin/master'
|
2014-06-28 16:56:41 +02:00 |
|
|
Nicolas
|
471ade090a
|
Removed failing test.
|
2014-06-28 16:56:05 +02:00 |
|
|
Nicolas
|
09e29248c0
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
|
2014-06-28 08:21:04 +02:00 |
|
|
Nicolas
|
3b5f00e8c6
|
Cleaned up Finder.
|
2014-06-27 18:07:59 +02:00 |
|
|
Nicolas
|
ebbc739c49
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
|
2014-06-27 18:00:31 +02:00 |
|
|
Nicolas
|
98fcaa619c
|
Speeded up fixesAffectedByNewMarkFixes, got rid of endless loop.
|
2014-06-27 17:59:33 +02:00 |
|
|
Nicolas
|
9c7259504b
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
|
2014-06-27 14:48:51 +02:00 |
|
|
Nicolas
|
35b7b495f7
|
Fix in chooser and finder.
|
2014-06-27 14:47:23 +02:00 |
|
|
Nicolas
|
0f20593ff9
|
Fixed some NPEs that occured during live use.
|
2014-06-27 11:39:59 +02:00 |
|
|
Nicolas
|
a4293746b5
|
Removing a RaceLog now notifies the MPC.
|
2014-06-27 09:53:28 +02:00 |
|
|
Nicolas
|
4b755b84df
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
Conflicts:
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceLogListener.java
|
2014-06-27 09:28:07 +02:00 |
|
|
Nicolas
|
5f32d7bfe3
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
|
2014-06-26 16:08:34 +02:00 |
|
|
Nicolas
|
a0381a8831
|
DynamicTrackedRaceLogListener now has its RaceLogs, enabling the Revoking
of fixed MarkPassings.
|
2014-06-26 14:32:39 +02:00 |
|
|
Nicolas
|
901808912a
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
|
2014-06-26 14:12:16 +02:00 |
|
|
Nicolas
|
3f6d04b8ca
|
Merge remote-tracking branch 'origin/master'
|
2014-06-26 14:11:02 +02:00 |
|
|
Nicolas
|
696835dbba
|
Merge remote-tracking branch 'origin/master'
|
2014-06-26 12:31:37 +02:00 |
|
|
Nicolas
|
0b86d5ab22
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
|
2014-06-26 12:30:16 +02:00 |
|
|
Nicolas
|
00c3a648b2
|
Finished racelog listening on MarkPassingUpdateListener.
|
2014-06-26 12:29:31 +02:00 |
|
|
Nicolas
|
c78ac4362f
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
|
2014-06-26 10:47:48 +02:00 |
|
|
Nicolas
|
ff60ac8414
|
Merge remote-tracking branch 'origin/master'
|
2014-06-25 17:06:22 +02:00 |
|
|
Nicolas
|
2c3093cf31
|
Changed the way fixed MarkPassings are passed through Calculator
infrastructure.
|
2014-06-25 12:02:51 +02:00 |
|
|
Nicolas
|
97ca0a6a3d
|
Fixed sometimes failing performance test.
|
2014-06-25 11:05:24 +02:00 |
|
|
Nicolas
|
abcc0d2f8c
|
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
|
2014-06-25 10:39:28 +02:00 |
|
|
Nicolas
|
ea8988a3aa
|
Started adjustment of DynamicTrackedRaceLogListener.
|
2014-06-25 10:38:02 +02:00 |
|
|
Nicolas
|
7dd9870eae
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
|
2014-06-19 12:20:26 +02:00 |
|
|
Nicolas
|
1f91d41ea7
|
Merge branch 'master' into mark-rounding-inference
Conflicts:
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/FieldNames.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/markpassing/AbstractMarkPassingTest.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/KW470MarkPassingTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/OBMR2012VRMarkPassingTest.java
java/com.sap.sailing.domain.tractracadapter/src/com/sap/sailing/domain/tractracadapter/impl/TracTracRaceTrackerImpl.java
|
2014-06-17 13:51:39 +02:00 |
|
|
Nicolas
|
b72522dace
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
|
2014-06-09 10:46:36 +02:00 |
|
|
Nicolas
|
7204d8081c
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
|
2014-06-08 16:55:10 +02:00 |
|
|
Nicolas
|
2cc1912b4e
|
Implemented serialization for SuppressedMarkPassingsEvent too.
|
2014-06-08 16:16:31 +02:00 |
|
|
Nicolas
|
34a6accec1
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
|
2014-06-08 14:01:06 +02:00 |
|
|
Nicolas
|
0677b6d41c
|
Renames.
|
2014-06-08 08:24:43 +02:00 |
|
|
Nicolas
|
08b68635a1
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
|
2014-06-08 07:20:40 +02:00 |
|
|
Nicolas
|
207b685c0e
|
Enabled (de)serialization of FixedMarkPassingEvents.
|
2014-06-07 17:47:10 +02:00 |
|
|
Nicolas
|
af82ea42e6
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
|
2014-06-07 10:52:15 +02:00 |
|
|
Nicolas
|
8e729a8d01
|
Adjusted tests.
|
2014-06-06 18:47:01 +02:00 |
|
|
Nicolas
|
0483b7d3e9
|
Added test for suppressing MarkPassings.
|
2014-06-06 08:34:07 +02:00 |
|
|
Nicolas
|
7d079f143c
|
Fixed Util.Pair
|
2014-06-05 21:41:15 +02:00 |
|
|
Nicolas
|
53b6c6d5b7
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
Conflicts:
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/AbstractMarkPassingTest.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/CandidateFinderTest.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/MarkPassingCalculatorPerformanceTest.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/base/Course.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/AbstractCandidateChooser.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/AbstractCandidateFinder.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/CandidateChooser.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/CandidateFinder.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/MarkPassingCalculator.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/MarkPassingUpdateListener.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/impl/DynamicTrackedRaceImpl.java
java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/MockedTrackedRace.java
|
2014-06-05 18:13:54 +02:00 |
|
|
Nicolas
|
c513a74c8a
|
Fixed failing tests and implemented suppressing waypoints in backend.
|
2014-06-05 18:04:23 +02:00 |
|
|
Nicolas
|
cd193d6049
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
|
2014-06-02 19:07:59 +02:00 |
|
|
Nicolas
|
e14f43017b
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
|
2014-06-02 16:03:18 +02:00 |
|
|
Nicolas
|
449af55676
|
Merge remote-tracking branch 'origin/mark-rounding-inference' into mark-rounding-inference
|
2014-06-01 14:10:02 +02:00 |
|
|
Nicolas
|
52d0d987aa
|
Fixed Waypoint addition outside of Finder and reworked
ChooserPerformanceTest.
|
2014-06-01 14:08:08 +02:00 |
|
|
Nicolas
|
3906a4180a
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
|
2014-05-30 17:39:03 +02:00 |
|
|
Nicolas
|
bd97dec5ce
|
Created RaceLog Events for fixing and suppressing MarkPassings.
|
2014-05-30 16:42:59 +02:00 |
|
|
Nicolas
|
880d00f900
|
Merge remote-tracking branch 'origin/mark-rounding-inference' into mark-rounding-inference
Conflicts:
java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/CandidateFinder.java
|
2014-05-28 15:19:48 +02:00 |
|
|
Nicolas
|
2a4db3156f
|
Fixed test failing because of merge and bad tractrac data.
|
2014-05-28 15:13:53 +02:00 |
|
|
Nicolas
|
df1614a12d
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
Conflicts:
java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/CandidateFinder.java
|
2014-05-27 16:24:37 +02:00 |
|
|
Nicolas
|
3ee3c00a14
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
|
2014-05-15 01:12:13 +02:00 |
|
|
Nicolas
|
162094b6aa
|
Fixed WhiteBox tests.
|
2014-05-14 17:19:00 +02:00 |
|
|
Nicolas
|
6ac6a598fd
|
Merge remote-tracking branch 'origin/master' into mark-rounding-inference
|
2014-05-14 16:29:55 +02:00 |
|