Use setter to provide ContextManager

Author: ghentschke

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

@@ -35,9 +35,6 @@ public class BindingTableManager {
 	@Inject
 	private IEclipseContext eclipseContext;
 
-	@Inject
-	private ContextManager contextManager;
-
 	private ContextSet definedTables = ContextSet.EMPTY;
 
 	private String[] activeSchemeIds;
@@ -239,6 +236,10 @@ public Collection<Binding> getPartialMatches(ContextSet contextSet, TriggerSeque
 	public void setActiveSchemes(String[] activeSchemeIds) {
 		this.activeSchemeIds = activeSchemeIds;
 		BindingTable.BEST_SEQUENCE.setActiveSchemes(activeSchemeIds);
+	}
+
+	public void setActiveSchemes(String[] activeSchemeIds, ContextManager contextManager) {
+		setActiveSchemes(activeSchemeIds);
 		BindingTable.BEST_SEQUENCE.setContextManager(contextManager);
 	}
 

bundles/org.eclipse.e4.ui.workbench.swt/src/org/eclipse/e4/ui/workbench/swt/util/BindingProcessingAddon.java

@@ -92,7 +92,7 @@ public void init() {
 				schemes = getSchemeIds(activeScheme.getId());
 			}
 		}
-		bindingTables.setActiveSchemes(schemes);
+		bindingTables.setActiveSchemes(schemes, contextManager);
 		defineBindingTables();
 		activateContexts(application);
 	}