diff options
| author | Henrik Rentz-Reichert | 2012-11-20 17:11:35 +0000 |
|---|---|---|
| committer | Henrik Rentz-Reichert | 2012-11-20 17:11:35 +0000 |
| commit | 9193c39df8163025d5db68b32d0d23cf336c915a (patch) | |
| tree | 7e027ad6fb8672635650d01bb9a45409af52d4f9 /plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/SubSystemClassGen.xtend | |
| parent | 098e488a0f1edf5f5b1147e7515aa44d49710678 (diff) | |
| download | org.eclipse.etrice-9193c39df8163025d5db68b32d0d23cf336c915a.tar.gz org.eclipse.etrice-9193c39df8163025d5db68b32d0d23cf336c915a.tar.xz org.eclipse.etrice-9193c39df8163025d5db68b32d0d23cf336c915a.zip | |
[core.generator.java] fixes in generator (instance name -> class name)
Diffstat (limited to 'plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/SubSystemClassGen.xtend')
| -rw-r--r-- | plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/SubSystemClassGen.xtend | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/SubSystemClassGen.xtend b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/SubSystemClassGen.xtend index c2ff4fb81..c4dbabbf2 100644 --- a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/SubSystemClassGen.xtend +++ b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/SubSystemClassGen.xtend @@ -17,7 +17,6 @@ import com.google.inject.Singleton import org.eclipse.etrice.core.genmodel.base.ILogger
import org.eclipse.etrice.core.genmodel.etricegen.Root
import org.eclipse.etrice.core.genmodel.etricegen.SubSystemInstance
-import org.eclipse.etrice.core.room.SubSystemClass
import org.eclipse.etrice.generator.generic.ProcedureHelpers
import org.eclipse.etrice.generator.generic.RoomExtensions
import org.eclipse.xtext.generator.JavaIoFileSystemAccess
@@ -44,13 +43,15 @@ class SubSystemClassGen { var file = ssi.subSystemClass.getJavaFileName
logger.logInfo("generating SubSystemClass implementation: '"+file+"' in '"+path+"'")
fileAccess.setOutputPath(path)
- fileAccess.generateFile(file, root.generate(ssi, ssi.subSystemClass))
+ fileAccess.generateFile(file, root.generate(ssi))
if(dataConfigExt.hasVariableService(ssi.subSystemClass))
varService.doGenerate(root, ssi);
}
}
- def generate(Root root, SubSystemInstance comp, SubSystemClass cc) {'''
+ def generate(Root root, SubSystemInstance comp) {
+ val cc = comp.subSystemClass
+ '''
package «cc.getPackage()»;
«IF dataConfigExt.hasVariableService(cc)»import org.eclipse.etrice.runtime.java.config.VariableService;«ENDIF»
@@ -68,11 +69,11 @@ class SubSystemClassGen { «cc.userCode(1)»
- public class «comp.name» extends SubSystemClassBase{
+ public class «cc.name» extends SubSystemClassBase {
«cc.userCode(2)»
- public «comp.name»(String name) {
+ public «cc.name»(String name) {
super(name);
}
@@ -208,7 +209,7 @@ class SubSystemClassGen { @Override
public void init(){
«IF dataConfigExt.hasVariableService(cc)»
- variableService = new «comp.name»VariableService(this);
+ variableService = new «cc.name»VariableService(this);
«ENDIF»
super.init();
«IF dataConfigExt.hasVariableService(cc)»
|