Attachment 226508 Details for Bug 399831 – Use the correct partSite

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Use the correct partSite

keyService.patch (text/plain), 2.23 KB, created by Paul Webster

on 2013-02-04 09:47:31 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Paul Webster

Created: 2013-02-04 09:47:31 EST

Size: 2.23 KB

patch

obsolete

>diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/KeyBindingService.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/KeyBindingService.java
>index 1208672..e15a7d3 100644
>--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/KeyBindingService.java	
>+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/KeyBindingService.java	
>@@ -326,6 +326,15 @@ public final class KeyBindingService implements INestableKeyBindingService {
> 
>         unregisterAction(action);
> 
>+		IWorkbenchPartSite partSite = workbenchPartSite;
>+		if (parent != null) {
>+			KeyBindingService currentParent = parent;
>+			while (currentParent != null) {
>+				partSite = currentParent.workbenchPartSite;
>+				currentParent = currentParent.parent;
>+			}
>+		}
>+
> 		String commandId = action.getActionDefinitionId();
> 		if (commandId != null) {
> 			for (IAction registeredAction : actionToProxy.keySet()) {
>@@ -340,8 +349,7 @@ public final class KeyBindingService implements INestableKeyBindingService {
> 			IHandlerService hs = (IHandlerService) workbenchPartSite
> 					.getService(IHandlerService.class);
> 			actionToProxy.put(action, hs.activateHandler(commandId, new ActionHandler(action),
>-					new LegacyHandlerSubmissionExpression(null, workbenchPartSite.getShell(),
>-							workbenchPartSite)));
>+					new LegacyHandlerSubmissionExpression(null, partSite.getShell(), partSite)));
> 
> 		}
>     }
>diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/LegacyHandlerService.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/LegacyHandlerService.java
>index 98ee6ba..2e2a79f 100644
>--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/LegacyHandlerService.java	
>+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/LegacyHandlerService.java	
>@@ -244,6 +244,9 @@ public class LegacyHandlerService implements IHandlerService {
> 		if (handlerActivations == null) {
> 			handlerActivations = new ArrayList();
> 		} else {
>+			if (handlerActivations.contains(eActivation)) {
>+				return;
>+			}
> 			handlerActivations = new ArrayList(handlerActivations);
> 		}
> 		handlerActivations.add(eActivation);

Flags:

daniel_megert: review+

Actions: View | Diff

Attachments on bug 399831: 226508