added expression support for after triggers

plugins/org.yakindu.sct.model.stext.edit/src/org/yakindu/sct/model/stext/stext/provider/TimeEventSpecItemProvider.java

@@ -9,6 +9,8 @@ import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 
+import org.eclipse.emf.ecore.EStructuralFeature;
+
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -19,6 +21,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
+import org.yakindu.sct.model.stext.stext.StextFactory;
 import org.yakindu.sct.model.stext.stext.StextPackage;
 import org.yakindu.sct.model.stext.stext.TimeEventSpec;
 import org.yakindu.sct.model.stext.stext.TimeEventType;
@@ -63,7 +66,6 @@ public class TimeEventSpecItemProvider
       super.getPropertyDescriptors(object);
 
       addTypePropertyDescriptor(object);
-      addValuePropertyDescriptor(object);
       addUnitPropertyDescriptor(object);
     }
     return itemPropertyDescriptors;
@@ -93,49 +95,59 @@ public class TimeEventSpecItemProvider
   }
 
   /**
-   * This adds a property descriptor for the Value feature.
+   * This adds a property descriptor for the Unit feature.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    */
-  protected void addValuePropertyDescriptor(Object object)
+  protected void addUnitPropertyDescriptor(Object object)
   {
     itemPropertyDescriptors.add
       (createItemPropertyDescriptor
         (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
          getResourceLocator(),
-         getString("_UI_TimeEventSpec_value_feature"),
-         getString("_UI_PropertyDescriptor_description", "_UI_TimeEventSpec_value_feature", "_UI_TimeEventSpec_type"),
-         StextPackage.Literals.TIME_EVENT_SPEC__VALUE,
+         getString("_UI_TimeEventSpec_unit_feature"),
+         getString("_UI_PropertyDescriptor_description", "_UI_TimeEventSpec_unit_feature", "_UI_TimeEventSpec_type"),
+         StextPackage.Literals.TIME_EVENT_SPEC__UNIT,
          true,
          false,
          false,
-         ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
+         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
          null,
          null));
   }
 
   /**
-   * This adds a property descriptor for the Unit feature.
+   * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+   * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+   * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
    * @generated
    */
