Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 82224 Details for
Bug 205209
[WorkbenchParts] NPE due to null mappingService during dispose
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read
this important communication.
[patch]
Action Bars v01
actionBars-v01.txt (text/plain), 2.40 KB, created by
Paul Webster
on 2007-11-06 12:25:04 EST
(
hide
)
Description:
Action Bars v01
Filename:
MIME Type:
Creator:
Paul Webster
Created:
2007-11-06 12:25:04 EST
Size:
2.40 KB
patch
obsolete
>### Eclipse Workspace Patch 1.0 >#P org.eclipse.ui.workbench >Index: Eclipse UI/org/eclipse/ui/SubActionBars.java >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/SubActionBars.java,v >retrieving revision 1.35 >diff -u -r1.35 SubActionBars.java >--- Eclipse UI/org/eclipse/ui/SubActionBars.java 31 Oct 2007 17:03:58 -0000 1.35 >+++ Eclipse UI/org/eclipse/ui/SubActionBars.java 6 Nov 2007 17:24:12 -0000 >@@ -487,9 +487,12 @@ > > // Add a mapping from this action id to the command id. > if (serviceLocator != null) { >+ String commandId = null; > final IActionCommandMappingService mappingService = (IActionCommandMappingService) serviceLocator > .getService(IActionCommandMappingService.class); >- String commandId = mappingService.getCommandId(actionID); >+ if (mappingService != null) { >+ commandId = mappingService.getCommandId(actionID); >+ } > if (commandId == null) { > commandId = handler.getActionDefinitionId(); > } >@@ -516,7 +519,9 @@ > if (value instanceof IHandlerActivation) { > final IHandlerActivation activation = (IHandlerActivation) value; > actionIdByCommandId.remove(activation.getCommandId()); >- service.deactivateHandler(activation); >+ if (service != null) { >+ service.deactivateHandler(activation); >+ } > activation.getHandler().dispose(); > } > } else if (commandId != null >@@ -525,7 +530,9 @@ > .remove(actionIdByCommandId.remove(commandId)); > if (value instanceof IHandlerActivation) { > final IHandlerActivation activation = (IHandlerActivation) value; >- service.deactivateHandler(activation); >+ if (service != null) { >+ service.deactivateHandler(activation); >+ } > activation.getHandler().dispose(); > } > } >@@ -542,10 +549,12 @@ > if (this instanceof EditorActionBars) { > handlerExpression = ((EditorActionBars)this).getHandlerExpression(); > } >- final IHandlerActivation activation = service >- .activateHandler(commandId, actionHandler, >- handlerExpression); >- activationsByActionId.put(actionID, activation); >+ if (service != null) { >+ final IHandlerActivation activation = service >+ .activateHandler(commandId, actionHandler, >+ handlerExpression); >+ activationsByActionId.put(actionID, activation); >+ } > } > } >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 205209
: 82224