diff options
| author | Aleksandar Kanchev <kanchev@itestra.com> | 2013-05-27 16:36:51 +0200 |
|---|---|---|
| committer | Aleksandar Kanchev <kanchev@itestra.com> | 2013-06-03 12:00:04 +0200 |
| commit | 415b86e90c9674d7b15a432a8cd5ee1b1207ce20 (patch) | |
| tree | ba3019ce46e7cb68f52c8b2fe81a1e3c777bffb6 | |
| parent | 3ffaaf967e3c7999e15a7cb6f994a68a49849aed (diff) | |
| download | genivi-common-api-runtime-415b86e90c9674d7b15a432a8cd5ee1b1207ce20.tar.gz | |
add external struct base as generate depenency
fix cases where the base of a struct is defined in another fidl than
the one that is currently being generated.
| -rw-r--r-- | org.genivi.commonapi.core/src/org/genivi/commonapi/core/generator/FrancaGenerator.xtend | 6 |
1 files changed, 2 insertions, 4 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 8678261..0d06b83 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 @@ -11,8 +11,8 @@ import java.util.HashSet import java.util.LinkedList import java.util.List import javax.inject.Inject +import org.eclipse.core.resources.ResourcesPlugin import org.eclipse.core.runtime.Path -import org.eclipse.emf.ecore.plugin.EcorePlugin import org.eclipse.emf.ecore.resource.Resource import org.eclipse.xtext.generator.IFileSystemAccess import org.eclipse.xtext.generator.IGenerator @@ -35,9 +35,7 @@ import org.franca.deploymodel.dsl.fDeploy.FDInterface import org.genivi.commonapi.core.deployment.DeploymentInterfacePropertyAccessor import org.genivi.commonapi.core.deployment.DeploymentInterfacePropertyAccessorWrapper -import static extension org.eclipse.emf.ecore.plugin.EcorePlugin.* import static com.google.common.base.Preconditions.* -import org.eclipse.core.resources.ResourcesPlugin class FrancaGenerator implements IGenerator { @Inject private extension FTypeCollectionGenerator @@ -150,7 +148,7 @@ class FrancaGenerator implements IGenerator { def private getAllReferencedFTypes(FModel fModel) { val referencedFTypes = new HashSet<FType> - fModel.typeCollections.forEach[referencedFTypes.addAll(types)] + fModel.typeCollections.forEach[types.forEach[addFTypeDerivedTree(referencedFTypes)]] fModel.interfaces.forEach[ attributes.forEach[type.addDerivedFTypeTree(referencedFTypes)] |