From b970f6d3f772564e79da512cdea2cfbae5d70976 Mon Sep 17 00:00:00 2001
From: Simon Barner <barner@fortiss.org>
Date: Wed, 4 May 2016 14:27:04 +0000
Subject: [PATCH] - Prevent NPE
---
.../annotation/editingsupport/EditingSupportFactory.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/EditingSupportFactory.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/EditingSupportFactory.java
index b21335eab..98bb86d15 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/EditingSupportFactory.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/annotation/editingsupport/EditingSupportFactory.java
@@ -51,7 +51,7 @@ import org.fortiss.tooling.kernel.utils.EcoreUtils;
* @author barner
* @author $Author$
* @version $Rev$
- * @ConQAT.Rating GREEN Hash: F406176F532AFCB05E651802C16E516B
+ * @ConQAT.Rating YELLOW Hash: F6BC9688C61B6F0787EEE9EF94046CCF
*/
public class EditingSupportFactory {
@@ -207,7 +207,10 @@ public class EditingSupportFactory {
Set<String> choices = new TreeSet<String>();
for(T specification : (EList<T>)EcoreUtils.getChildrenWithType(root, clazz)) {
- choices.add(valueProvider.getAnnotationValue(specification).toString());
+ Object annotationValue = valueProvider.getAnnotationValue(specification);
+ if(annotationValue != null) {
+ choices.add(annotationValue.toString());
+ }
}
currentInputChoiceMap.put(instanceKey, choices);
--
GitLab