Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/VariableServiceGen.xtend')
-rw-r--r--plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/VariableServiceGen.xtend12
1 files changed, 4 insertions, 8 deletions
diff --git a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/VariableServiceGen.xtend b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/VariableServiceGen.xtend
index 1a65d6c48..18b4a02d9 100644
--- a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/VariableServiceGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/VariableServiceGen.xtend
@@ -145,8 +145,7 @@ class VariableServiceGen {
«FOR dc : getAllDataClasses(dataClasses)»
private void writeDataClass(String id, «dc.typeName» object, Map<String, Object> map){
«FOR a : dc.allAttributes»
-««« TODO-Enum
- «IF a.type.type.primitive»
+ «IF a.type.type.enumerationOrPrimitive»
map.put(id+"/«a.name»", «IF a.size>0»toObjectArray(«ENDIF»object.«invokeGetter(a.name, null)»«IF a.size>0»)«ENDIF»);
«ELSE»
writeDataClass(id+"/«a.name»", object.«invokeGetter(a.name, null)», map);
@@ -212,8 +211,7 @@ class VariableServiceGen {
def private CharSequence genGetAttributeValues(List<Attribute> path, ActorInstance ai){
val a = path.last
- // TODO-Enum
- if (a.type.type.primitive) {
+ if (a.type.type.enumerationOrPrimitive) {
'''
values.put("«ai.path»«path.toAbsolutePath('/')»", «IF a.size>0»toObjectArray(«ENDIF»«ai.varName».«path.invokeGetters(null)»«IF a.size>0»)«ENDIF»);
'''
@@ -232,8 +230,7 @@ class VariableServiceGen {
var a = path.last
var aVarName = path.toAbsolutePath("_")
- // TODO-Enum
- if(a.type.type.primitive){'''
+ if(a.type.type.enumerationOrPrimitive){'''
id = "«ai.path»«path.toAbsolutePath("/")»";
«IF a.size==0»«a.type.type.typeName.toWrapper»«ELSE»«a.type.type.typeName»[]«ENDIF» «aVarName» = null;
object = values.get(id);
@@ -259,8 +256,7 @@ class VariableServiceGen {
var a = path.last
var aVarName = path.toAbsolutePath("_")
- // TODO-Enum
- if (a.type.type.primitive) {
+ if (a.type.type.enumerationOrPrimitive) {
val getters = if(path.size>1)path.take(path.size-1).invokeGetters(null)+"." else ""
'''
if(«aVarName» != null){

Back to the top