-  protected void addUnitPropertyDescriptor(Object object)
+  @Override
+  public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object)
   {
-    itemPropertyDescriptors.add
-      (createItemPropertyDescriptor
-        (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-         getResourceLocator(),
-         getString("_UI_TimeEventSpec_unit_feature"),
-         getString("_UI_PropertyDescriptor_description", "_UI_TimeEventSpec_unit_feature", "_UI_TimeEventSpec_type"),
-         StextPackage.Literals.TIME_EVENT_SPEC__UNIT,
-         true,
-         false,
-         false,
-         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-         null,
-         null));
+    if (childrenFeatures == null)
+    {
+      super.getChildrenFeatures(object);
+      childrenFeatures.add(StextPackage.Literals.TIME_EVENT_SPEC__VALUE);
+    }
+    return childrenFeatures;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  protected EStructuralFeature getChildFeature(Object object, Object child)
+  {
+    // Check the type of the specified child object and return the proper feature to use for
+    // adding (see {@link AddCommand}) it as a child.
+
+    return super.getChildFeature(object, child);
   }
 
   /**
@@ -181,10 +193,12 @@ public class TimeEventSpecItemProvider
     switch (notification.getFeatureID(TimeEventSpec.class))
     {
       case StextPackage.TIME_EVENT_SPEC__TYPE:
-      case StextPackage.TIME_EVENT_SPEC__VALUE:
       case StextPackage.TIME_EVENT_SPEC__UNIT:
         fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
         return;
+      case StextPackage.TIME_EVENT_SPEC__VALUE:
+        fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+        return;
     }
     super.notifyChanged(notification);
   }
@@ -200,6 +214,106 @@ public class TimeEventSpecItemProvider
   protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object)
   {
     super.collectNewChildDescriptors(newChildDescriptors, object);
+
+    newChildDescriptors.add
+      (createChildParameter
+        (StextPackage.Literals.TIME_EVENT_SPEC__VALUE,
+         StextFactory.eINSTANCE.createExpression()));
+
+    newChildDescriptors.add
+      (createChildParameter
+        (StextPackage.Literals.TIME_EVENT_SPEC__VALUE,
+         StextFactory.eINSTANCE.createEventRaisingExpression()));
+
+    newChildDescriptors.add
+      (createChildParameter
+        (StextPackage.Literals.TIME_EVENT_SPEC__VALUE,
+         StextFactory.eINSTANCE.createAssignmentExpression()));
+
+    newChildDescriptors.add
+      (createChildParameter
+        (StextPackage.Literals.TIME_EVENT_SPEC__VALUE,
+         StextFactory.eINSTANCE.createConditionalExpression()));
+
+    newChildDescriptors.add
+      (createChildParameter
+        (StextPackage.Literals.TIME_EVENT_SPEC__VALUE,
+         StextFactory.eINSTANCE.createLogicalOrExpression()));
+
+    newChildDescriptors.add
+      (createChildParameter
+        (StextPackage.Literals.TIME_EVENT_SPEC__VALUE,
+         StextFactory.eINSTANCE.createLogicalAndExpression()));
+
+    newChildDescriptors.add
+      (createChildParameter
+        (StextPackage.Literals.TIME_EVENT_SPEC__VALUE,
+         StextFactory.eINSTANCE.createLogicalNotExpression()));
+
+    newChildDescriptors.add
+      (createChildParameter
+        (StextPackage.Literals.TIME_EVENT_SPEC__VALUE,
+         StextFactory.eINSTANCE.createBitwiseXorExpression()));
+
+    newChildDescriptors.add
+      (createChildParameter
+        (StextPackage.Literals.TIME_EVENT_SPEC__VALUE,
+         StextFactory.eINSTANCE.createBitwiseOrExpression()));
+
+    newChildDescriptors.add
+      (createChildParameter
+        (StextPackage.Literals.TIME_EVENT_SPEC__VALUE,
+         StextFactory.eINSTANCE.createBitwiseAndExpression()));
+
+    newChildDescriptors.add
+      (createChildParameter
+        (StextPackage.Literals.TIME_EVENT_SPEC__VALUE,
+         StextFactory.eINSTANCE.createLogicalRelationExpression()));
+
+    newChildDescriptors.add
+      (createChildParameter
+        (StextPackage.Literals.TIME_EVENT_SPEC__VALUE,
+         StextFactory.eINSTANCE.createShiftExpression()));
+
+    newChildDescriptors.add
+      (createChildParameter
+        (StextPackage.Literals.TIME_EVENT_SPEC__VALUE,
+         StextFactory.eINSTANCE.createNumericalAddSubtractExpression()));
+
+    newChildDescriptors.add
+      (createChildParameter
+        (StextPackage.Literals.TIME_EVENT_SPEC__VALUE,
+         StextFactory.eINSTANCE.createNumericalMultiplyDivideExpression()));
+
+    newChildDescriptors.add
+      (createChildParameter
+        (StextPackage.Literals.TIME_EVENT_SPEC__VALUE,
+         StextFactory.eINSTANCE.createNumericalUnaryExpression()));
+
+    newChildDescriptors.add
+      (createChildParameter
+        (StextPackage.Literals.TIME_EVENT_SPEC__VALUE,
+         StextFactory.eINSTANCE.createPrimitiveValueExpression()));
+
+    newChildDescriptors.add
+      (createChildParameter
+        (StextPackage.Literals.TIME_EVENT_SPEC__VALUE,
+         StextFactory.eINSTANCE.createFeatureCall()));
+
+    newChildDescriptors.add
+      (createChildParameter
+        (StextPackage.Literals.TIME_EVENT_SPEC__VALUE,
+         StextFactory.eINSTANCE.createElementReferenceExpression()));
+
+    newChildDescriptors.add
+      (createChildParameter
+        (StextPackage.Literals.TIME_EVENT_SPEC__VALUE,
+         StextFactory.eINSTANCE.createEventValueReferenceExpression()));
+
+    newChildDescriptors.add
+      (createChildParameter
+        (StextPackage.Literals.TIME_EVENT_SPEC__VALUE,
+         StextFactory.eINSTANCE.createActiveStateReferenceExpression()));
   }
 
 }

plugins/org.yakindu.sct.model.stext.ui/src-gen/org/yakindu/sct/model/stext/ui/contentassist/antlr/internal/InternalSText.g

@@ -5424,7 +5424,7 @@ rule__TimeEventSpec__Group__2__Impl
 :
 (
 { before(grammarAccess.getTimeEventSpecAccess().getUnitAssignment_2()); }
-(rule__TimeEventSpec__UnitAssignment_2)?
+(rule__TimeEventSpec__UnitAssignment_2)
 { after(grammarAccess.getTimeEventSpecAccess().getUnitAssignment_2()); }
 )
 
@@ -10149,8 +10149,8 @@ rule__TimeEventSpec__ValueAssignment_1
     }
 :
 (
-{ before(grammarAccess.getTimeEventSpecAccess().getValueINTTerminalRuleCall_1_0()); }
-	RULE_INT{ after(grammarAccess.getTimeEventSpecAccess().getValueINTTerminalRuleCall_1_0()); }
+{ before(grammarAccess.getTimeEventSpecAccess().getValueConditionalExpressionParserRuleCall_1_0()); }
+	ruleConditionalExpression{ after(grammarAccess.getTimeEventSpecAccess().getValueConditionalExpressionParserRuleCall_1_0()); }
 )
 
 ;

plugins/org.yakindu.sct.model.stext.ui/src-gen/org/yakindu/sct/model/stext/ui/contentassist/antlr/internal/InternalSText.tokens

@@ -1,148 +1,148 @@
-T__68=68
-T__69=69
-RULE_ID=4
-T__66=66
-T__67=67
-T__64=64
-T__29=29
-T__65=65
-T__28=28
-T__62=62
-T__27=27
-T__63=63
-T__26=26
-T__25=25
-T__24=24
-T__23=23
-T__22=22
-RULE_ANY_OTHER=13
-T__21=21
-T__20=20
-RULE_BOOL=6
-T__61=61
-T__60=60
-T__55=55
-T__56=56
-T__19=19
-T__57=57
-RULE_HEX=8
-T__58=58
-T__16=16
-T__51=51
-T__15=15
-T__52=52
-T__18=18
-T__53=53
-T__54=54
-T__17=17
-T__14=14
-T__59=59
-RULE_INT=5
-T__50=50
-T__42=42
-T__43=43
-T__40=40
-T__41=41
-T__80=80
-T__46=46
-T__81=81
-T__47=47
-T__82=82
-T__44=44
-T__45=45
-T__48=48
-T__49=49
-RULE_FLOAT=7
-RULE_SL_COMMENT=11
-RULE_ML_COMMENT=10
-T__30=30
-T__31=31
-RULE_STRING=9
-T__32=32
-T__71=71
-T__33=33
-T__72=72
-T__34=34
-T__35=35
-T__70=70
-T__36=36
-T__37=37
-T__38=38
-T__39=39
-RULE_WS=12
-T__76=76
-T__75=75
-T__74=74
-T__73=73
-T__79=79
-T__78=78
-T__77=77
-'out'=18
-'>='=43
-'internal'=56
-'~'=39
-'/'=37
-'=='=44
-'/='=23
-'%='=24
-'>'=42
-'event'=57
-'||'=73
-'&&'=74
-';'=66
-'raise'=71
-'+'=34
-'active'=80
-'.'=63
-'^'=76
-'>>'=33
-'else'=15
-'^='=30
-'+='=25
-'readonly'=81
-'>>='=28
-'?'=72
-'var'=58
-'&='=29
-'s'=46
-':'=55
-'('=60
-'exit'=68
-'-'=35
-','=62
-'default'=14
-'in'=17
-'-='=26
-']'=65
-'<<='=27
-'ns'=49
-'!'=75
-'|'=77
-'ms'=47
-'every'=20
-'|='=31
-'@@statechart@@'=50
-'@@state@@'=51
-'='=21
-'always'=70
-'oncycle'=69
-')'=61
-'*='=22
-'entry'=67
-'%'=38
-'operation'=59
-'after'=19
-'us'=48
-'namespace'=53
-'<<'=32
-'<='=41
-'valueof'=79
-'!='=45
-'@@transition@@'=52
-'external'=82
-'<'=40
-'['=64
-'*'=36
-'local'=16
-'&'=78
-'interface'=54
+T__68=68
+T__69=69
+RULE_ID=4
+T__66=66
+T__67=67
+T__64=64
+T__29=29
+T__65=65
+T__28=28
+T__62=62
+T__27=27
+T__63=63
+T__26=26
+T__25=25
+T__24=24
+T__23=23
+T__22=22
+RULE_ANY_OTHER=13
+T__21=21
+T__20=20
+RULE_BOOL=5
+T__61=61
+T__60=60
+T__55=55
+T__56=56
+T__19=19
+T__57=57
+RULE_HEX=8
+T__58=58
+T__16=16
+T__51=51
+T__15=15
+T__52=52
+T__18=18
+T__53=53
+T__54=54
+T__17=17
+T__14=14
+T__59=59
+RULE_INT=6
+T__50=50
+T__42=42
+T__43=43
+T__40=40
+T__41=41
+T__80=80
+T__46=46
+T__81=81
+T__47=47
+T__82=82
+T__44=44
+T__45=45
+T__48=48
+T__49=49
+RULE_FLOAT=7
+RULE_SL_COMMENT=11
+RULE_ML_COMMENT=10
+T__30=30
+T__31=31
+RULE_STRING=9
+T__32=32
+T__71=71
+T__33=33
+T__72=72
+T__34=34
+T__35=35
+T__70=70
+T__36=36
+T__37=37
+T__38=38
+T__39=39
+RULE_WS=12
+T__76=76
+T__75=75
+T__74=74
+T__73=73
+T__79=79
+T__78=78
+T__77=77
+'out'=18
+'>='=43
+'internal'=56
+'~'=39
+'/'=37
+'=='=44
+'/='=23
+'%='=24
+'>'=42
+'event'=57
+'||'=73
+'&&'=74
+';'=66
+'raise'=71
+'+'=34
+'active'=80
+'.'=63
+'^'=76
+'>>'=33
+'else'=15
+'^='=30
+'+='=25
+'readonly'=81
+'>>='=28
+'?'=72
+'var'=58
+'&='=29
+'s'=46
+':'=55
+'('=60
+'exit'=68
+'-'=35
+','=62
+'default'=14
+'in'=17
+'-='=26
+']'=65
+'<<='=27
+'ns'=49
+'!'=75
+'|'=77
+'ms'=47
+'every'=20
+'|='=31
+'@@statechart@@'=50
+'@@state@@'=51
+'='=21
+'always'=70
+'oncycle'=69
+')'=61
+'*='=22
+'entry'=67
+'%'=38
+'operation'=59
+'after'=19
+'us'=48
+'namespace'=53
+'<<'=32
+'<='=41
+'valueof'=79
+'!='=45
+'@@transition@@'=52
+'external'=82
+'<'=40
+'['=64
+'*'=36
+'local'=16
+'&'=78
+'interface'=54

test-plugins/org.yakindu.sct.model.stext.test/META-INF/MANIFEST.MF

@@ -1,14 +1,25 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: SText Tests
-Bundle-SymbolicName: org.yakindu.sct.model.stext.test
-Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: YAKINDU
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.xtext.junit4;bundle-version="2.0.1",
- org.yakindu.sct.model.sgraph;bundle-version="1.0.0",
- org.yakindu.sct.model.stext;bundle-version="1.0.0",
- org.junit;bundle-version="4.8.2",
- de.itemis.xtext.utils.jface;bundle-version="1.0.0",
- org.yakindu.sct.model.sgraph.test;bundle-version="1.0.0"
-Export-Package: org.yakindu.sct.model.stext.test.util
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: SText Tests
+Bundle-SymbolicName: org.yakindu.sct.model.stext.test
+Bundle-Version: 1.0.0.qualifier
+Bundle-Vendor: YAKINDU
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Require-Bundle: org.eclipse.xtext.junit4;bundle-version="2.0.1",
+ org.yakindu.sct.model.sgraph;bundle-version="1.0.0",
+ org.yakindu.sct.model.stext;bundle-version="1.0.0",
+ org.junit;bundle-version="4.8.2",
+ de.itemis.xtext.utils.jface;bundle-version="1.0.0",
+ org.yakindu.sct.model.sgraph.test;bundle-version="1.0.0",
+ org.yakindu.sct.model.stext.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.ui.workbench;resolution:=optional
+Export-Package: org.yakindu.sct.model.stext.test,
+ org.yakindu.sct.model.stext.test.util,
+ org.yakindu.sct.model.stext.test
+Import-Package: org.junit.runner;version="4.5.0",
+ org.junit.runner.manipulation;version="4.5.0",
+ org.junit.runner.notification;version="4.5.0",
+ org.junit.runners;version="4.5.0",
+ org.junit.runners.model;version="4.5.0",
+ org.hamcrest.core

test-plugins/org.yakindu.sct.model.stext.test/src-gen/org/yakindu/sct/model/stext/STextInjectorProvider.java

@@ -24,11 +24,15 @@ public class STextInjectorProvider implements IInjectorProvider, IRegistryConfig
 	{
 		if (injector == null) {
 			stateBeforeInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
-			this.injector = new STextStandaloneSetup().createInjectorAndDoEMFRegistration();
+			this.injector = internalCreateInjector();
 			stateAfterInjectorCreation = GlobalRegistries.makeCopyOfGlobalState();
 		}
 		return injector;
 	}
+	
+	protected Injector internalCreateInjector() {
+	    return new STextStandaloneSetup().createInjectorAndDoEMFRegistration();
+	}
 
 	public void restoreRegistry() {
 		stateBeforeInjectorCreation.restoreGlobalState();

test-plugins/org.yakindu.sct.model.stext.test/src/org/yakindu/sct/model/stext/test/util/StextTestFactory.java

@@ -156,7 +156,7 @@ public class StextTestFactory extends StextFactoryImpl {
 	}
 
 	public static TimeEventSpec _createTimeEventSpec(TimeEventType type,
-			int value, TimeUnit unit, ReactionTrigger rt) {
+			Expression value, TimeUnit unit, ReactionTrigger rt) {
 		TimeEventSpec timeTrigger = StextFactory.eINSTANCE
 				.createTimeEventSpec();
 		timeTrigger.setType(type);
@@ -189,7 +189,7 @@ public class StextTestFactory extends StextFactoryImpl {
 	}
 
 	public static LocalReaction _createTimeTriggeredReaction(State parent,
-			TimeEventType type, int value, TimeUnit unit) {
+			TimeEventType type, Expression value, TimeUnit unit) {
 		// TimeEventSpec timeTrigger =
 		// StextFactory.eINSTANCE.createTimeEventSpec();
 		// timeTrigger.setType(type);