Commit 6dea7327 authored by Faezeh KHORRAM's avatar Faezeh KHORRAM 💬
Browse files

change annotation from 'dynamic' to 'aspect' to be compatible with trace constructor

parent 634e9d71
......@@ -3,6 +3,7 @@ package org.eclipse.gemoc.example.k3fsm.k3dsa
import fr.inria.diverse.k3.al.annotationprocessor.Aspect
import fr.inria.diverse.k3.al.annotationprocessor.InitializeModel
import fr.inria.diverse.k3.al.annotationprocessor.Main
import fr.inria.diverse.k3.al.annotationprocessor.Step
......@@ -47,8 +48,8 @@ class FSMAspect {
println("processed string: "+_self.consumedString)
println("produced string: "+_self.producedString)
}
}
}
@Aspect(className=State)
class StateAspect {
@Step // <3>
......
......@@ -9,16 +9,16 @@
eType="#//State"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="finalState" eType="#//State"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="currentState" eType="#//State">
<eAnnotations source="dynamic"/>
<eAnnotations source="aspect"/>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="unprocessedString" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
<eAnnotations source="dynamic"/>
<eAnnotations source="aspect"/>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="consumedString" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
<eAnnotations source="dynamic"/>
<eAnnotations source="aspect"/>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="producedString" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
<eAnnotations source="dynamic"/>
<eAnnotations source="aspect"/>
</eStructuralFeatures>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="State">
......
......@@ -117,7 +117,7 @@ public interface FSM extends EObject {
* @return the value of the '<em>Current State</em>' reference.
* @see #setCurrentState(State)
* @see org.eclipse.gemoc.example.k3fsm.K3fsmPackage#getFSM_CurrentState()
* @model annotation="dynamic"
* @model annotation="aspect"
* @generated
*/
State getCurrentState();
......@@ -139,7 +139,7 @@ public interface FSM extends EObject {
* @return the value of the '<em>Unprocessed String</em>' attribute.
* @see #setUnprocessedString(String)
* @see org.eclipse.gemoc.example.k3fsm.K3fsmPackage#getFSM_UnprocessedString()
* @model annotation="dynamic"
* @model annotation="aspect"
* @generated
*/
String getUnprocessedString();
......@@ -161,7 +161,7 @@ public interface FSM extends EObject {
* @return the value of the '<em>Consumed String</em>' attribute.
* @see #setConsumedString(String)
* @see org.eclipse.gemoc.example.k3fsm.K3fsmPackage#getFSM_ConsumedString()
* @model annotation="dynamic"
* @model annotation="aspect"
* @generated
*/
String getConsumedString();
......@@ -183,7 +183,7 @@ public interface FSM extends EObject {
* @return the value of the '<em>Produced String</em>' attribute.
* @see #setProducedString(String)
* @see org.eclipse.gemoc.example.k3fsm.K3fsmPackage#getFSM_ProducedString()
* @model annotation="dynamic"
* @model annotation="aspect"
* @generated
*/
String getProducedString();
......
......@@ -450,18 +450,18 @@ public class K3fsmPackageImpl extends EPackageImpl implements K3fsmPackage {
createResource(eNS_URI);
// Create annotations
// dynamic
createDynamicAnnotations();
// aspect
createAspectAnnotations();
}
/**
* Initializes the annotations for <b>dynamic</b>.
* Initializes the annotations for <b>aspect</b>.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected void createDynamicAnnotations() {
String source = "dynamic";
protected void createAspectAnnotations() {
String source = "aspect";
addAnnotation(getFSM_CurrentState(), source, new String[] {});
addAnnotation(getFSM_UnprocessedString(), source, new String[] {});
addAnnotation(getFSM_ConsumedString(), source, new String[] {});
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment