Replaced condition service with direct references

Author: fipro78

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

@@ -41,7 +41,6 @@
 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(service = IModelProcessorContribution.class)
 public class BindingToModelProcessor implements IModelProcessorContribution {
@@ -51,8 +50,15 @@ public class BindingToModelProcessor implements IModelProcessorContribution {
 	private Map<String, MBindingTable> tables = new HashMap<>();
 	private Set<MKeyBinding> keys = new HashSet<>();
 
-	@Reference(target = "(osgi.condition.id=commandAndContext)")
-	Condition commandAndContextCondition;
+	// define dependencies to CommandToModelProcessor and ContextToModelProcessor to
+	// ensure these two IModelProcessorContributions are registered before this
+	// BindingToModelProcessor
+
+	@Reference
+	private CommandToModelProcessor commandToModelProcessor;
+
+	@Reference
+	private ContextToModelProcessor contextToModelProcessor;
 
 	@Execute
 	void process(final MApplication application, IEclipseContext context) {

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

@@ -137,7 +137,6 @@ 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,