Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Haug2013-12-10 17:14:55 +0000
committerJuergen Haug2013-12-11 16:26:23 +0000
commit560d916180e0ea081ef1228270470f6d355177ab (patch)
tree47a6614f13043a89e94d50e551fa708660439c64 /plugins/org.eclipse.etrice.generator.config/src/org/eclipse/etrice
parent9e7bc7e8513767a6d5ba506cd0209b09e831a840 (diff)
downloadorg.eclipse.etrice-560d916180e0ea081ef1228270470f6d355177ab.tar.gz
org.eclipse.etrice-560d916180e0ea081ef1228270470f6d355177ab.tar.xz
org.eclipse.etrice-560d916180e0ea081ef1228270470f6d355177ab.zip
[config] added dynamic config for enum + validation + fixes
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.xtend9
1 files changed, 5 insertions, 4 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 b5d1e0c1f..260ce9ea2 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
@@ -39,6 +39,7 @@ 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
+import java.util.HashSet
class DataConfiguration implements IDataConfiguration {
@@ -162,17 +163,17 @@ class DataConfiguration implements IDataConfiguration {
}
override getDynConfigReadAttributes(ActorClass actor) {
- val result = new ArrayList<Attribute>
+ val result = new HashSet<Attribute>
var configs = DataConfigurationHelper::dynActorClassAttrMap.get(actor)
configs?.forEach(c|if(c.readOnly) result.add(c.attribute))
- return result
+ return result.toList
}
override getDynConfigWriteAttributes(ActorClass actor) {
- val result = new ArrayList<Attribute>
+ val result = new HashSet<Attribute>
var configs = DataConfigurationHelper::dynActorClassAttrMap.get(actor)
configs?.forEach(c|if(!c.readOnly) result.add(c.attribute))
- return result
+ return result.toList
}
override void addReferencedModels(IResourceURIAcceptor acceptor, EObject root) {

Back to the top