Skip to content

Commit 68f03c2

Browse files
d-leroyd-leroy
committed
Fixed several minor issues with the display of the stackframes and the values at the start of an execution and re-enabled execution relaunch from the timeline
1 parent 76186ad commit 68f03c2

17 files changed

Lines changed: 1178 additions & 123 deletions

File tree

‎framework/execution_framework/plugins/org.gemoc.executionframework.engine/src/org/gemoc/executionframework/engine/commons/ModelExecutionContext.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public ModelExecutionContext(IRunConfiguration runConfiguration, ExecutionMode e
4848
// TODO throw warning that we couldn't copy the model
4949
}
5050
_languageDefinition = getLanguageDefinition(_runConfiguration.getLanguageName());
51-
_melangeBundle = MelangeHelper.getMelangeBundle(runConfiguration.getLanguageName());
51+
_melangeBundle = MelangeHelper.getMelangeBundle(_runConfiguration.getLanguageName());
5252
_executionPlatform = createExecutionPlatform(); // new
5353
// DefaultExecutionPlatform(_languageDefinition,
5454
// _runConfiguration);

‎framework/framework_commons/plugins/org.gemoc.executionframework.engine.mse.model/model/GemocExecutionEngineMSE.ecore‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,5 +74,16 @@
7474
<eStructuralFeatures xsi:type="ecore:EReference" name="launchconfiguration" lowerBound="1"
7575
eType="#//LaunchConfiguration" containment="true"/>
7676
</eClassifiers>
77-
<eClassifiers xsi:type="ecore:EClass" name="LaunchConfiguration"/>
77+
<eClassifiers xsi:type="ecore:EClass" name="LaunchConfiguration">
78+
<eStructuralFeatures xsi:type="ecore:EAttribute" name="languageName" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
79+
<eStructuralFeatures xsi:type="ecore:EAttribute" name="resourceURI" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
80+
<eStructuralFeatures xsi:type="ecore:EAttribute" name="airdResourceURI" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
81+
<eStructuralFeatures xsi:type="ecore:EAttribute" name="methodEntryPoint" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
82+
<eStructuralFeatures xsi:type="ecore:EAttribute" name="modelEntryPoint" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
83+
<eStructuralFeatures xsi:type="ecore:EAttribute" name="initializationMethod" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
84+
<eStructuralFeatures xsi:type="ecore:EAttribute" name="initializationArguments"
85+
eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
86+
<eStructuralFeatures xsi:type="ecore:EAttribute" name="addonExtensions" upperBound="-1"
87+
eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
88+
</eClassifiers>
7889
</ecore:EPackage>

‎framework/framework_commons/plugins/org.gemoc.executionframework.engine.mse.model/src/org/gemoc/executionframework/engine/mse/LaunchConfiguration.java‎

Lines changed: 212 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,229 @@
1111
*/
1212
package org.gemoc.executionframework.engine.mse;
1313

14+
import org.eclipse.emf.common.util.EList;
1415
import org.eclipse.emf.ecore.EObject;
1516

