Commit Graph
1709 Commits
Author SHA1 Message Date
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
Axel Uhl 89a4ead050 added a little Javadoc 2015-03-20 17:28:35 +01:00
Axel Uhl 495cd85bd0 added distance-considering-gate-start metric also at race level 2015-03-20 14:18:59 +01:00
Axel Uhl 5fd384af5c added metric for distance including gate start consideration to leaderboard and REST API 2015-03-20 13:34:44 +01:00
Alexander Ries a1ad8df545 added dashboard and mgwt bundle to server launch configs 2015-03-20 10:14:48 +01:00
Axel Uhl 3566447976 added mgwt and dashboard to launch config 2015-03-20 08:46:53 +01:00
Axel Uhl d19af01a76 added settings dialog component entry for start to next mark lines; added mgwt and ribdashboard to bundle list 2015-03-19 18:03:08 +01:00
Axel Uhl acf0b77da5 fixed selection style 2015-03-19 17:37:47 +01:00
Christopher Ronnewinkel (D036654) 19fec74ab0 add race-listener; prepare race-change-listener as leg-change-listener; cleanup cache and race-change-listener on remove race; 2015-03-19 16:02:55 +01:00
Frederik Petersen 09b8c02316 MasterDataImport can now access class loaders to which there is no dep
The bundles need to implement a MasterDataImportClassLoaderService in
their Activator on start and unregister it on stop. You can see an example
in the racelogtracking bundle.
fixes 2707
2015-03-18 16:21:57 +01:00
Jan Broß 9ce2c15d60 Merge branch 'jbross-buoy-tender' of ssh://sapsailing.com/home/trac/git into jbross-buoy-tender 2015-03-18 16:10:51 +01:00
Jan Broß ec20a6042f Return latest known position if existent when pinging mark 2015-03-18 16:05:23 +01:00
Axel Uhl 1f543fdf3f Merge branch 'master' into raceboard-simulation 2015-03-18 13:54:50 +01:00
Christopher Ronnewinkel (D036654) 1fe0e4f205 cleanup logging: put simulation-details to FINE and simulation-service to INFO; 2015-03-17 15:52:38 +01:00
Frederik Petersen 212f30446b PolarDataMiner now waits for replay races to finish tracking 2015-03-17 14:37:45 +01:00
Christopher Ronnewinkel (D036654) 7e25e61456 ensure unique assignment of race-change-listener to tracked-race per key; 2015-03-17 09:26:46 +01:00
Christopher Ronnewinkel (D036654) f5dc91187c support fail-over when server is shutdown & restarted (so that without touching the client/browser simulation-results will reappear like the boats do; 2015-03-16 17:11:52 +01:00
Christopher Ronnewinkel (D036654) 08e3018c05 control cache-update-frequency by scheduling summarizing trigger-update to the future (instead of Thread.sleep()); 2015-03-16 15:47:45 +01:00
Christopher Ronnewinkel (D036654) 0304605b20 alternative implementation of cache-updates for simulation; requires small change/fix in smart-future-cache; 2015-03-14 21:35:36 +01:00
Christopher Ronnewinkel (D036654) 98e63492d5 reduce simulation-thread-pool-size to 1/3 of available processors; add some comments; fix race color for internet explorer; 2015-03-14 21:33:24 +01:00
Peter Siegmund f169fc8b4f Merge branch 'master' into ubilabs--tracking_app--develop
Conflicts:
	java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch
	java/com.sap.sse.security.ui/Security UI sdm.launch
2015-03-12 10:06:04 +01:00
Christopher Ronnewinkel (D036654) a2d684d7be Merge remote-tracking branch 'ExternalGit/master' into raceboard-simulation
Conflicts:
	java/com.sap.sailing.dashboards.gwt/SailingDashboardsGWT sdm.launch
	java/com.sap.sailing.gwt.ui/SailingGWT Remote Profiling (Run-Mode only).launch
	java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch
	java/com.sap.sailing.gwt.ui/SailingGWT.launch
2015-03-11 13:39:18 +01:00
Christopher Ronnewinkel (D036654) 7f0c0a458a add waiting duration before triggering next simulation-cache-update to race-change-listener; 2015-03-11 13:32:37 +01:00
Christopher Ronnewinkel (D036654) c9f24d3e78 add ui-update of race-map simulation-overlay after an update of simulation-cache using the cached simulation-result hashCode() as version-identifier (identifying the class-instance); 2015-03-11 09:42:39 +01:00
Axel Uhl 02e70fc1d9 preparing for rank-over-wind data analysis 2015-03-10 15:42:36 +01:00
Christopher Ronnewinkel (D036654) fdc503d53b Merge remote-tracking branch 'ExternalGit/master' into raceboard-simulation
Conflicts:
	java/com.sap.sailing.simulator/src/com/sap/sailing/simulator/impl/PolarDiagramGPS.java
2015-03-06 15:19:49 +01:00
Christopher Ronnewinkel (D036654) 189b3be8ff cleanup of simulator implementation; 2015-03-05 15:35:19 +01:00
Christopher Ronnewinkel (D036654) c2ea7e3965 parallelisation of standalone simulation; pass leg-type from tracked-race to raceboard simulation; 2015-03-05 14:27:26 +01:00
Axel Uhl 330a889dd4 Merge branch 'master' into ubilabs--tracking_app--develop 2015-03-04 16:46:28 +01:00
Christopher Ronnewinkel (D036654) 08164805a2 fix raceboard simulation in live mode; 2015-03-03 13:14:04 +01:00
Simon Pamies 4b79441c19 Working version where leaderboard columns sailid and competitor name can be toggled 2015-03-03 12:51:47 +01:00