Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Haug2012-11-23 07:29:02 -0500
committerJuergen Haug2012-11-23 07:29:02 -0500
commit4aa11d8fbc45298bbb134e678217b981dee301b4 (patch)
tree6efb6ac2ee427e854b26346f1b83ec23b084fc28 /plugins/org.eclipse.etrice.generator.config/xtend-gen/org
parent50fcc9f9b85408eb13037b6cfad0af69d756f495 (diff)
parentc3a077700afda0406bb5745a6f9a30e75d48905f (diff)
downloadorg.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/xtend-gen/org')
-rw-r--r--plugins/org.eclipse.etrice.generator.config/xtend-gen/org/eclipse/etrice/generator/config/.DataConfiguration.java._tracebin43716 -> 46320 bytes
-rw-r--r--plugins/org.eclipse.etrice.generator.config/xtend-gen/org/eclipse/etrice/generator/config/DataConfiguration.java24
2 files changed, 24 insertions, 0 deletions
diff --git a/plugins/org.eclipse.etrice.generator.config/xtend-gen/org/eclipse/etrice/generator/config/.DataConfiguration.java._trace b/plugins/org.eclipse.etrice.generator.config/xtend-gen/org/eclipse/etrice/generator/config/.DataConfiguration.java._trace
index 81c6451d7..1ae2a269c 100644
--- a/plugins/org.eclipse.etrice.generator.config/xtend-gen/org/eclipse/etrice/generator/config/.DataConfiguration.java._trace
+++ b/plugins/org.eclipse.etrice.generator.config/xtend-gen/org/eclipse/etrice/generator/config/.DataConfiguration.java._trace
Binary files differ
diff --git a/plugins/org.eclipse.etrice.generator.config/xtend-gen/org/eclipse/etrice/generator/config/DataConfiguration.java b/plugins/org.eclipse.etrice.generator.config/xtend-gen/org/eclipse/etrice/generator/config/DataConfiguration.java
index a9a36f5cf..73f58ca3f 100644
--- a/plugins/org.eclipse.etrice.generator.config/xtend-gen/org/eclipse/etrice/generator/config/DataConfiguration.java
+++ b/plugins/org.eclipse.etrice.generator.config/xtend-gen/org/eclipse/etrice/generator/config/DataConfiguration.java
@@ -1,15 +1,19 @@
package org.eclipse.etrice.generator.config;
import com.google.common.base.Objects;
+import com.google.inject.Inject;
import java.util.ArrayList;
import java.util.List;
import org.eclipse.emf.common.util.EList;
+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.AttrClassConfig;
import org.eclipse.etrice.core.config.AttrInstanceConfig;
import org.eclipse.etrice.core.config.BooleanLiteral;
+import org.eclipse.etrice.core.config.ConfigModel;
import org.eclipse.etrice.core.config.DynamicConfig;
+import org.eclipse.etrice.core.config.Import;
import org.eclipse.etrice.core.config.IntLiteral;
import org.eclipse.etrice.core.config.Literal;
import org.eclipse.etrice.core.config.LiteralArray;
@@ -25,13 +29,21 @@ 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.xtend2.lib.StringConcatenation;
+import org.eclipse.xtext.scoping.impl.ImportUriResolver;
import org.eclipse.xtext.xbase.lib.IterableExtensions;
import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
@SuppressWarnings("all")
public class DataConfiguration implements IDataConfiguration {
+ @Inject
+ protected ILogger logger;
+
+ @Inject
+ protected ImportUriResolver uriResolver;
+
public void doSetup() {
ConfigStandaloneSetup.doSetup();
}
@@ -331,4 +343,16 @@ public class DataConfiguration implements IDataConfiguration {
if (configs!=null) IterableExtensions.<AttrInstanceConfig>forEach(configs, _function);
return result;
}
+
+ public void addReferencedModels(final IResourceURIAcceptor acceptor, final EObject root) {
+ if ((root instanceof ConfigModel)) {
+ EList<Import> _imports = ((ConfigModel) root).getImports();
+ for (final Import imp : _imports) {
+ {
+ final String importURI = this.uriResolver.resolve(imp);
+ acceptor.addResourceURI(importURI);
+ }
+ }
+ }
+ }
}

Back to the top