diff options
| author | Henrik Rentz-Reichert | 2013-11-25 08:58:25 +0000 |
|---|---|---|
| committer | Henrik Rentz-Reichert | 2013-11-25 10:43:25 +0000 |
| commit | 53c33e15786cb41839455689d0086d7320099b5b (patch) | |
| tree | 838e35b1baa03e4cf4d9d320c114cca3670b6386 /plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ActorClassGen.xtend | |
| parent | 2207283a15d7f4a30ac820b41f3d14961d0c0b87 (diff) | |
| download | org.eclipse.etrice-53c33e15786cb41839455689d0086d7320099b5b.tar.gz org.eclipse.etrice-53c33e15786cb41839455689d0086d7320099b5b.tar.xz org.eclipse.etrice-53c33e15786cb41839455689d0086d7320099b5b.zip | |
Bug 422443: [generator.c] if no explicit type is specified then an EnumerationType should be generated as enum
https://bugs.eclipse.org/422443
Diffstat (limited to 'plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ActorClassGen.xtend')
| -rw-r--r-- | plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ActorClassGen.xtend | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ActorClassGen.xtend b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ActorClassGen.xtend index c85bdf765..d48b8bcf6 100644 --- a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ActorClassGen.xtend +++ b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ActorClassGen.xtend @@ -33,6 +33,7 @@ import org.eclipse.etrice.core.room.ActorClass import java.util.HashMap import org.eclipse.etrice.generator.generic.TypeHelpers import org.eclipse.etrice.generator.base.FileSystemHelpers +import org.eclipse.etrice.core.room.EnumerationType @Singleton class ActorClassGen extends GenericActorClassGenerator { @@ -461,7 +462,10 @@ class ActorClassGen extends GenericActorClassGenerator { } private def genSavePrimitive(Attribute att) { - val type = att.type.type.typeName + val type = if (att.type.type instanceof EnumerationType && (att.type.type as EnumerationType).primitiveType==null) + "int" + else + att.type.type.typeName val method = type.saveMethod if (att.size>1) @@ -485,7 +489,10 @@ class ActorClassGen extends GenericActorClassGenerator { } private def genLoadPrimitive(Attribute att) { - val type = att.type.type.typeName + val type = if (att.type.type instanceof EnumerationType && (att.type.type as EnumerationType).primitiveType==null) + "int" + else + att.type.type.typeName val method = type.loadMethod if (att.size>1) |