[config] added dynamic config for enum + validation + fixes

Change-Id: I98598b7fdc043ee79c271b46ad01cae0a1d69ffa

2 files changed, 12 insertions, 10 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) {
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 dca84345d..0bf7c2b15 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
@@ -13,6 +13,7 @@ package org.eclipse.etrice.generator.config;
 import com.google.common.base.Objects;
 import com.google.inject.Inject;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import org.eclipse.emf.common.EMFPlugin;
 import org.eclipse.emf.common.util.EList;
@@ -436,8 +437,8 @@ public class DataConfiguration implements IDataConfiguration {
   }
   
   public List<Attribute> getDynConfigReadAttributes(final ActorClass actor) {
-    ArrayList<Attribute> _arrayList = new ArrayList<Attribute>();
-    final ArrayList<Attribute> result = _arrayList;
+    HashSet<Attribute> _hashSet = new HashSet<Attribute>();
+    final HashSet<Attribute> result = _hashSet;
     List<AttrInstanceConfig> configs = DataConfigurationHelper.dynActorClassAttrMap.get(actor);
     if (configs!=null) {
       final Procedure1<AttrInstanceConfig> _function = new Procedure1<AttrInstanceConfig>() {
@@ -451,12 +452,12 @@ public class DataConfiguration implements IDataConfiguration {
       };
       IterableExtensions.<AttrInstanceConfig>forEach(configs, _function);
     }
-    return result;
+    return IterableExtensions.<Attribute>toList(result);
   }
   
   public List<Attribute> getDynConfigWriteAttributes(final ActorClass actor) {
-    ArrayList<Attribute> _arrayList = new ArrayList<Attribute>();
-    final ArrayList<Attribute> result = _arrayList;
+    HashSet<Attribute> _hashSet = new HashSet<Attribute>();
+    final HashSet<Attribute> result = _hashSet;
     List<AttrInstanceConfig> configs = DataConfigurationHelper.dynActorClassAttrMap.get(actor);
     if (configs!=null) {
       final Procedure1<AttrInstanceConfig> _function = new Procedure1<AttrInstanceConfig>() {
@@ -471,7 +472,7 @@ public class DataConfiguration implements IDataConfiguration {
       };
       IterableExtensions.<AttrInstanceConfig>forEach(configs, _function);
     }
-    return result;
+    return IterableExtensions.<Attribute>toList(result);
   }
   
   public void addReferencedModels(final IResourceURIAcceptor acceptor, final EObject root) {