summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Rauwolf <rauwolf@itestra.de>2013-02-20 16:31:41 +0100
committerPhilip Rauwolf <rauwolf@itestra.de>2013-02-20 16:31:41 +0100
commit4b087881e30870c68174386677b65137b1a387fb (patch)
tree3500f8f3eb2e0bc25796cc4ea745c352d7470740
parent5192edb7f6829d59c789c78c34986d56f7a1ee1e (diff)
downloadgenivi-common-api-runtime-4b087881e30870c68174386677b65137b1a387fb.tar.gz
Fixed generation for deployed middleware componentsgenivi_release_32.0.0
-rw-r--r--org.genivi.commonapi.core/src/org/genivi/commonapi/core/generator/FrancaGenerator.xtend9
-rw-r--r--org.genivi.commonapi.core/src/org/genivi/commonapi/core/generator/FrancaGeneratorExtensions.xtend1
2 files changed, 3 insertions, 7 deletions
diff --git a/org.genivi.commonapi.core/src/org/genivi/commonapi/core/generator/FrancaGenerator.xtend b/org.genivi.commonapi.core/src/org/genivi/commonapi/core/generator/FrancaGenerator.xtend
index f6282ae..9f9ba9b 100644
--- a/org.genivi.commonapi.core/src/org/genivi/commonapi/core/generator/FrancaGenerator.xtend
+++ b/org.genivi.commonapi.core/src/org/genivi/commonapi/core/generator/FrancaGenerator.xtend
@@ -121,18 +121,13 @@ class FrancaGenerator implements IGenerator {
return;
}
-
-
-
private var String filePrefix = "file://"
- def private getFilePathUrl(Resource resource) {
+ def getFilePathUrl(Resource resource) {
val filePath = resource.filePath
return filePrefix + filePath
}
-
-
-
+
def private getFilePath(Resource resource) {
if (resource.URI.file) {
diff --git a/org.genivi.commonapi.core/src/org/genivi/commonapi/core/generator/FrancaGeneratorExtensions.xtend b/org.genivi.commonapi.core/src/org/genivi/commonapi/core/generator/FrancaGeneratorExtensions.xtend
index b3a763c..8942a1f 100644
--- a/org.genivi.commonapi.core/src/org/genivi/commonapi/core/generator/FrancaGeneratorExtensions.xtend
+++ b/org.genivi.commonapi.core/src/org/genivi/commonapi/core/generator/FrancaGeneratorExtensions.xtend
@@ -408,6 +408,7 @@ class FrancaGeneratorExtensions {
case EnumBackingType::Int64:
return FBasicTypeId::INT64
}
+ return FBasicTypeId::INT32
}
def getPrimitiveTypeName(FBasicTypeId fBasicTypeId) {