aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor V Rubezhny2012-04-04 09:45:37 (EDT)
committerPaul Webster2012-04-04 09:46:05 (EDT)
commit9af57ad2b866a01d7f5cfde858292de9fcab1659 (patch)
tree03f9c53a2718e9f223dc0d9c284b136785f57d2f
parentdd9c5941944a935a022f5373f65ff5f306f79e2d (diff)
downloadeclipse.platform.ui-9af57ad2b866a01d7f5cfde858292de9fcab1659.zip
eclipse.platform.ui-9af57ad2b866a01d7f5cfde858292de9fcab1659.tar.gz
eclipse.platform.ui-9af57ad2b866a01d7f5cfde858292de9fcab1659.tar.bz2
Bug 370119 - Old welcome support appears when the "new" intro is definedv20120404-1346
Discovered that old action handlers were depending on the new action handler to remove them from the map. They should be removed regardless. Bug: 370119
-rw-r--r--bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java
index 38019d7..cc9c30b 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java
@@ -575,7 +575,7 @@ public class WorkbenchWindow extends ApplicationWindow implements
String commandId = globalAction.getActionDefinitionId();
if (commandId != null) {
- final Object value = globalActionHandlersByCommandId.get(commandId);
+ final Object value = globalActionHandlersByCommandId.remove(commandId);
if (value instanceof ActionHandler) {
// This handler is about to get clobbered, so dispose it.
final ActionHandler handler = (ActionHandler) value;