1617
/**
1718
* <!-- begin-user-doc -->
1819
* A representation of the model object '<em><b>Launch Configuration</b></em>'.
1920
* <!-- end-user-doc -->
2021
*
22+
* <p>
23+
* The following features are supported:
24+
* </p>
25+
* <ul>
26+
* <li>{@link org.gemoc.executionframework.engine.mse.LaunchConfiguration#getLanguageName <em>Language Name</em>}</li>
27+
* <li>{@link org.gemoc.executionframework.engine.mse.LaunchConfiguration#getResourceURI <em>Resource URI</em>}</li>
28+
* <li>{@link org.gemoc.executionframework.engine.mse.LaunchConfiguration#getAirdResourceURI <em>Aird Resource URI</em>}</li>
29+
* <li>{@link org.gemoc.executionframework.engine.mse.LaunchConfiguration#getMethodEntryPoint <em>Method Entry Point</em>}</li>
30+
* <li>{@link org.gemoc.executionframework.engine.mse.LaunchConfiguration#getModelEntryPoint <em>Model Entry Point</em>}</li>
31+
* <li>{@link org.gemoc.executionframework.engine.mse.LaunchConfiguration#getInitializationMethod <em>Initialization Method</em>}</li>
32+
* <li>{@link org.gemoc.executionframework.engine.mse.LaunchConfiguration#getInitializationArguments <em>Initialization Arguments</em>}</li>
33+
* <li>{@link org.gemoc.executionframework.engine.mse.LaunchConfiguration#getAddonExtensions <em>Addon Extensions</em>}</li>
34+
* </ul>
2135
*
2236
* @see org.gemoc.executionframework.engine.mse.MsePackage#getLaunchConfiguration()
2337
* @model
2438
* @generated
2539
*/
2640
public interface LaunchConfiguration extends EObject {
41+
42+
/**
43+
* Returns the value of the '<em><b>Language Name</b></em>' attribute.
44+
* <!-- begin-user-doc -->
45+
* <p>
46+
* If the meaning of the '<em>Language Name</em>' attribute isn't clear,
47+
* there really should be more of a description here...
48+
* </p>
49+
* <!-- end-user-doc -->
50+
* @return the value of the '<em>Language Name</em>' attribute.
51+
* @see #setLanguageName(String)
52+
* @see org.gemoc.executionframework.engine.mse.MsePackage#getLaunchConfiguration_LanguageName()
53+
* @model
54+
* @generated
55+
*/
56+
String getLanguageName();
57+
58+
/**
59+
* Sets the value of the '{@link org.gemoc.executionframework.engine.mse.LaunchConfiguration#getLanguageName <em>Language Name</em>}' attribute.
60+
* <!-- begin-user-doc -->
61+
* <!-- end-user-doc -->
62+
* @param value the new value of the '<em>Language Name</em>' attribute.
63+
* @see #getLanguageName()
64+
* @generated
65+
*/
66+
void setLanguageName(String value);
67+
68+
/**
69+
* Returns the value of the '<em><b>Resource URI</b></em>' attribute.
70+
* <!-- begin-user-doc -->
71+
* <p>
72+
* If the meaning of the '<em>Resource URI</em>' attribute isn't clear,
73+
* there really should be more of a description here...
74+
* </p>
75+
* <!-- end-user-doc -->
76+
* @return the value of the '<em>Resource URI</em>' attribute.
77+
* @see #setResourceURI(String)
78+
* @see org.gemoc.executionframework.engine.mse.MsePackage#getLaunchConfiguration_ResourceURI()
79+
* @model
80+
* @generated
81+
*/
82+
String getResourceURI();
83+
84+
/**
85+
* Sets the value of the '{@link org.gemoc.executionframework.engine.mse.LaunchConfiguration#getResourceURI <em>Resource URI</em>}' attribute.
86+
* <!-- begin-user-doc -->
87+
* <!-- end-user-doc -->
88+
* @param value the new value of the '<em>Resource URI</em>' attribute.
89+
* @see #getResourceURI()
90+
* @generated
91+
*/
92+
void setResourceURI(String value);
93+
94+
/**
95+
* Returns the value of the '<em><b>Aird Resource URI</b></em>' attribute.
96+
* <!-- begin-user-doc -->
97+
* <p>
98+
* If the meaning of the '<em>Aird Resource URI</em>' attribute isn't clear,
99+
* there really should be more of a description here...
100+
* </p>
101+
* <!-- end-user-doc -->
102+
* @return the value of the '<em>Aird Resource URI</em>' attribute.
103+
* @see #setAirdResourceURI(String)
104+
* @see org.gemoc.executionframework.engine.mse.MsePackage#getLaunchConfiguration_AirdResourceURI()
105+
* @model
106+
* @generated
107+
*/
108+
String getAirdResourceURI();
109+
110+
/**
111+
* Sets the value of the '{@link org.gemoc.executionframework.engine.mse.LaunchConfiguration#getAirdResourceURI <em>Aird Resource URI</em>}' attribute.
112+
* <!-- begin-user-doc -->
113+
* <!-- end-user-doc -->
114+
* @param value the new value of the '<em>Aird Resource URI</em>' attribute.
115+
* @see #getAirdResourceURI()
116+
* @generated
117+
*/
118+
void setAirdResourceURI(String value);
119+
120+
/**
121+
* Returns the value of the '<em><b>Method Entry Point</b></em>' attribute.
122+
* <!-- begin-user-doc -->
123+
* <p>
124+
* If the meaning of the '<em>Method Entry Point</em>' attribute isn't clear,
125+
* there really should be more of a description here...
126+
* </p>
127+
* <!-- end-user-doc -->
128+
* @return the value of the '<em>Method Entry Point</em>' attribute.
129+
* @see #setMethodEntryPoint(String)
130+
* @see org.gemoc.executionframework.engine.mse.MsePackage#getLaunchConfiguration_MethodEntryPoint()
131+
* @model
132+
* @generated
133+
*/
134+
String getMethodEntryPoint();
135+
136+
/**
137+
* Sets the value of the '{@link org.gemoc.executionframework.engine.mse.LaunchConfiguration#getMethodEntryPoint <em>Method Entry Point</em>}' attribute.
138+
* <!-- begin-user-doc -->
139+
* <!-- end-user-doc -->
140+
* @param value the new value of the '<em>Method Entry Point</em>' attribute.
141+
* @see #getMethodEntryPoint()
142+
* @generated
143+
*/
144+
void setMethodEntryPoint(String value);
145+
146+
/**
147+
* Returns the value of the '<em><b>Model Entry Point</b></em>' attribute.
148+
* <!-- begin-user-doc -->
149+
* <p>
150+
* If the meaning of the '<em>Model Entry Point</em>' attribute isn't clear,
151+
* there really should be more of a description here...
152+
* </p>
153+
* <!-- end-user-doc -->
154+
* @return the value of the '<em>Model Entry Point</em>' attribute.
155+
* @see #setModelEntryPoint(String)
156+
* @see org.gemoc.executionframework.engine.mse.MsePackage#getLaunchConfiguration_ModelEntryPoint()
157+
* @model
158+
* @generated
159+
*/
160+
String getModelEntryPoint();
161+
162+
/**
163+
* Sets the value of the '{@link org.gemoc.executionframework.engine.mse.LaunchConfiguration#getModelEntryPoint <em>Model Entry Point</em>}' attribute.
164+
* <!-- begin-user-doc -->
165+
* <!-- end-user-doc -->
166+
* @param value the new value of the '<em>Model Entry Point</em>' attribute.
167+
* @see #getModelEntryPoint()
168+
* @generated
169+
*/
170+
void setModelEntryPoint(String value);
171+
172+
/**
173+
* Returns the value of the '<em><b>Initialization Method</b></em>' attribute.
174+
* <!-- begin-user-doc -->
175+
* <p>
176+
* If the meaning of the '<em>Initialization Method</em>' attribute isn't clear,
177+
* there really should be more of a description here...
178+
* </p>
179+
* <!-- end-user-doc -->
180+
* @return the value of the '<em>Initialization Method</em>' attribute.
181+
* @see #setInitializationMethod(String)
182+
* @see org.gemoc.executionframework.engine.mse.MsePackage#getLaunchConfiguration_InitializationMethod()
183+
* @model
184+
* @generated
185+
*/
186+
String getInitializationMethod();
187+
188+
/**
189+
* Sets the value of the '{@link org.gemoc.executionframework.engine.mse.LaunchConfiguration#getInitializationMethod <em>Initialization Method</em>}' attribute.
190+
* <!-- begin-user-doc -->
191+
* <!-- end-user-doc -->
192+
* @param value the new value of the '<em>Initialization Method</em>' attribute.
193+
* @see #getInitializationMethod()
194+
* @generated
195+
*/
196+
void setInitializationMethod(String value);
197+
198+
/**
199+
* Returns the value of the '<em><b>Initialization Arguments</b></em>' attribute.
200+
* <!-- begin-user-doc -->
201+
* <p>
202+
* If the meaning of the '<em>Initialization Arguments</em>' attribute isn't clear,
203+
* there really should be more of a description here...
204+
* </p>
205+
* <!-- end-user-doc -->
206+
* @return the value of the '<em>Initialization Arguments</em>' attribute.
207+
* @see #setInitializationArguments(String)
208+
* @see org.gemoc.executionframework.engine.mse.MsePackage#getLaunchConfiguration_InitializationArguments()
209+
* @model
210+
* @generated
211+
*/
212+
String getInitializationArguments();
213+
214+
/**
215+
* Sets the value of the '{@link org.gemoc.executionframework.engine.mse.LaunchConfiguration#getInitializationArguments <em>Initialization Arguments</em>}' attribute.
216+
* <!-- begin-user-doc -->
217+
* <!-- end-user-doc -->
218+
* @param value the new value of the '<em>Initialization Arguments</em>' attribute.
219+
* @see #getInitializationArguments()
220+
* @generated
221+
*/
222+
void setInitializationArguments(String value);
223+
224+
/**
225+
* Returns the value of the '<em><b>Addon Extensions</b></em>' attribute list.
226+
* The list contents are of type {@link java.lang.String}.
227+
* <!-- begin-user-doc -->
228+
* <p>
229+
* If the meaning of the '<em>Addon Extensions</em>' attribute list isn't clear,
230+
* there really should be more of a description here...
231+
* </p>
232+
* <!-- end-user-doc -->
233+
* @return the value of the '<em>Addon Extensions</em>' attribute list.
234+
* @see org.gemoc.executionframework.engine.mse.MsePackage#getLaunchConfiguration_AddonExtensions()
235+
* @model
236+
* @generated
237+
*/
238+
EList<String> getAddonExtensions();
27239
} // LaunchConfiguration

0 commit comments

Comments
 (0)