Commit e66ca93b authored by Florian Hölzl's avatar Florian Hölzl
Browse files

bugfix

refs 926
parent 8c3a4c3b
......@@ -45,7 +45,7 @@ import org.fortiss.tooling.base.ui.fieldassist.FieldAssistImageRegistry;
* @author doebber
* @author $Author: hoelzl $
* @version $Rev: 18709 $
* @ConQAT.Rating YELLOW Hash: 9468858EEDFD893EB4D0BA8F48D3F8CE
* @ConQAT.Rating YELLOW Hash: 6443BC90A24A5051FE73739C6067A2D9
*/
public class ExpressionFieldAssistUtils {
......@@ -142,6 +142,10 @@ public class ExpressionFieldAssistUtils {
boolean includeNoVal) {
ArrayList<String> result = new ArrayList<String>();
DataDictionary dd = getDataDictionary(element);
if(dd == null) {
return result;
}
for(Enumeration def : dd.getEnumerationsList()) {
for(EnumerationMember mem : def.getMembersList()) {
result.add(mem.getName());
......@@ -170,6 +174,9 @@ public class ExpressionFieldAssistUtils {
result.addAll(getPrimitiveValues());
} else {
DataDictionary dd = getDataDictionary(element);
if(dd == null) {
return result;
}
for(Enumeration def : dd.getEnumerationsList()) {
if(!def.getName().equals(type)) {
continue;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment