 Axel Uhl
|
6d20c02f17
|
added theme project to launch config
|
2015-04-30 01:11:33 +02:00 |
|
 Christopher Ronnewinkel (D036654)
|
43f1c7eeb9
|
Merge remote-tracking branch 'ExternalGit/master' into raceboard-simulation
|
2015-04-29 11:24:20 +02:00 |
|
 Frederik Petersen
|
8af7e3954e
|
Fixed bug2762
When importing, we see if there is an equal fix (if yes, no database
insertion)
|
2015-04-29 10:19:45 +02:00 |
|
|
Christopher Ronnewinkel (D036654)
|
3e69f05216
|
check for zero-speed due to missing wind or polar data; extend get-even-timed-path for the case of two cornerpoints per step; scale turning step of finish-phase 1-turner to layline; fix plausibility check;
|
2015-04-29 09:36:00 +02:00 |
|
|
Christopher Ronnewinkel (D036654)
|
797d3876d3
|
support start-line initialization in tree-grow-360; fix orientation in initial steps of opportunist-360;
|
2015-04-27 17:29:01 +02:00 |
|
|
Frederik Petersen
|
e807456eec
|
Fixed errors after merge
|
2015-04-25 16:35:39 +02:00 |
|
|
Frederik Petersen
|
ca2ac594f5
|
Merge branch 'master' into bug2700
Conflicts:
java/com.sap.sailing.server/META-INF/MANIFEST.MF
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java
java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagramGPSDirect.java
|
2015-04-24 18:41:37 +02:00 |
|
|
Christopher Ronnewinkel (D036654)
|
93f1c21764
|
Merge remote-tracking branch 'ExternalGit/master' into raceboard-simulation
|
2015-04-24 13:53:24 +02:00 |
|
|
Axel Uhl
|
c7d6f62a75
|
fixing bug 2767 by also registering the old GPSFix(Moving)Impl type names with their old package locations for the Mongo persistence handler;
the commit in which the types were moved was 58bd451481
|
2015-04-23 15:41:08 +02:00 |
|
|
Christopher Ronnewinkel (D036654)
|
47f5a4ae51
|
Merge remote-tracking branch 'ExternalGit/master' into raceboard-simulation
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.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/server/SimulatorServiceImpl.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/PathCanvasOverlay.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/ReplayPathCanvasOverlay.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/simulator/SimulatorMap.java
java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGeneratorTracTrac.java
java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PathGeneratorTreeGrow.java
|
2015-04-23 14:33:48 +02:00 |
|
|
Frederik Petersen
|
9cff25eab8
|
Merge branch 'master' into bug2700
Conflicts:
java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/RaceResultOfCompetitorWithContext.java
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/mock/MockedTrackedRaceWithStartTimeAndRanks.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/polars/PolarDataService.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedRace.java
java/com.sap.sailing.polars.test/src/com/sap/sailing/polars/mining/test/PolarDataMinerTest.java
java/com.sap.sailing.polars/src/com/sap/sailing/polars/impl/PolarDataServiceImpl.java
java/com.sap.sailing.polars/src/com/sap/sailing/polars/mining/PolarDataMiner.java
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/PolarResource.java
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/Activator.java
java/com.sap.sailing.server/src/com/sap/sailing/server/masterdata/DummyTrackedRace.java
|
2015-04-23 13:36:00 +02:00 |
|
|
Frederik Petersen
|
6089c83613
|
Introduces polardataservice to tracked race
transient
can be null, needs to be handled accordingly
is null, if polar osgi bundle is stopped
|
2015-04-23 11:38:41 +02:00 |
|
|
Frederik Petersen
|
f8f2ada89c
|
PolarDataService now uses OSGi service registry
preparation for being able to use polar data service in domain classes
|
2015-04-23 10:58:54 +02:00 |
|
|
Christopher Ronnewinkel (D036654)
|
4c395695db
|
support reaching steps in opportunist-360;
|
2015-04-21 22:35:56 +02:00 |
|
|
Christopher Ronnewinkel (D036654)
|
b11c4e151a
|
fix continuing-step for reaching; add sparse-polar-data-exception to path-generator;
|
2015-04-17 16:12:11 +02:00 |
|
 fmittag
