| commit | 42cf789b71c4f139f6db84191bf5a5a6d9173ac0 | [log] [tgz] |
|---|---|---|
| author | Nicolaj Hoess <nicohoess@gmail.com> | Fri Apr 18 08:54:30 2014 +0200 |
| committer | Marco Descher <marco@descher.at> | Sat Apr 19 06:45:00 2014 -0400 |
| tree | 8bf95e39573abf972ed40c55afbafae7e555e46b | |
| parent | 86219b10a48721781e74baba94e19487b01c312c [diff] |
Bug 433064 - NPE in find action for parent id in menu contribution Change-Id: Id6655890188701faca46412f005b5894e61280f6 Signed-off-by: Nicolaj Hoess <nicohoess@gmail.com>
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIdDialog.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIdDialog.java index d2596b0..fc7ea01 100644 --- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIdDialog.java +++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/dialogs/MenuIdDialog.java
@@ -112,7 +112,8 @@ // include Window main-menu instances MApplication ma = ((MApplication) resource.getRoot().get(0)); for (MWindow m : ma.getChildren()) { - list.add(m.getMainMenu()); + if (m.getMainMenu() != null) + list.add(m.getMainMenu()); } // include menu elements located within parts List<MPart> mp = modelService.findElements(ma, null, MPart.class, null);