summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorElena Laskavaia2013-06-18 14:17:30 (EDT)
committer Paul Webster2013-06-26 09:49:50 (EDT)
commite5e3fed63890b894ac10722d81cf39e0433a5be8 (patch)
treeac3912033dac4a2db2d990ed035e54ded445a426
parentf02a08f717c7a86471aec1c81dcc3342de122b3f (diff)
downloadeclipse.platform.ui-e5e3fed63890b894ac10722d81cf39e0433a5be8.zip
eclipse.platform.ui-e5e3fed63890b894ac10722d81cf39e0433a5be8.tar.gz
eclipse.platform.ui-e5e3fed63890b894ac10722d81cf39e0433a5be8.tar.bz2
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.java2
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 632db2b..ba3dafb 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())) {