|
59248fcf49
|
added flagImageUrl as new attribute on competitor to enable custom flags (e.g. club flags) instead of the nation flags
|
2015-04-16 17:38:08 +02:00 |
|
|
Axel Uhl
|
68f70a8375
|
Merge branch 'master' into bug489
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
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties
|
2015-04-07 13:20:54 +02:00 |
|
|
Axel Uhl
|
094234b654
|
moved all Position-related classes including Compact... representations to common bundle; provided CustomFieldSerializer for all Position subclasses that require it
|
2015-04-03 16:12:21 +02:00 |
|
|
Axel Uhl
|
58bd451481
|
moved other Position implementations to common packages to share them with GWT and make then GWT-serializable
|
2015-04-02 16:42:10 +02:00 |
|
|
Christopher Ronnewinkel (D036654)
|
47bbee5a63
|
Merge remote-tracking branch 'ExternalGit/master' into raceboard-simulation
|
2015-04-02 16:41:10 +02:00 |
|
|
fmittag
|
2f08fb7a4e
|
added a new method getLastLegStarted(timepoint) on trackedRace to improve leg progress calculation
|
2015-04-02 16:32:50 +02:00 |
|
 sailing
|
ada387d273
|
Merge remote-tracking branch 'origin/master' into raceboard-simulation
|
2015-04-01 10:33:12 +02:00 |
|
 Alexander Ries
