[generator, generator.config, generator.java] removed work-around

When using the configuration currently *no* LogicalSystem must be
defined!

1 files changed, 2 insertions, 11 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 0981c3ef4..e7b0e7588 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
@@ -35,7 +35,6 @@ import org.eclipse.emf.ecore.resource.Resource
 import org.eclipse.etrice.core.config.ConfigModel

 import com.google.inject.Inject

 import org.eclipse.xtext.scoping.impl.ImportUriResolver

-import org.eclipse.etrice.core.genmodel.etricegen.SubSystemInstance

 

 class DataConfiguration implements IDataConfiguration {

 	

@@ -82,12 +81,12 @@ class DataConfiguration implements IDataConfiguration {
 	}

 	

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

-		var id = ai.subsyspath+"/"+path.toStringPath

+		var id = ai.path+"/"+path.toStringPath

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

 	}

 	

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

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

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

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

 	}

 	

@@ -178,12 +177,4 @@ class DataConfiguration implements IDataConfiguration {
 		}

 	}

 	

-	// TODO: this has to be replaced by a simple ai.path later

-	def subsyspath(ActorInstance ai) {

-		var parent = ai.eContainer

-		while (! (parent instanceof SubSystemInstance))

-			parent = parent.eContainer

-		ai.path.replaceFirst("/[a-zA-Z_]+/", "/"+(parent as SubSystemInstance).subSystemClass.name+"/")

-	}

-	

 }
\ No newline at end of file