[CQ][generator] first config c generator

3 files changed, 18 insertions, 28 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 df5949be2..4cf04e79a 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
@@ -16,21 +16,21 @@ import java.util.ArrayList
 import java.util.List

 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.IntLiteral

+import org.eclipse.etrice.core.config.Literal

+import org.eclipse.etrice.core.config.LiteralArray

+import org.eclipse.etrice.core.config.RealLiteral

+import org.eclipse.etrice.core.config.StringLiteral

 import org.eclipse.etrice.core.genmodel.base.ILogger

 import org.eclipse.etrice.core.genmodel.etricegen.ActorInstance

+import org.eclipse.etrice.core.genmodel.etricegen.InterfaceItemInstance

 import org.eclipse.etrice.core.room.ActorClass

 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.config.util.DataConfigurationHelper

-import org.eclipse.etrice.core.config.BooleanLiteral

-import org.eclipse.etrice.core.config.IntLiteral

-import org.eclipse.etrice.core.config.RealLiteral

-import org.eclipse.etrice.core.config.StringLiteral

-import org.eclipse.etrice.core.config.LiteralArray

-import org.eclipse.etrice.core.config.Literal

-import org.eclipse.etrice.core.room.InterfaceItem

 

 class DataConfiguration implements IDataConfiguration {

 	

@@ -76,11 +76,9 @@ class DataConfiguration implements IDataConfiguration {
 		DataConfigurationHelper::actorInstanceAttrMap.get(id)?.value?.toStringExpr

 	}

 	

-	override getAttrInstanceConfigValue(ActorInstance ai, InterfaceItem port, List<Attribute> path) {

-		var id = ai.path+"/"+port.name+"/"+path.toStringPath

-		DataConfigurationHelper::actorInstanceAttrMap.get(id)?.value?.toStringExpr

+	override getAttrInstanceConfigValue(InterfaceItemInstance item, List<Attribute> path) {

+		DataConfigurationHelper::actorInstanceAttrMap.get(item.path)?.value?.toStringExpr

 	}

-	

 	// dynamic

 	

 	override getPollingTimerUser(SubSystemClass subsystem) {

@@ -157,4 +155,6 @@ class DataConfiguration implements IDataConfiguration {
 		return result

 	}

 	

+

+	

 }
\ No newline at end of file
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 2a0298842..81c6451d7 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
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 3109e59ca..a9a36f5cf 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
@@ -19,9 +19,9 @@ import org.eclipse.etrice.core.config.StringLiteral;
 import org.eclipse.etrice.core.config.SubSystemConfig;

 import org.eclipse.etrice.core.genmodel.base.ILogger;

 import org.eclipse.etrice.core.genmodel.etricegen.ActorInstance;

+import org.eclipse.etrice.core.genmodel.etricegen.InterfaceItemInstance;

 import org.eclipse.etrice.core.room.ActorClass;

 import org.eclipse.etrice.core.room.Attribute;

-import org.eclipse.etrice.core.room.InterfaceItem;

 import org.eclipse.etrice.core.room.ProtocolClass;

 import org.eclipse.etrice.core.room.SubSystemClass;

 import org.eclipse.etrice.generator.base.IDataConfiguration;

@@ -139,22 +139,12 @@ public class DataConfiguration implements IDataConfiguration {
     return _xblockexpression;

   }

   

-  public String getAttrInstanceConfigValue(final ActorInstance ai, final InterfaceItem port, final List<Attribute> path) {

-    String _xblockexpression = null;

-    {

-      String _path = ai.getPath();

-      String _plus = (_path + "/");

-      String _name = port.getName();

-      String _plus_1 = (_plus + _name);

-      String _plus_2 = (_plus_1 + "/");

-      String _stringPath = this.toStringPath(path);

-      String id = (_plus_2 + _stringPath);

-      AttrInstanceConfig _get = DataConfigurationHelper.actorInstanceAttrMap.get(id);

-      LiteralArray _value = _get==null?(LiteralArray)null:_get.getValue();

-      String _stringExpr = _value==null?(String)null:this.toStringExpr(_value);

-      _xblockexpression = (_stringExpr);

-    }

-    return _xblockexpression;

+  public String getAttrInstanceConfigValue(final InterfaceItemInstance item, final List<Attribute> path) {

+    String _path = item.getPath();

+    AttrInstanceConfig _get = DataConfigurationHelper.actorInstanceAttrMap.get(_path);

+    LiteralArray _value = _get==null?(LiteralArray)null:_get.getValue();

+    String _stringExpr = _value==null?(String)null:this.toStringExpr(_value);

+    return _stringExpr;

   }

   

   public int getPollingTimerUser(final SubSystemClass subsystem) {