|
50a32e3558
|
fixed conflicts in Dummy and Moqued TrackedRaces
|
2015-04-01 10:31:21 +02:00 |
|
|
Alexander Ries
|
a46f2a6b80
|
Merge remote-tracking branch 'origin/ribdashboard' into ribdashboard
|
2015-04-01 10:25:52 +02:00 |
|
|
Alexander Ries
|
8d3cb289d5
|
added getGateStartGolfDownTime() method to TrackedRace
|
2015-04-01 10:23:41 +02:00 |
|
|
Axel Uhl
|
d89f461191
|
don't create mark passing calculator on replica; mark passings are replicated using UpdateMarkPassings operation
|
2015-03-31 19:56:35 +02:00 |
|
|
Axel Uhl
|
81fc752c06
|
Merge branch 'master' into mark-rounding-inference
|
2015-03-30 22:32:03 +02:00 |
|
|
Axel Uhl
|
34169f8e77
|
Merge branch 'master' into raceboard-simulation
|
2015-03-30 22:05:27 +02:00 |
|
|
Axel Uhl
|
e75b2e1985
|
it's important to always return the same classloader; otherwise, the classes and hence the objects won't be compatible / equal
|
2015-03-30 20:56:11 +02:00 |
|
|
fmittag
|
a1361ca495
|
fixed compile error in SimulationService
|
2015-03-30 18:25:09 +02:00 |
|
|
fmittag
|
fdbde8b8fc
|
Merge remote-tracking branch 'origin/master' into raceboard-simulation
Conflicts:
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
|
2015-03-30 18:13:30 +02:00 |
|
|
Axel Uhl
|
9001649b99
|
fixed waiting on Replicator's queue to become empty; this avoids the AlreadyClosedExceptions, it seems, but the testWindSourcesToExcludeReplication test still fails locally
|
2015-03-30 11:50:48 +02:00 |
|
|
Axel Uhl
|
aa0ed9e815
|
partly reverting commit 21d5d33f78 to see what is causing the issue in Hudson
|
2015-03-30 10:10:07 +02:00 |
|
|
Axel Uhl
|
06872cc3ec
|
Merge branch 'master' into mark-rounding-inference
Conflicts:
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java
|
2015-03-29 20:11:01 +02:00 |
|
|
Axel Uhl
|
21d5d33f78
|
fixing re-opened bug 2707, now also for replication-related de-serialization in RacingEventServiceImpl, using the same class loader
|
2015-03-29 18:00:07 +02:00 |
|
|
Axel Uhl
|
ba47883a59
|
Merge branch 'master' into mark-rounding-inference
Conflicts:
java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/MarkPassingUpdateListener.java
java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/impl/DynamicTrackedRaceImpl.java
|
2015-03-27 15:39:19 +01:00 |
|
|
Axel Uhl
|
e1e047bd75
|
Merge branch 'master' into mark-rounding-inference
Conflicts:
java/com.sap.sailing.domain.persistence/src/com/sap/sailing/domain/persistence/impl/MongoObjectFactoryImpl.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/markpassing/AbstractMockedRaceMarkPassingTest.java
java/com.sap.sailing.domain/META-INF/MANIFEST.MF
java/com.sap.sailing.domain/src/com/sap/sailing/domain/markpassingcalculation/CandidateFinder.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.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/event/regattaanalytics/RegattaAnalyticsDataManager.java
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/seriesanalytics/EventSeriesAnalyticsDataManager.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/StringMessages_ru.properties
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java
|
2015-03-26 14:51:48 +01:00 |
|
|
Christopher Ronnewinkel (D036654)
|
3acbf62b62
|
Merge remote-tracking branch 'ExternalGit/master' into raceboard-simulation
|
2015-03-26 12:41:16 +01:00 |
|
|
Frederik Petersen
|
c283d9276a
|
Introduces oldStatus parameter for state change listener
polar service can now listen for state changes (loading -> x)
|
2015-03-25 10:51:47 +01:00 |
|
|
Axel Uhl
|
c9d9a59ea1
|
implementing solution for bug 2728: adding last known position to marks list
|
2015-03-24 17:10:44 +01:00 |
|
|
Axel Uhl
|
9a81fe3e70
|
Merge branch 'jbross-buoy-tender'
Conflicts:
java/com.sap.sailing.dashboards.gwt/SailingDashboardsGWT sdm.launch
|
2015-03-24 11:16:47 +01:00 |
|
|
Christopher Ronnewinkel (D036654)
|
9a3df037cc
|
Merge remote-tracking branch 'ExternalGit/master' into raceboard-simulation
Conflicts:
java/com.sap.sailing.dashboards.gwt/SailingDashboardsGWT sdm.launch
|
2015-03-24 09:44:09 +01:00 |
|
|
Alexander Ries
|
c51ba95293
|
Merge remote-tracking branch 'origin/master' into ribdashboard
|
2015-03-24 00:05:59 +01:00 |
|
|
Axel Uhl
|
8267c32263
|
improved Javadoc for new TrackedRace.getTrack(Mark) and old TrackedRace.getOrCreateTrack(Mark); use new getTrack(Mark) in RacingEventServiceImpl
|
2015-03-23 22:30:30 +01:00 |
|
|
Axel Uhl
|
29284adfa4
|
consolidated acquisition of mark position from tracked races, regatta log and race logs
|
2015-03-23 22:25:40 +01:00 |
|
|
Axel Uhl
|
911cdeb86b
|
Merge branch 'master' into jbross-buoy-tender
Conflicts:
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/RegattasResource.java
|
2015-03-23 20:52:00 +01:00 |
|
|
Axel Uhl
|
f8c16d1049
|
Merge branch 'jbross-buoy-tender' into bug2724
Conflicts:
java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/RaceLogTrackingAdapterImpl.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/StringMessages_ru.properties
|
2015-03-23 16:18:37 +01:00 |
|
|
Christopher Ronnewinkel (D036654)
|
fb6d2cbe19
|
Merge remote-tracking branch 'ExternalGit/master' into raceboard-simulation
|
2015-03-20 22:03:17 +01:00 |
|
|
Christopher Ronnewinkel (D036654)
|
08634ee713
|
Merge remote-tracking branch 'ExternalGit/raceboard-simulation' into raceboard-simulation
|
2015-03-20 21:20:55 +01:00 |
|
|
Axel Uhl
|
641b02357f
|
Merge branch 'master' into bug2715
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
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties
|
2015-03-20 17:44:35 +01:00 |
|