diff options
| author | Elena Laskavaia | 2013-06-18 18:17:30 +0000 |
|---|---|---|
| committer | Paul Webster | 2013-06-18 18:17:30 +0000 |
| commit | 31c525b3493d0d53084d12f2edc6d70ea0e9c15d (patch) | |
| tree | c6a82fef05cad4e381e7ab004c2989eeb5db4059 | |
| parent | c609be16db5fbe51d9a148f316466e803d41a37d (diff) | |
| download | eclipse.platform.ui-31c525b3493d0d53084d12f2edc6d70ea0e9c15d.tar.gz eclipse.platform.ui-31c525b3493d0d53084d12f2edc6d70ea0e9c15d.tar.xz eclipse.platform.ui-31c525b3493d0d53084d12f2edc6d70ea0e9c15d.zip | |
Bug 404312 - NPE in HandledContributionItem.canExecuteItem()
Fix the CoolbarToTrimManager removing a random child instead of the
correct one.
| -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())) { |