Use new @IContextFunction.ServiceContextKey component property type

Author: HannesWell

bundles/org.eclipse.e4.core.commands/.settings/org.eclipse.pde.ds.annotations.prefs

@@ -1,4 +1,4 @@
-dsVersion=V1_3
+dsVersion=V1_4
 eclipse.preferences.version=1
 enabled=true
 generateBundleActivationPolicyLazy=true

bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/internal/CommandServiceCreationFunction.java

@@ -21,7 +21,8 @@
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.osgi.service.component.annotations.Component;
 
-@Component(service = IContextFunction.class, property = "service.context.key=org.eclipse.e4.core.commands.ECommandService")
+@Component(service = IContextFunction.class )
+@IContextFunction.ServiceContextKey(org.eclipse.e4.core.commands.ECommandService.class)
 public class CommandServiceCreationFunction extends ContextFunction {
 	/**
 	 * A context key (value "rootContext") that identifies the root of this context chain. It does

bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/internal/HandlerServiceCreationFunction.java

@@ -20,7 +20,8 @@
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.osgi.service.component.annotations.Component;
 
-@Component(service = IContextFunction.class, property = "service.context.key=org.eclipse.e4.core.commands.EHandlerService")
+@Component(service = IContextFunction.class)
+@IContextFunction.ServiceContextKey(org.eclipse.e4.core.commands.EHandlerService.class)
 public class HandlerServiceCreationFunction extends ContextFunction {
 
 	@Override

bundles/org.eclipse.e4.ui.bindings/.settings/org.eclipse.pde.ds.annotations.prefs

@@ -1,4 +1,4 @@
-dsVersion=V1_3
+dsVersion=V1_4
 eclipse.preferences.version=1
 enabled=true
 generateBundleActivationPolicyLazy=true

bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/internal/BindingServiceCreationFunction.java

@@ -17,10 +17,12 @@
 import org.eclipse.e4.core.contexts.ContextFunction;
 import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import org.eclipse.e4.core.contexts.IContextFunction;
+import org.eclipse.e4.core.contexts.IContextFunction.ServiceContextKey;
 import org.eclipse.e4.core.contexts.IEclipseContext;
 import org.osgi.service.component.annotations.Component;
 
-@Component(service = IContextFunction.class, property = "service.context.key=org.eclipse.e4.ui.bindings.EBindingService")
+@Component(service = IContextFunction.class)
+@ServiceContextKey(org.eclipse.e4.ui.bindings.EBindingService.class)
 public class BindingServiceCreationFunction extends ContextFunction {
 
 	@Override

bundles/org.eclipse.e4.ui.di/META-INF/MANIFEST.MF

@@ -12,7 +12,8 @@ Import-Package: jakarta.inject;version="[2.0.0,3.0.0)",
  org.eclipse.e4.core.di.annotations;version="0.15.0",
  org.eclipse.e4.core.di.internal.extensions;version="0.15.0",
  org.eclipse.e4.core.di.suppliers,
- org.osgi.service.event;version="[1.3.0,2.0.0)"
+ org.osgi.service.event;version="[1.3.0,2.0.0)",
+ org.osgi.service.event.propertytypes;version="[1.4.0,2.0.0)"
 Export-Package: org.eclipse.e4.ui.di,
  org.eclipse.e4.ui.internal.di;x-internal:=true
 Require-Capability: osgi.extender;

bundles/org.eclipse.e4.ui.di/src/org/eclipse/e4/ui/internal/di/UIEventObjectSupplier.java

@@ -28,12 +28,13 @@
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.event.EventAdmin;
 import org.osgi.service.event.EventHandler;
+import org.osgi.service.event.propertytypes.EventTopics;
 
 import jakarta.inject.Inject;
 
 @Component(service = { ExtendedObjectSupplier.class, EventHandler.class }, property = {
-		"dependency.injection.annotation=org.eclipse.e4.ui.di.UIEventTopic",
-		"event.topics=" + IEclipseContext.TOPIC_DISPOSE })
+		"dependency.injection.annotation=org.eclipse.e4.ui.di.UIEventTopic" })
+@EventTopics(IEclipseContext.TOPIC_DISPOSE)
 public class UIEventObjectSupplier extends EventObjectSupplier {
 
 	class UIEventHandler implements EventHandler {

bundles/org.eclipse.e4.ui.services/.settings/org.eclipse.pde.ds.annotations.prefs

@@ -1,4 +1,4 @@
-dsVersion=V1_3
+dsVersion=V1_4
 eclipse.preferences.version=1
 enabled=true
 generateBundleActivationPolicyLazy=true

bundles/org.eclipse.e4.ui.services/src/org/eclipse/e4/ui/services/events/EventBrokerFactory.java

@@ -23,12 +23,11 @@
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.event.EventAdmin;
 
-
-
 /**
  * Use this class to obtain an instance of {@link IEventBroker}.
  */
-@Component(service = IContextFunction.class, property = "service.context.key=org.eclipse.e4.core.services.events.IEventBroker")
+@Component(service = IContextFunction.class)
+@IContextFunction.ServiceContextKey(IEventBroker.class)
 public class EventBrokerFactory extends ContextFunction {
 
 	// mandatory static reference to EventAdmin to ensure it is available before
@@ -50,4 +49,3 @@ public Object compute(IEclipseContext context, String contextKey) {
 		return broker;
 	}
 }
-

bundles/org.eclipse.e4.ui.workbench.swt/.settings/org.eclipse.pde.ds.annotations.prefs

@@ -1,5 +1,5 @@
 classpath=true
-dsVersion=V1_3
+dsVersion=V1_4
 eclipse.preferences.version=1
 enabled=true
 generateBundleActivationPolicyLazy=true