summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorVictor V Rubezhny2012-04-04 09:56:06 (EDT)
committer Paul Webster2012-04-04 09:56:06 (EDT)
commitd8f9b6bc9745b70ddb1843315d42b79badbd2072 (patch)
treed97247d63871ca7d656a4ba61a3a35680cbfb7d8
parent26e36800be05a142d83b0dae6f37d885be5073d0 (diff)
downloadeclipse.platform.ui-d8f9b6bc9745b70ddb1843315d42b79badbd2072.zip
eclipse.platform.ui-d8f9b6bc9745b70ddb1843315d42b79badbd2072.tar.gz
eclipse.platform.ui-d8f9b6bc9745b70ddb1843315d42b79badbd2072.tar.bz2
Bug 370119 - Old welcome support appears when the "new" intro is definedv20120404-1356I20120405-1114I20120405-0114I20120404-2228I20120404-2006I20120404-1351
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 8c8af4e..5361293 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
@@ -1000,7 +1000,7 @@ public class WorkbenchWindow implements IWorkbenchWindow {
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;