Added Condition service to describe the processor contribution order

Author: fipro78

bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/BindingToModelProcessor.java

@@ -40,15 +40,20 @@
 import org.eclipse.ui.internal.keys.BindingPersistence;
 import org.eclipse.ui.internal.keys.BindingService;
 import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
+import org.osgi.service.condition.Condition;
 
-@Component
+@Component(service = IModelProcessorContribution.class)
 public class BindingToModelProcessor implements IModelProcessorContribution {
 
 	private Map<String, MBindingContext> contexts = new HashMap<>();
 	private Map<String, MCommand> commands = new HashMap<>();
 	private Map<String, MBindingTable> tables = new HashMap<>();
 	private Set<MKeyBinding> keys = new HashSet<>();
 
+	@Reference(target = "(osgi.condition.id=commandAndContext)")
+	Condition commandAndContextCondition;
+
 	@Execute
 	void process(final MApplication application, IEclipseContext context) {
 		gatherContexts(application.getRootContext());

bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CommandAndContextCondition.java

@@ -0,0 +1,19 @@
+package org.eclipse.ui.internal;
+
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
+import org.osgi.service.condition.Condition;
+
+/**
+ * @since 3.5
+ *
+ */
+@Component(service = Condition.class, property = "osgi.condition.id=commandAndContext")
+public class CommandAndContextCondition implements Condition {
+
+	@Reference
+	CommandToModelProcessor commandToModelProcessor;
+
+	@Reference
+	ContextToModelProcessor contextToModelProcessor;
+}

bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CommandToModelProcessor.java

@@ -37,7 +37,7 @@
 /**
  * @since 3.5
  */
-@Component
+@Component(service = { IModelProcessorContribution.class, CommandToModelProcessor.class })
 public class CommandToModelProcessor implements IModelProcessorContribution {
 
 	private Map<String, MCategory> categories = new HashMap<>();

bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ContextToModelProcessor.java

@@ -33,7 +33,7 @@
 /**
  * @since 3.5
  */
-@Component
+@Component(service = { IModelProcessorContribution.class, ContextToModelProcessor.class })
 public class ContextToModelProcessor implements IModelProcessorContribution {
 	private Map<String, MBindingContext> contexts = new HashMap<>();
 

bundles/org.eclipse.ui.workbench/META-INF/MANIFEST.MF

@@ -137,6 +137,7 @@ Require-Capability: osgi.extender;
   filter:="(&(osgi.extender=osgi.component)(version>=1.2)(!(version>=2.0)))"
 Automatic-Module-Name: org.eclipse.ui.workbench
 Service-Component: OSGI-INF/org.eclipse.ui.internal.BindingToModelProcessor.xml,
+ OSGI-INF/org.eclipse.ui.internal.CommandAndContextCondition.xml,
  OSGI-INF/org.eclipse.ui.internal.CommandToModelProcessor.xml,
  OSGI-INF/org.eclipse.ui.internal.ContextToModelProcessor.xml,
  OSGI-INF/org.eclipse.ui.internal.WindowsDefenderConfigurator.xml,