Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2012-09-14 10:56:57 -0400
committerHenrik Rentz-Reichert2012-09-14 10:56:57 -0400
commite85be57b8fa78975194d380f076585b26e22a991 (patch)
tree87a83a7f69d36122721e567b2f66cbb2a6560e21 /plugins/org.eclipse.etrice.generator.java/src
parentd26072a00a2647cabfcda4dbf78291fb07ec2fdd (diff)
downloadorg.eclipse.etrice-e85be57b8fa78975194d380f076585b26e22a991.tar.gz
org.eclipse.etrice-e85be57b8fa78975194d380f076585b26e22a991.tar.xz
org.eclipse.etrice-e85be57b8fa78975194d380f076585b26e22a991.zip
[runtime.java, generator.java, ui.runtime, tutorials] changed generation of runner class
Diffstat (limited to 'plugins/org.eclipse.etrice.generator.java/src')
-rw-r--r--plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/SubSystemClassGen.xtend4
-rw-r--r--plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/SubSystemRunnerGen.xtend20
2 files changed, 6 insertions, 18 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 5ec7ae279..f5489ef7c 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
@@ -76,8 +76,8 @@ class SubSystemClassGen {
«cc.userCode(2)»
- public «comp.name»(IRTObject parent, String name) {
- super(parent, name);
+ public «comp.name»(String name) {
+ super(name);
}
@Override
diff --git a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/SubSystemRunnerGen.xtend b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/SubSystemRunnerGen.xtend
index 69dba9085..c0cc6cc1f 100644
--- a/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/SubSystemRunnerGen.xtend
+++ b/plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/SubSystemRunnerGen.xtend
@@ -47,27 +47,15 @@ class SubSystemRunnerGen {
class «ssc.name+"Runner"» extends SubSystemRunnerBase {
- static «ssc.name» main_component = new «ssc.name»(null, "«ssc.name»");
-
/**
* main function
- * creates component and starts and stops the lifecycle
+ * creates the main component and starts and stops the lifecycle
*/
public static void main(String[] args) {
-
- System.out.println("*** T H E B E G I N ***");
+ // instantiate the main component
+ «ssc.name» main_component = new «ssc.name»("«ssc.name»");
- main_component.init(); // lifecycle init
- main_component.start(); // lifecycle start
-
- // application runs until quit
- waitForQuit();
-
- // end the lifecycle
- main_component.stop(); // lifecycle stop
- main_component.destroy(); // lifecycle destroy
-
- System.out.println("*** T H E E N D ***");
+ run(main_component, args);
}
};
'''

Back to the top