From 3f4d5f86499cf893785b81cfe81edbbfd032c157 Mon Sep 17 00:00:00 2001
From: Florian Hoelzl <hoelzl@fortiss.org>
Date: Fri, 13 Jan 2012 16:29:42 +0000
Subject: [PATCH] fixed NPE refs 311
---
.../tooling/kernel/ui/internal/ContextMenuService.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ContextMenuService.java b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ContextMenuService.java
index 62c9d1861..231272992 100644
--- a/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ContextMenuService.java
+++ b/org.fortiss.tooling.kernel.ui/trunk/src/org/fortiss/tooling/kernel/ui/internal/ContextMenuService.java
@@ -43,7 +43,7 @@ import org.osgi.framework.Bundle;
* @author hoelzl
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating GREEN Hash: 794D71DA1264AB09BBB8AE9A13C77E47
+ * @ConQAT.Rating YELLOW Hash: D5BB94A9DB8CACB9E4142CEE1206C1B1
*/
public class ContextMenuService implements IContextMenuService {
@@ -136,8 +136,12 @@ public class ContextMenuService implements IContextMenuService {
if (menuSectionID == null) {
menuSectionID = IWorkbenchActionConstants.MB_ADDITIONS;
}
- for (IContributionItem item : contributor.getContributedItems(
- selection, contextProvider)) {
+ List<IContributionItem> l = contributor.getContributedItems(
+ selection, contextProvider);
+ if (l == null) {
+ continue;
+ }
+ for (IContributionItem item : l) {
menu.appendToGroup(menuSectionID, item);
}
}
--
GitLab