working on passing ExpeditionDeviceConfigurations through to the UI

Change-Id: I9d4027a3063fd614e9166a6a8d9279ae28613ded
This commit is contained in:
Axel Uhl committed 2017-10-25 15:06:45 +02:00
1 parent b24f5a089e
commit 4599f91475
2 files changed
+2 -1

No files matched your search

@@ -6664,5 +6664,6 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S
if (expeditionConnector != null) {
Util.addAll(expeditionConnector.getDeviceConfigurations(), result);
}
return result;
}
}
@@ -3512,7 +3512,7 @@ public class RacingEventServiceImpl implements RacingEventService, ClearStateTes
private Iterable<WindTrackerFactory> getWindTrackerFactories() {
final Set<WindTrackerFactory> result;
if (bundleContext == null) { // the non-OSGi case
result = Collections.singleton((WindTrackerFactory) ExpeditionTrackerFactory.getInstance());
result = Collections.singleton((WindTrackerFactory) ExpeditionTrackerFactory.getInstance(getSensorFixStore()));
} else {
ServiceTracker<WindTrackerFactory, WindTrackerFactory> tracker = new ServiceTracker<WindTrackerFactory, WindTrackerFactory>(
bundleContext, WindTrackerFactory.class, null);