aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Elder2013-09-25 14:06:38 (EDT)
committerGerrit Code Review @ Eclipse.org2013-10-01 13:37:03 (EDT)
commitc709c69a1d36db1e781dcf3a6545986c9d403ffc (patch)
tree5118f4b7bd1b04d6ec26ef8862540063c832cf1e
parent5dbded47a1c2497b55218571ea57ed75454d836f (diff)
downloadeclipse.platform.ui-c709c69a1d36db1e781dcf3a6545986c9d403ffc.zip
eclipse.platform.ui-c709c69a1d36db1e781dcf3a6545986c9d403ffc.tar.gz
eclipse.platform.ui-c709c69a1d36db1e781dcf3a6545986c9d403ffc.tar.bz2
Bug 417947 - [KeyBindings] END/HOME keys are not behaving as expectedrefs/changes/73/16773/2
when the content assist pop up is activated Change-Id: I304af15eaed262ba64ef2d9e2ce7f43257dbe41a
-rw-r--r--bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/keys/KeyBindingDispatcher.java11
1 files changed, 6 insertions, 5 deletions
diff --git a/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/keys/KeyBindingDispatcher.java b/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/keys/KeyBindingDispatcher.java
index d046f78..e66c143 100644
--- a/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/keys/KeyBindingDispatcher.java
+++ b/bundles/org.eclipse.e4.ui.bindings/src/org/eclipse/e4/ui/bindings/keys/KeyBindingDispatcher.java
@@ -17,6 +17,7 @@ import java.util.Iterator;
import java.util.List;
import javax.inject.Inject;
import org.eclipse.core.commands.Command;
+import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.commands.IHandler;
import org.eclipse.core.commands.ParameterizedCommand;
import org.eclipse.core.commands.common.CommandException;
@@ -281,12 +282,12 @@ public class KeyBindingDispatcher {
}
}
- try {
- handlerService.executeHandler(parameterizedCommand, staticContext);
- } catch (final Exception e) {
+ handlerService.executeHandler(parameterizedCommand, staticContext);
+ final Object commandException = staticContext.get(HandlerServiceImpl.HANDLER_EXCEPTION);
+ if (commandException instanceof CommandException) {
commandHandled = false;
- if (logger != null) {
- logger.error(e);
+ if (logger != null && commandException instanceof ExecutionException) {
+ logger.error((Throwable) commandException);
}
}
/*