diff options
| author | Juergen Haug | 2012-11-23 12:29:02 +0000 |
|---|---|---|
| committer | Juergen Haug | 2012-11-23 12:29:02 +0000 |
| commit | 4aa11d8fbc45298bbb134e678217b981dee301b4 (patch) | |
| tree | 6efb6ac2ee427e854b26346f1b83ec23b084fc28 /plugins/org.eclipse.etrice.generator.config/src/org/eclipse/etrice | |
| parent | 50fcc9f9b85408eb13037b6cfad0af69d756f495 (diff) | |
| parent | c3a077700afda0406bb5745a6f9a30e75d48905f (diff) | |
| download | org.eclipse.etrice-4aa11d8fbc45298bbb134e678217b981dee301b4.tar.gz org.eclipse.etrice-4aa11d8fbc45298bbb134e678217b981dee301b4.tar.xz org.eclipse.etrice-4aa11d8fbc45298bbb134e678217b981dee301b4.zip | |
Merge branch 'master' of
ssh://jhaug@git.eclipse.org:29418/etrice/org.eclipse.etrice.git
Conflicts:
plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.xtend
plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.java
plugins/org.eclipse.etrice.generator.config/src/org/eclipse/etrice/generator/config/DataConfiguration.xtend
plugins/org.eclipse.etrice.generator.config/xtend-gen/org/eclipse/etrice/generator/config/.DataConfiguration.java._trace
Change-Id: Idb15029b0a22ab872f58c1cee1457452daff46c5
Diffstat (limited to 'plugins/org.eclipse.etrice.generator.config/src/org/eclipse/etrice')
| -rw-r--r-- | plugins/org.eclipse.etrice.generator.config/src/org/eclipse/etrice/generator/config/DataConfiguration.xtend | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/plugins/org.eclipse.etrice.generator.config/src/org/eclipse/etrice/generator/config/DataConfiguration.xtend b/plugins/org.eclipse.etrice.generator.config/src/org/eclipse/etrice/generator/config/DataConfiguration.xtend index 4cf04e79a..46907c95d 100644 --- a/plugins/org.eclipse.etrice.generator.config/src/org/eclipse/etrice/generator/config/DataConfiguration.xtend +++ b/plugins/org.eclipse.etrice.generator.config/src/org/eclipse/etrice/generator/config/DataConfiguration.xtend @@ -12,11 +12,14 @@ package org.eclipse.etrice.generator.config
+import com.google.inject.Inject
import java.util.ArrayList
import java.util.List
+import org.eclipse.emf.ecore.EObject
import org.eclipse.emf.ecore.resource.ResourceSet
import org.eclipse.etrice.core.ConfigStandaloneSetup
import org.eclipse.etrice.core.config.BooleanLiteral
+import org.eclipse.etrice.core.config.ConfigModel
import org.eclipse.etrice.core.config.IntLiteral
import org.eclipse.etrice.core.config.Literal
import org.eclipse.etrice.core.config.LiteralArray
@@ -30,10 +33,17 @@ import org.eclipse.etrice.core.room.Attribute import org.eclipse.etrice.core.room.ProtocolClass
import org.eclipse.etrice.core.room.SubSystemClass
import org.eclipse.etrice.generator.base.IDataConfiguration
+import org.eclipse.etrice.generator.base.IResourceURIAcceptor
import org.eclipse.etrice.generator.config.util.DataConfigurationHelper
+import org.eclipse.xtext.scoping.impl.ImportUriResolver class DataConfiguration implements IDataConfiguration {
+ @Inject
+ protected ILogger logger;
+
+ @Inject
+ protected ImportUriResolver uriResolver;
override doSetup() {
ConfigStandaloneSetup::doSetup()
@@ -154,7 +164,14 @@ class DataConfiguration implements IDataConfiguration { configs?.forEach(c | if(!c.readOnly)result.add(c.attribute))
return result
}
+ + override void addReferencedModels(IResourceURIAcceptor acceptor, EObject root) {
+ if (root instanceof ConfigModel) {
+ for (imp : (root as ConfigModel).imports) {
+ val importURI = uriResolver.resolve(imp)
+ acceptor.addResourceURI(importURI);
+ }
+ }
+ } -
-
-}
\ No newline at end of file +} |