diff options
Diffstat (limited to 'plugins/org.eclipse.etrice.generator.ui')
4 files changed, 14 insertions, 11 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"/> diff --git a/plugins/org.eclipse.etrice.generator.ui/xtend-gen/org/eclipse/etrice/generator/ui/wizard/ProjectFileFragments.java b/plugins/org.eclipse.etrice.generator.ui/xtend-gen/org/eclipse/etrice/generator/ui/wizard/ProjectFileFragments.java index f1fe99688..3dabced7b 100644 --- a/plugins/org.eclipse.etrice.generator.ui/xtend-gen/org/eclipse/etrice/generator/ui/wizard/ProjectFileFragments.java +++ b/plugins/org.eclipse.etrice.generator.ui/xtend-gen/org/eclipse/etrice/generator/ui/wizard/ProjectFileFragments.java @@ -180,7 +180,7 @@ public class ProjectFileFragments { return _builder.toString(); } - public static String getGeneratorLaunchConfig(final String targetLanguage, final String modelPath, final String baseName, final String mainMethodName, final String[] addLines) { + public static String getGeneratorLaunchConfig(final String targetLanguage, final String modelPath, final String mainMethodName, final String[] addLines) { String _xblockexpression = null; { final ScopedPreferenceStore prefStore = new ScopedPreferenceStore(InstanceScope.INSTANCE, "org.eclipse.etrice.generator.ui"); @@ -208,9 +208,11 @@ public class ProjectFileFragments { _builder.newLine(); _builder.append("<listEntry value=\"${workspace_loc:"); _builder.append(modelPath, ""); - _builder.append("/"); - _builder.append(baseName, ""); - _builder.append(".etmap}\"/>"); + _builder.append("/Mapping.etmap}\"/>"); + _builder.newLineIfNotEmpty(); + _builder.append("<listEntry value=\"${workspace_loc:"); + _builder.append(modelPath, ""); + _builder.append("/TemplateModel.room}\"/>"); _builder.newLineIfNotEmpty(); _builder.append("</listAttribute>"); _builder.newLine(); |