Bug 369159 - [Compatibility] ICommandService/IExecutionListener notv20120503-1715

fired

Make sure that bindings refer to the same Commands used by the rest of
the system.

1 files changed, 7 insertions, 3 deletions

diff --git a/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/CommandServiceAddon.java b/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/CommandServiceAddon.java
index 5cdb070f2d6..11242cc0786 100644
--- a/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/CommandServiceAddon.java
+++ b/bundles/org.eclipse.e4.core.commands/src/org/eclipse/e4/core/commands/CommandServiceAddon.java
@@ -27,9 +27,13 @@ public class CommandServiceAddon {
 	@PostConstruct
 	public void init(IEclipseContext context) {
 		// global command service. There can be only one ... per application :-)
-		CommandManager manager = new CommandManager();
-		setCommandFireEvents(manager, false);
-		context.set(CommandManager.class, manager);
+		CommandManager manager = context.get(CommandManager.class);
+		if (manager == null) {
+			manager = new CommandManager();
+			setCommandFireEvents(manager, false);
+			context.set(CommandManager.class, manager);
+		}
+
 		CommandServiceImpl service = ContextInjectionFactory
 				.make(CommandServiceImpl.class, context);
 		context.set(ECommandService.class, service);