diff options
| author | Elena Laskavaia | 2013-06-18 18:17:30 +0000 |
|---|---|---|
| committer | Paul Webster | 2013-08-02 12:48:15 +0000 |
| commit | 03ef555d031fbf1c342116f8c281e174ff30da63 (patch) | |
| tree | e15a4661bf3899f10c7228a4420c515251910be6 | |
| parent | 4faee65b79fa0dc858f801bcc88b792bbcbe69ae (diff) | |
| download | eclipse.platform.ui-03ef555d031fbf1c342116f8c281e174ff30da63.tar.gz eclipse.platform.ui-03ef555d031fbf1c342116f8c281e174ff30da63.tar.xz eclipse.platform.ui-03ef555d031fbf1c342116f8c281e174ff30da63.zip | |
Bug 404312 - NPE in HandledContributionItem.canExecuteItem()
Fix the CoolbarToTrimManager removing a random child instead of the
correct one.
Signed-off-by: Elena Laskavaia <elaskavaia.cdt@gmail.com>
| -rw-r--r-- | bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CoolBarToTrimManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CoolBarToTrimManager.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CoolBarToTrimManager.java index 924a311f3a1..9fb812c04c8 100644 --- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CoolBarToTrimManager.java +++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/CoolBarToTrimManager.java @@ -554,7 +554,7 @@ public class CoolBarToTrimManager extends ContributionManager implements ICoolBa workbenchTrimElements.remove(child); child.setToBeRendered(false); - child.getParent().getChildren().remove(i); + child.getParent().getChildren().remove(child); return (IContributionItem) obj; } if (item.getId() != null && item.getId().equals(child.getElementId())) { |