Fix missing inline generation and set versions to 2.0.1

6 files changed, 26 insertions, 18 deletions

diff --git a/org.genivi.commonapi.core.feature/category.xml b/org.genivi.commonapi.core.feature/category.xml
index a97b237..9a92a4a 100644
--- a/org.genivi.commonapi.core.feature/category.xml
+++ b/org.genivi.commonapi.core.feature/category.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/org.genivi.commonapi.core.feature_2.0.0.qualifier.jar" id="org.genivi.commonapi.core.feature" version="2.0.0.qualifier">
+   <feature url="features/org.genivi.commonapi.core.feature_2.0.1.qualifier.jar" id="org.genivi.commonapi.core.feature" version="2.0.1.qualifier">
       <category name="GENIVI CommonAPI"/>
    </feature>
    <category-def name="GENIVI CommonAPI" label="GENIVI CommonAPI Generators">
diff --git a/org.genivi.commonapi.core.feature/feature.xml b/org.genivi.commonapi.core.feature/feature.xml
index 40fe434..9218405 100644
--- a/org.genivi.commonapi.core.feature/feature.xml
+++ b/org.genivi.commonapi.core.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.genivi.commonapi.core.feature"
       label="%featureName"
-      version="2.0.0.qualifier"
+      version="2.0.1.qualifier"
       provider-name="%providerName">
 
    <copyright>
diff --git a/org.genivi.commonapi.core.ui/META-INF/MANIFEST.MF b/org.genivi.commonapi.core.ui/META-INF/MANIFEST.MF
index c713597..8d36f2e 100644
--- a/org.genivi.commonapi.core.ui/META-INF/MANIFEST.MF
+++ b/org.genivi.commonapi.core.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: GENIVI Common API UI
 Bundle-SymbolicName: org.genivi.commonapi.core.ui;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.1.qualifier
 Bundle-Activator: org.genivi.commonapi.core.ui.CommonApiUiPlugin
 Bundle-Vendor: BMW AG
 Require-Bundle: org.eclipse.ui,
diff --git a/org.genivi.commonapi.core/META-INF/MANIFEST.MF b/org.genivi.commonapi.core/META-INF/MANIFEST.MF
index 4f80f52..338b59e 100644
--- a/org.genivi.commonapi.core/META-INF/MANIFEST.MF
+++ b/org.genivi.commonapi.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: GENIVI Common API Generator
 Bundle-Vendor: BMW AG
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.1.qualifier
 Bundle-SymbolicName: org.genivi.commonapi.core;singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.core.resources;bundle-version="3.8.0",
diff --git a/org.genivi.commonapi.core/src/org/genivi/commonapi/core/generator/FTypeCollectionGenerator.xtend b/org.genivi.commonapi.core/src/org/genivi/commonapi/core/generator/FTypeCollectionGenerator.xtend
index 741ac25..b44cb57 100644
--- a/org.genivi.commonapi.core/src/org/genivi/commonapi/core/generator/FTypeCollectionGenerator.xtend
+++ b/org.genivi.commonapi.core/src/org/genivi/commonapi/core/generator/FTypeCollectionGenerator.xtend
@@ -47,7 +47,7 @@ class FTypeCollectionGenerator {
         }
 
         «IF fTypeCollection.version != null»
-            CommonAPI::Version getTypeCollectionVersion() {
+            inline CommonAPI::Version getTypeCollectionVersion() {
                 return CommonAPI::Version(«fTypeCollection.version.major», «fTypeCollection.version.minor»);
             }
         «ENDIF»
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 62e54aa..1ae221c 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
@@ -89,7 +89,9 @@ class FTypeGenerator {
             «ENDFOR»
 
             «fStructType.name»() = default;
-            «fStructType.name»(«fStructType.allElements.map[getConstReferenceVariable(fStructType)].join(", ")»);
+            «IF fStructType.allElements.size > 0»
+                «fStructType.name»(«fStructType.allElements.map[getConstReferenceVariable(fStructType)].join(", ")»);
+            «ENDIF»
 
             virtual void readFromInputStream(CommonAPI::InputStream& inputStream);
             virtual void writeToOutputStream(CommonAPI::OutputStream& outputStream) const;
@@ -187,25 +189,31 @@ class FTypeGenerator {
     def dispatch generateFTypeImplementation(FEnumerationType fEnumerationType, FModelElement parent) ''''''
 
     def dispatch generateFTypeImplementation(FStructType fStructType, FModelElement parent) '''
-        «fStructType.getClassNamespace(parent)»::«fStructType.name»(«fStructType.allElements.map[getConstReferenceVariable(fStructType) + "Value"].join(", ")»):
-                «fStructType.base?.generateBaseConstructorCall(fStructType)»
-                «FOR element : fStructType.elements SEPARATOR ','»
-                    «element.name»(«element.name»Value)
-                «ENDFOR»
-        {
-        }
+        «IF fStructType.allElements.size > 0»
+            «fStructType.getClassNamespace(parent)»::«fStructType.name»(«fStructType.allElements.map[getConstReferenceVariable(fStructType) + "Value"].join(", ")»):
+                    «fStructType.base?.generateBaseConstructorCall(fStructType)»
+                    «FOR element : fStructType.elements SEPARATOR ','»
+                        «element.name»(«element.name»Value)
+                    «ENDFOR»
+            {
+            }
+        «ENDIF»
 
         bool operator==(const «fStructType.getClassNamespace(parent)»& lhs, const «fStructType.getClassNamespace(parent)»& rhs) {
             if (&lhs == &rhs)
                 return true;
 
             return
-                «IF fStructType.base != null»
-                    static_cast<«fStructType.base.getClassNamespace(parent)»>(lhs) == static_cast<«fStructType.base.getClassNamespace(parent)»>(rhs) &&
+                «IF fStructType.allElements.size > 0»
+                    «IF fStructType.base != null»
+                        static_cast<«fStructType.base.getClassNamespace(parent)»>(lhs) == static_cast<«fStructType.base.getClassNamespace(parent)»>(rhs) &&
+                    «ENDIF»
+                    «FOR element : fStructType.elements SEPARATOR ' &&'»
+                        lhs.«element.name» == rhs.«element.name»
+                    «ENDFOR»
+                «ELSE»
+                    true
                 «ENDIF»
-                «FOR element : fStructType.elements SEPARATOR ' &&'»
-                    lhs.«element.name» == rhs.«element.name»
-                «ENDFOR»
             ;
         }