diff options
| author | Juergen Haug | 2017-08-31 10:02:25 +0000 |
|---|---|---|
| committer | Juergen Haug | 2017-08-31 10:44:54 +0000 |
| commit | 0b73aabf556d52108cc50facb810359ac6c019a1 (patch) | |
| tree | e0558fad4f3b31027d08ba016ab493218da86597 /plugins/org.eclipse.etrice.generator.ui/src/org/eclipse/etrice | |
| parent | 461bdb1cc551a154fd97ef68367edddb8b0d5379 (diff) | |
| download | org.eclipse.etrice-0b73aabf556d52108cc50facb810359ac6c019a1.tar.gz org.eclipse.etrice-0b73aabf556d52108cc50facb810359ac6c019a1.tar.xz org.eclipse.etrice-0b73aabf556d52108cc50facb810359ac6c019a1.zip | |
update of launch configs
Change-Id: I75d5d153fe99294ca7a0cdd479eb4c2c6246c25c
Diffstat (limited to 'plugins/org.eclipse.etrice.generator.ui/src/org/eclipse/etrice')
3 files changed, 8 insertions, 7 deletions
diff --git a/plugins/org.eclipse.etrice.generator.ui/src/org/eclipse/etrice/generator/ui/wizard/EmptyProjectWizard.java b/plugins/org.eclipse.etrice.generator.ui/src/org/eclipse/etrice/generator/ui/wizard/EmptyProjectWizard.java index 526d1eaa1..c44c949e6 100644 --- a/plugins/org.eclipse.etrice.generator.ui/src/org/eclipse/etrice/generator/ui/wizard/EmptyProjectWizard.java +++ b/plugins/org.eclipse.etrice.generator.ui/src/org/eclipse/etrice/generator/ui/wizard/EmptyProjectWizard.java @@ -164,7 +164,7 @@ public class EmptyProjectWizard extends Wizard implements INewWizard { ProjectCreator.createBuildProperties(projectURI.appendSegment("build.properties"), modelName); ProjectCreator.createLaunchGeneratorConfig(projectURI.appendSegment("generate_Template.launch"), - "java", "/" + projectName + "/model", "Mapping", AbstractGenerator.DEFAULT_MAIN_NAME, additionalLaunchConfigLines); + "java", "/" + projectName + "/model", AbstractGenerator.DEFAULT_MAIN_NAME, additionalLaunchConfigLines); ProjectCreator.createLaunchJavaApplicationConfig(projectURI.appendSegment("run_Template.launch"), projectName, MODEL_NAME, "Node_node_subSystemRefRunner"); diff --git a/plugins/org.eclipse.etrice.generator.ui/src/org/eclipse/etrice/generator/ui/wizard/ProjectCreator.java b/plugins/org.eclipse.etrice.generator.ui/src/org/eclipse/etrice/generator/ui/wizard/ProjectCreator.java index 401975de3..8ce45091c 100644 --- a/plugins/org.eclipse.etrice.generator.ui/src/org/eclipse/etrice/generator/ui/wizard/ProjectCreator.java +++ b/plugins/org.eclipse.etrice.generator.ui/src/org/eclipse/etrice/generator/ui/wizard/ProjectCreator.java @@ -364,8 +364,8 @@ public class ProjectCreator { } public static void createLaunchGeneratorConfig(URI uri, - String targetLanguage, String modelPath, String baseName, String mainMethodName, String[] addLines) { - writeFile(uri, ProjectFileFragments.getGeneratorLaunchConfig(targetLanguage, modelPath, baseName, mainMethodName, addLines)); + String targetLanguage, String modelPath, String mainMethodName, String[] addLines) { + writeFile(uri, ProjectFileFragments.getGeneratorLaunchConfig(targetLanguage, modelPath, mainMethodName, addLines)); } public static void createLaunchJavaApplicationConfig(URI uri, @@ -385,7 +385,7 @@ public class ProjectCreator { ProjectCreator.createLaunchGeneratorConfig( URI.createPlatformResourceURI("/" + project.getName() + "/gen_" + baseName + ".launch", true), "java", - mdlPath, baseName, mainMethodName, additionalLaunchConfigLines); + mdlPath, mainMethodName, additionalLaunchConfigLines); ProjectCreator.createLaunchJavaApplicationConfig( URI.createPlatformResourceURI("/" + project.getName() + "/run_" + baseName + ".launch", true), @@ -401,7 +401,7 @@ public class ProjectCreator { ProjectCreator.createLaunchGeneratorConfig( URI.createPlatformResourceURI("/" + project.getName() + "/gen_" + baseName + ".launch", true), language, - mdlPath, baseName, mainMethodName, additionalLaunchConfigLines); + mdlPath, mainMethodName, additionalLaunchConfigLines); ProjectCreator.createLaunchCApplicationConfig( URI.createPlatformResourceURI("/" + project.getName() + "/run_" + baseName + ".launch", true), diff --git a/plugins/org.eclipse.etrice.generator.ui/src/org/eclipse/etrice/generator/ui/wizard/ProjectFileFragments.xtend b/plugins/org.eclipse.etrice.generator.ui/src/org/eclipse/etrice/generator/ui/wizard/ProjectFileFragments.xtend index e698f80b6..2320db262 100644 --- a/plugins/org.eclipse.etrice.generator.ui/src/org/eclipse/etrice/generator/ui/wizard/ProjectFileFragments.xtend +++ b/plugins/org.eclipse.etrice.generator.ui/src/org/eclipse/etrice/generator/ui/wizard/ProjectFileFragments.xtend @@ -85,7 +85,7 @@ class ProjectFileFragments { ''' } - def static String getGeneratorLaunchConfig(String targetLanguage, String modelPath, String baseName, String mainMethodName, String[] addLines) { + def static String getGeneratorLaunchConfig(String targetLanguage, String modelPath, String mainMethodName, String[] addLines) { val prefStore = new ScopedPreferenceStore(InstanceScope.INSTANCE, "org.eclipse.etrice.generator.ui"); val useTranslation = prefStore.getBoolean(PreferenceConstants::GEN_USE_TRANSLATION) ''' @@ -96,7 +96,8 @@ class ProjectFileFragments { <booleanAttribute key="UseTranslation" value="«useTranslation»"/> <stringAttribute key="MainMethodName" value="«mainMethodName»"/> <listAttribute key="ModelFiles"> - <listEntry value="${workspace_loc:«modelPath»/«baseName».etmap}"/> + <listEntry value="${workspace_loc:«modelPath»/Mapping.etmap}"/> + <listEntry value="${workspace_loc:«modelPath»/TemplateModel.room}"/> </listAttribute> <listAttribute key="org.eclipse.debug.ui.favoriteGroups"> <listEntry value="org.eclipse.debug.ui.launchGroup.run"/> |