Attachment 64257 Details for Bug 173213 – Handler Service v01

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

[patch] Handler Service v01

handlerService-v01.txt (text/plain), 5.97 KB, created by Paul Webster

on 2007-04-18 21:50:52 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Paul Webster

Created: 2007-04-18 21:50:52 EDT

Size: 5.97 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ui.workbench
>Index: Eclipse UI/org/eclipse/ui/internal/handlers/HandlerAuthority.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/HandlerAuthority.java,v
>retrieving revision 1.36
>diff -u -r1.36 HandlerAuthority.java
>--- Eclipse UI/org/eclipse/ui/internal/handlers/HandlerAuthority.java	30 Mar 2007 17:02:53 -0000	1.36
>+++ Eclipse UI/org/eclipse/ui/internal/handlers/HandlerAuthority.java	19 Apr 2007 01:49:56 -0000
>@@ -12,6 +12,7 @@
> package org.eclipse.ui.internal.handlers;
> 
> import java.util.Collection;
>+import java.util.Collections;
> import java.util.HashMap;
> import java.util.HashSet;
> import java.util.Iterator;
>@@ -23,6 +24,7 @@
> import org.eclipse.core.commands.Command;
> import org.eclipse.core.commands.IHandler;
> import org.eclipse.core.commands.util.Tracing;
>+import org.eclipse.core.expressions.EvaluationContext;
> import org.eclipse.core.expressions.EvaluationResult;
> import org.eclipse.core.expressions.Expression;
> import org.eclipse.core.expressions.IEvaluationContext;
>@@ -521,8 +523,10 @@
> 	 * DO NOT CALL THIS METHOD.
> 	 * </p>
> 	 * 
>-	 * @param commandId the command id to check
>-	 * @param the context to use for activations
>+	 * @param commandId
>+	 *            the command id to check
>+	 * @param the
>+	 *            context to use for activations
> 	 * @since 3.3
> 	 */
> 	public final IHandler findHandler(String commandId,
>@@ -531,7 +535,7 @@
> 		if (o instanceof IHandlerActivation) {
> 			IHandlerActivation activation = (IHandlerActivation) o;
> 			try {
>-				if (activation.getExpression().evaluate(context) == EvaluationResult.TRUE) {
>+				if (eval(context, activation)) {
> 					return activation.getHandler();
> 				}
> 			} catch (CoreException e) {
>@@ -545,7 +549,7 @@
> 			while (i.hasNext()) {
> 				IHandlerActivation activation = (IHandlerActivation) i.next();
> 				try {
>-					if (activation.getExpression().evaluate(context) == EvaluationResult.TRUE) {
>+					if (eval(context, activation)) {
> 						lastActivation = currentActivation;
> 						currentActivation = activation;
> 					}
>@@ -553,15 +557,69 @@
> 					// OK, this one is out of the running
> 				}
> 			}
>-			if (currentActivation!=null) {
>-				if (lastActivation==null) {
>+			if (currentActivation != null) {
>+				if (lastActivation == null) {
> 					return currentActivation.getHandler();
> 				}
>-				if (lastActivation.getSourcePriority()!=currentActivation.getSourcePriority()) {
>+				if (lastActivation.getSourcePriority() != currentActivation
>+						.getSourcePriority()) {
> 					return currentActivation.getHandler();
> 				}
> 			}
> 		}
> 		return null;
> 	}
>+
>+	/**
>+	 * @param context
>+	 * @param activation
>+	 * @return
>+	 * @throws CoreException
>+	 */
>+	private boolean eval(IEvaluationContext context,
>+			IHandlerActivation activation) throws CoreException {
>+		Expression expression = activation.getExpression();
>+		if (expression==null) {
>+			return true;
>+		}
>+		return expression.evaluate(context) == EvaluationResult.TRUE;
>+	}
>+
>+	public IEvaluationContext getContextSnapshot() {
>+		EvaluationContext context = new EvaluationContext(null,
>+				Collections.EMPTY_LIST);
>+		IEvaluationContext tmpContext = getCurrentState();
>+		context.addVariable(ISources.ACTIVE_ACTION_SETS_NAME, tmpContext
>+				.getVariable(ISources.ACTIVE_ACTION_SETS_NAME));
>+		context.addVariable(ISources.ACTIVE_CONTEXT_NAME, tmpContext
>+				.getVariable(ISources.ACTIVE_CONTEXT_NAME));
>+		context.addVariable(ISources.ACTIVE_EDITOR_ID_NAME, tmpContext
>+				.getVariable(ISources.ACTIVE_EDITOR_ID_NAME));
>+		context.addVariable(ISources.ACTIVE_EDITOR_NAME, tmpContext
>+				.getVariable(ISources.ACTIVE_EDITOR_NAME));
>+		context.addVariable(ISources.ACTIVE_PART_ID_NAME, tmpContext
>+				.getVariable(ISources.ACTIVE_PART_ID_NAME));
>+		context.addVariable(ISources.ACTIVE_PART_NAME, tmpContext
>+				.getVariable(ISources.ACTIVE_PART_NAME));
>+		context.addVariable(ISources.ACTIVE_SITE_NAME, tmpContext
>+				.getVariable(ISources.ACTIVE_SITE_NAME));
>+		context
>+				.addVariable(
>+						ISources.ACTIVE_WORKBENCH_WINDOW_IS_COOLBAR_VISIBLE_NAME,
>+						tmpContext
>+								.getVariable(ISources.ACTIVE_WORKBENCH_WINDOW_IS_COOLBAR_VISIBLE_NAME));
>+		context
>+				.addVariable(
>+						ISources.ACTIVE_WORKBENCH_WINDOW_IS_PERSPECTIVEBAR_VISIBLE_NAME,
>+						tmpContext
>+								.getVariable(ISources.ACTIVE_WORKBENCH_WINDOW_IS_PERSPECTIVEBAR_VISIBLE_NAME));
>+		context.addVariable(ISources.ACTIVE_WORKBENCH_WINDOW_NAME, tmpContext
>+				.getVariable(ISources.ACTIVE_WORKBENCH_WINDOW_NAME));
>+		context
>+				.addVariable(
>+						ISources.ACTIVE_WORKBENCH_WINDOW_SHELL_NAME,
>+						tmpContext
>+								.getVariable(ISources.ACTIVE_WORKBENCH_WINDOW_SHELL_NAME));
>+		return context;
>+	}
> }
>Index: Eclipse UI/org/eclipse/ui/internal/handlers/HandlerService.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/HandlerService.java,v
>retrieving revision 1.23
>diff -u -r1.23 HandlerService.java
>--- Eclipse UI/org/eclipse/ui/internal/handlers/HandlerService.java	29 Mar 2007 19:09:44 -0000	1.23
>+++ Eclipse UI/org/eclipse/ui/internal/handlers/HandlerService.java	19 Apr 2007 01:49:56 -0000
>@@ -240,4 +240,21 @@
> 			IEvaluationContext context) {
> 		return handlerAuthority.findHandler(commandId, context);
> 	}
>+	
>+	public final IEvaluationContext getContextSnapshot() {
>+		return handlerAuthority.getContextSnapshot();
>+	}
>+	
>+	public final Object executeCommandInContext(final ParameterizedCommand command,
>+			final Event trigger, IEvaluationContext context) throws ExecutionException,
>+			NotDefinedException, NotEnabledException, NotHandledException {
>+		IHandler oldHandler = command.getCommand().getHandler();
>+		try {
>+			IHandler handler = findHandler(command.getId(), context);
>+			command.getCommand().setHandler(handler);
>+			return command.executeWithChecks(trigger, context);
>+		} finally {
>+			command.getCommand().setHandler(oldHandler);
>+		}
>+	}
> }

Actions: View | Diff

Attachments on bug 173213: 61932 | 62000 | 62012 | 64257 | 64547