Merge branch 'master' into css-animations

This commit is contained in:
Axel Uhl committed 2013-12-18 17:17:14 +01:00
commit 91c53d974c
1 file changed
-4
@@ -426,10 +426,6 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S
return tractracAdapterTracker.getService().getOrCreateTracTracAdapter(baseDomainFactory);
}
protected IgtimiConnectionFactory getIgtimiConnectionFactory(BundleContext context) {
return createAndOpenIgtimiTracker(context).getService();
}
protected ServiceTracker<TracTracAdapterFactory, TracTracAdapterFactory> createAndOpenTracTracAdapterTracker(BundleContext context) {
ServiceTracker<TracTracAdapterFactory, TracTracAdapterFactory> result = new ServiceTracker<TracTracAdapterFactory, TracTracAdapterFactory>(
context, TracTracAdapterFactory.class.getName(), null);