From 7e89b5e3348be487110bd8a5c60336ff363cf9d6 Mon Sep 17 00:00:00 2001 From: "S.W" Date: Fri, 21 Sep 2018 10:01:52 +0200 Subject: OSGi resource registration via SCR (#11166) * Changed the way resources, themes, and widgetsets are registered to the HttpService by only using the VaadinResourceTrackerComponent --- .../widgetset/DefaultWidgetsetContribution.java | 29 +++++----------------- 1 file changed, 6 insertions(+), 23 deletions(-) (limited to 'client-compiled/src') diff --git a/client-compiled/src/main/java/com/vaadin/osgi/widgetset/DefaultWidgetsetContribution.java b/client-compiled/src/main/java/com/vaadin/osgi/widgetset/DefaultWidgetsetContribution.java index df25f5d537..783e4a0de1 100644 --- a/client-compiled/src/main/java/com/vaadin/osgi/widgetset/DefaultWidgetsetContribution.java +++ b/client-compiled/src/main/java/com/vaadin/osgi/widgetset/DefaultWidgetsetContribution.java @@ -15,33 +15,16 @@ */ package com.vaadin.osgi.widgetset; -import org.osgi.service.component.ComponentContext; -import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; -import org.osgi.service.component.annotations.Reference; -import org.osgi.service.http.HttpService; -import com.vaadin.osgi.resources.OsgiVaadinResources; -import com.vaadin.osgi.resources.VaadinResourceService; - -@Component(immediate = true) -public class DefaultWidgetsetContribution { - private HttpService httpService; +import com.vaadin.osgi.resources.OsgiVaadinWidgetset; +@Component +public class DefaultWidgetsetContribution implements OsgiVaadinWidgetset { private static final String WIDGETSET_NAME = "com.vaadin.DefaultWidgetSet"; - @Activate - void startup(ComponentContext context) throws Exception { - VaadinResourceService service = OsgiVaadinResources.getService(); - service.publishWidgetset(WIDGETSET_NAME, httpService); - } - - @Reference - void setHttpService(HttpService httpService) { - this.httpService = httpService; - } - - void unsetHttpService(HttpService httpService) { - this.httpService = null; + @Override + public String getName() { + return WIDGETSET_NAME; } } -- cgit v1.2.3