From 779cfc1d54a67fa07aba8c3db4724798652136f7 Mon Sep 17 00:00:00 2001 From: Florian Hoelzl <hoelzl@fortiss.org> Date: Fri, 29 Apr 2016 13:38:08 +0000 Subject: [PATCH] Tutorial menu entries working properly. refs 2567 --- org.fortiss.tooling.kernel/trunk/model/kernel.ecore | 4 +--- org.fortiss.tooling.kernel/trunk/model/kernel.genmodel | 4 +--- .../tooling/kernel/utils/TutorialModelElementFactory.java | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/org.fortiss.tooling.kernel/trunk/model/kernel.ecore b/org.fortiss.tooling.kernel/trunk/model/kernel.ecore index 736480c48..7e14be61f 100644 --- a/org.fortiss.tooling.kernel/trunk/model/kernel.ecore +++ b/org.fortiss.tooling.kernel/trunk/model/kernel.ecore @@ -163,8 +163,6 @@ </eSubpackages> <eSubpackages name="tutorial" nsURI="http://www.fortiss.org/tooling/base/model/element/tutorial" nsPrefix="org-fortiss-tooling-kernel-tutorial"> - <eClassifiers xsi:type="ecore:EClass" name="TutorialDefinition"> - <eStructuralFeatures xsi:type="ecore:EAttribute" name="title" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/> - </eClassifiers> + <eClassifiers xsi:type="ecore:EClass" name="TutorialDefinition" eSuperTypes="#//IProjectRootElement"/> </eSubpackages> </ecore:EPackage> diff --git a/org.fortiss.tooling.kernel/trunk/model/kernel.genmodel b/org.fortiss.tooling.kernel/trunk/model/kernel.genmodel index f02c3c377..14a78941b 100644 --- a/org.fortiss.tooling.kernel/trunk/model/kernel.genmodel +++ b/org.fortiss.tooling.kernel/trunk/model/kernel.genmodel @@ -81,9 +81,7 @@ </nestedGenPackages> <nestedGenPackages prefix="Tutorial" basePackage="org.fortiss.tooling.kernel.model" disposableProviderFactory="true" ecorePackage="kernel.ecore#//tutorial"> - <genClasses ecoreClass="kernel.ecore#//tutorial/TutorialDefinition"> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute kernel.ecore#//tutorial/TutorialDefinition/title"/> - </genClasses> + <genClasses ecoreClass="kernel.ecore#//tutorial/TutorialDefinition"/> </nestedGenPackages> </genPackages> </genmodel:GenModel> diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/TutorialModelElementFactory.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/TutorialModelElementFactory.java index 7e629f6b2..8e66cbbb2 100644 --- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/TutorialModelElementFactory.java +++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/utils/TutorialModelElementFactory.java @@ -33,7 +33,7 @@ public final class TutorialModelElementFactory { /** Creates a {@link TutorialDefinition}. */ public static TutorialDefinition createTutorialDefinition(String title) { TutorialDefinition def = TutorialFactory.eINSTANCE.createTutorialDefinition(); - def.setTitle(title); + def.setName(title); return def; } } -- GitLab