summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksandar Kanchev <kanchev@itestra.com>2013-04-11 10:30:04 +0200
committerAleksandar Kanchev <kanchev@itestra.com>2013-04-11 10:30:04 +0200
commit369c03c551130dc1406c83a60f42c4e31c11f772 (patch)
treeb38e349dbd582f2718274dea16f6f5a381980dba
parentf182962d3245a9f45d218cb5800c27b5dce2c314 (diff)
downloadgenivi-common-api-runtime-369c03c551130dc1406c83a60f42c4e31c11f772.tar.gz
fix small issues with Xtend/Xtext 2.4.0
-rw-r--r--org.genivi.commonapi.core/src/org/genivi/commonapi/core/generator/FTypeCommonAreaGenerator.xtend2
-rw-r--r--org.genivi.commonapi.core/src/org/genivi/commonapi/core/generator/FTypeGenerator.xtend2
2 files changed, 2 insertions, 2 deletions
diff --git a/org.genivi.commonapi.core/src/org/genivi/commonapi/core/generator/FTypeCommonAreaGenerator.xtend b/org.genivi.commonapi.core/src/org/genivi/commonapi/core/generator/FTypeCommonAreaGenerator.xtend
index ff1d3a0..59808b3 100644
--- a/org.genivi.commonapi.core/src/org/genivi/commonapi/core/generator/FTypeCommonAreaGenerator.xtend
+++ b/org.genivi.commonapi.core/src/org/genivi/commonapi/core/generator/FTypeCommonAreaGenerator.xtend
@@ -117,7 +117,7 @@ class FTypeCommonAreaGenerator {
- def private getElementTypeNames(FUnionType fUnion, String unionName, FModelElement parent, String parentName) {
+ def private List<String> getElementTypeNames(FUnionType fUnion, String unionName, FModelElement parent, String parentName) {
var names = new ArrayList<String>
var rev = fUnion.elements
var iter = rev.iterator
diff --git a/org.genivi.commonapi.core/src/org/genivi/commonapi/core/generator/FTypeGenerator.xtend b/org.genivi.commonapi.core/src/org/genivi/commonapi/core/generator/FTypeGenerator.xtend
index 41349fb..ea38816 100644
--- a/org.genivi.commonapi.core/src/org/genivi/commonapi/core/generator/FTypeGenerator.xtend
+++ b/org.genivi.commonapi.core/src/org/genivi/commonapi/core/generator/FTypeGenerator.xtend
@@ -197,7 +197,7 @@ class FTypeGenerator {
typedef CommonAPI::Variant<«fUnionType.getElementNames»> «fUnionType.name»;
'''
- def private getElementNames(FUnionType fUnion) {
+ def private String getElementNames(FUnionType fUnion) {
var names = "";
if (fUnion.base != null) {
names = fUnion.base.getElementNames