Renamed EnterEvent class to EntryEvent

plugins/org.yakindu.sct.model.stext.ui/plugin.xml_gen

@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<plugin>
+
+    <extension
+            point="org.eclipse.ui.editors">
+        <editor
+            class="org.yakindu.sct.model.stext.ui.STextExecutableExtensionFactory:org.eclipse.xtext.ui.editor.XtextEditor"
+            contributorClass="org.eclipse.ui.editors.text.TextEditorActionContributor"
+            default="true"
+            extensions="exp"
+            id="org.yakindu.sct.model.stext.SText"
+            name="SText Editor">
+        </editor>
+    </extension>
+    <extension
+        point="org.eclipse.ui.handlers">
+        <handler
+            class="org.yakindu.sct.model.stext.ui.STextExecutableExtensionFactory:org.eclipse.xtext.ui.editor.hyperlinking.OpenDeclarationHandler"
+            commandId="org.eclipse.xtext.ui.editor.hyperlinking.OpenDeclaration">
+            <activeWhen>
+                <reference
+                    definitionId="org.yakindu.sct.model.stext.SText.Editor.opened">
+                </reference>
+            </activeWhen>
+        </handler>
+        <handler
+            class="org.yakindu.sct.model.stext.ui.STextExecutableExtensionFactory:org.eclipse.xtext.ui.editor.handler.ValidateActionHandler"
+            commandId="org.yakindu.sct.model.stext.SText.validate">
+         <activeWhen>
+            <reference
+                    definitionId="org.yakindu.sct.model.stext.SText.Editor.opened">
+            </reference>
+         </activeWhen>
+      </handler>
+    </extension>
+    <extension point="org.eclipse.core.expressions.definitions">
+        <definition id="org.yakindu.sct.model.stext.SText.Editor.opened">
+            <and>
+                <reference definitionId="isActiveEditorAnInstanceOfXtextEditor"/>
+                <with variable="activeEditor">
+                    <test property="org.eclipse.xtext.ui.editor.XtextEditor.languageName" 
+                        value="org.yakindu.sct.model.stext.SText" 
+                        forcePluginActivation="true"/>
+                </with>        
+            </and>
+        </definition>
+    </extension>
+    <extension
+            point="org.eclipse.ui.preferencePages">
+        <page
+            class="org.yakindu.sct.model.stext.ui.STextExecutableExtensionFactory:org.eclipse.xtext.ui.editor.preferences.LanguageRootPreferencePage"
+            id="org.yakindu.sct.model.stext.SText"
+            name="SText">
+            <keywordReference id="org.yakindu.sct.model.stext.ui.keyword_SText"/>
+        </page>
+        <page
+            category="org.yakindu.sct.model.stext.SText"
+            class="org.yakindu.sct.model.stext.ui.STextExecutableExtensionFactory:org.eclipse.xtext.ui.editor.syntaxcoloring.SyntaxColoringPreferencePage"
+            id="org.yakindu.sct.model.stext.SText.coloring"
+            name="Syntax Coloring">
+            <keywordReference id="org.yakindu.sct.model.stext.ui.keyword_SText"/>
+        </page>
+        <page
+            category="org.yakindu.sct.model.stext.SText"
+            class="org.yakindu.sct.model.stext.ui.STextExecutableExtensionFactory:org.eclipse.xtext.ui.editor.templates.XtextTemplatePreferencePage"
+            id="org.yakindu.sct.model.stext.SText.templates"
+            name="Templates">
+            <keywordReference id="org.yakindu.sct.model.stext.ui.keyword_SText"/>
+        </page>
+    </extension>
+    <extension
+        point="org.eclipse.ui.keywords">
+        <keyword
+            id="org.yakindu.sct.model.stext.ui.keyword_SText"
+            label="SText"/>
+    </extension>
+    <extension
+         point="org.eclipse.ui.commands">
+      <command
+            description="Trigger expensive validation"
+            id="org.yakindu.sct.model.stext.SText.validate"
+            name="Validate">
+      </command>
+    </extension>
+    <extension point="org.eclipse.ui.menus">
+        <menuContribution
+            locationURI="popup:#TextEditorContext?after=group.edit">
+             <command
+                 commandId="org.yakindu.sct.model.stext.SText.validate"
+                 style="push"
+                 tooltip="Trigger expensive validation">
+            <visibleWhen checkEnabled="false">
+                <reference
+                    definitionId="org.yakindu.sct.model.stext.SText.Editor.opened">
+                </reference>
+            </visibleWhen>
+         </command>  
+         </menuContribution>
+    </extension>
+    <extension point="org.eclipse.ui.menus">
+		<menuContribution locationURI="popup:#TextEditorContext?endof=group.find">
+			<command commandId="org.eclipse.xtext.ui.editor.FindReferences">
+				<visibleWhen checkEnabled="false">
+                	<reference definitionId="org.yakindu.sct.model.stext.SText.Editor.opened">
+                	</reference>
+            	</visibleWhen>
+			</command>
+		</menuContribution>
+	</extension>
+	<extension point="org.eclipse.ui.handlers">
+	    <handler
+            class="org.yakindu.sct.model.stext.ui.STextExecutableExtensionFactory:org.eclipse.xtext.ui.editor.findrefs.FindReferencesHandler"
+            commandId="org.eclipse.xtext.ui.editor.FindReferences">
+            <activeWhen>
+                <reference
+                    definitionId="org.yakindu.sct.model.stext.SText.Editor.opened">
+                </reference>
+            </activeWhen>
+        </handler>
+    </extension>   
+
+<!-- adding resource factories -->
+
+	<extension
+		point="org.eclipse.emf.ecore.extension_parser">
+		<parser
+			class="org.yakindu.sct.model.stext.ui.STextExecutableExtensionFactory:org.eclipse.xtext.resource.IResourceFactory"
+			type="exp">
+		</parser>
+	</extension>
+	<extension point="org.eclipse.xtext.extension_resourceServiceProvider">
+        <resourceServiceProvider
+            class="org.yakindu.sct.model.stext.ui.STextExecutableExtensionFactory:org.eclipse.xtext.ui.resource.IResourceUIServiceProvider"
+            uriExtension="exp">
+        </resourceServiceProvider>
+    </extension>
+
+
+
+	<!-- Quick Outline -->
+	<extension
+		point="org.eclipse.ui.handlers">
+		<handler 
+			class="org.yakindu.sct.model.stext.ui.STextExecutableExtensionFactory:org.eclipse.xtext.ui.editor.outline.quickoutline.ShowQuickOutlineActionHandler"
+			commandId="org.eclipse.xtext.ui.editor.outline.QuickOutline">
+			<activeWhen>
+				<reference
+					definitionId="org.yakindu.sct.model.stext.SText.Editor.opened">
+				</reference>
+			</activeWhen>
+		</handler>
+	</extension>
+	<extension
+		point="org.eclipse.ui.commands">
+		<command
+			description="Open the quick outline."
+			id="org.eclipse.xtext.ui.editor.outline.QuickOutline"
+			name="Quick Outline">
+		</command>
+	</extension>
+	<extension point="org.eclipse.ui.menus">
+		<menuContribution
+			locationURI="popup:#TextEditorContext?after=group.open">
+			<command commandId="org.eclipse.xtext.ui.editor.outline.QuickOutline"
+				style="push"
+				tooltip="Open Quick Outline">
+				<visibleWhen checkEnabled="false">
+					<reference definitionId="org.yakindu.sct.model.stext.SText.Editor.opened"/>
+				</visibleWhen>
+			</command>
+		</menuContribution>
+	</extension>
+   <!-- quickfix marker resolution generator -->
+   <extension
+         point="org.eclipse.ui.ide.markerResolution">
+      <markerResolutionGenerator
+            class="org.yakindu.sct.model.stext.ui.STextExecutableExtensionFactory:org.eclipse.xtext.ui.editor.quickfix.MarkerResolutionGenerator">
+      </markerResolutionGenerator>
+   </extension>
+   	<!-- Rename Refactoring -->
+	<extension point="org.eclipse.ui.handlers">
+		<handler 
+			class="org.yakindu.sct.model.stext.ui.STextExecutableExtensionFactory:org.eclipse.xtext.ui.refactoring.ui.RenameElementHandler"
+			commandId="org.eclipse.xtext.ui.refactoring.RenameElement">
+			<activeWhen>
+				<reference
+					definitionId="org.yakindu.sct.model.stext.SText.Editor.opened">
+				</reference>
+			</activeWhen>
+		</handler>
+	</extension>
+    <extension point="org.eclipse.ui.menus">
+         <menuContribution
+            locationURI="popup:#TextEditorContext?after=group.edit">
+         <command commandId="org.eclipse.xtext.ui.refactoring.RenameElement"
+               style="push">
+            <visibleWhen checkEnabled="false">
+               <reference
+                     definitionId="org.yakindu.sct.model.stext.SText.Editor.opened">
+               </reference>
+            </visibleWhen>
+         </command>
+      </menuContribution>
+   </extension>
+
+
+</plugin>

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

@@ -5539,11 +5539,11 @@ rule__EntryEvent__Group__0__Impl
     }
 :
 (
-{ before(grammarAccess.getEntryEventAccess().getEnterEventAction_0()); }
+{ before(grammarAccess.getEntryEventAccess().getEntryEventAction_0()); }
 (
 
 )
-{ after(grammarAccess.getEntryEventAccess().getEnterEventAction_0()); }
+{ after(grammarAccess.getEntryEventAccess().getEntryEventAction_0()); }
 )
 
 ;

plugins/org.yakindu.sct.model.stext.ui/src-gen/org/yakindu/sct/model/stext/ui/contentassist/antlr/internal/InternalSTextParser.java

@@ -15243,13 +15243,13 @@ public class InternalSTextParser extends AbstractInternalContentAssistParser {
             // ../org.yakindu.sct.model.stext.ui/src-gen/org/yakindu/sct/model/stext/ui/contentassist/antlr/internal/InternalSText.g:5541:1: ( () )
             // ../org.yakindu.sct.model.stext.ui/src-gen/org/yakindu/sct/model/stext/ui/contentassist/antlr/internal/InternalSText.g:5542:1: ()
             {
-             before(grammarAccess.getEntryEventAccess().getEnterEventAction_0()); 
+             before(grammarAccess.getEntryEventAccess().getEntryEventAction_0()); 
             // ../org.yakindu.sct.model.stext.ui/src-gen/org/yakindu/sct/model/stext/ui/contentassist/antlr/internal/InternalSText.g:5543:1: ()
             // ../org.yakindu.sct.model.stext.ui/src-gen/org/yakindu/sct/model/stext/ui/contentassist/antlr/internal/InternalSText.g:5545:1: 
             {
             }
 
-             after(grammarAccess.getEntryEventAccess().getEnterEventAction_0()); 
+             after(grammarAccess.getEntryEventAccess().getEntryEventAction_0()); 
 
             }
 

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

@@ -34,4 +34,3 @@ Export-Package: org.yakindu.sct.model.stext,
  org.yakindu.sct.model.stext.parser.antlr,
  org.yakindu.sct.model.stext.parser.antlr.internal,
  org.yakindu.sct.model.stext.validation
-

plugins/org.yakindu.sct.model.stext/plugin.xml_gen

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<plugin>
+
+  <extension point="org.eclipse.emf.ecore.generated_package">
+    <package 
+       uri = "http://www.yakindu.org/sct/statechart/SText" 
+       class = "org.yakindu.sct.model.stext.stext.StextPackage"
+       genModel = "org/yakindu/sct/model/stext/SText.genmodel" /> 
+	
+  </extension>
+
+
+
+
+
+</plugin>

plugins/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/SText.ecore

@@ -166,7 +166,6 @@
         eType="ecore:EClass platform:/resource/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/SText.ecore#//Statement"
         containment="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="EnterEvent" eSuperTypes="platform:/resource/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/SText.ecore#//EntryEvent"/>
   <eClassifiers xsi:type="ecore:EClass" name="LogicalOrExpression" eSuperTypes="platform:/resource/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/SText.ecore#//Expression">
     <eStructuralFeatures xsi:type="ecore:EReference" name="leftOperand" eType="ecore:EClass platform:/resource/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/SText.ecore#//Expression"
         containment="true"/>

plugins/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/SText.genmodel

@@ -147,7 +147,6 @@
     <genClasses ecoreClass="platform:/resource/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/SText.ecore#//ReactionEffect">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference platform:/resource/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/SText.ecore#//ReactionEffect/actions"/>
     </genClasses>
-    <genClasses ecoreClass="platform:/resource/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/SText.ecore#//EnterEvent"/>
     <genClasses ecoreClass="platform:/resource/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/SText.ecore#//LogicalOrExpression">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference platform:/resource/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/SText.ecore#//LogicalOrExpression/leftOperand"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference platform:/resource/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/SText.ecore#//LogicalOrExpression/rightOperand"/>

plugins/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/SText.xmi

@@ -574,7 +574,7 @@
       <alternatives xsi:type="xtext:Group">
         <elements xsi:type="xtext:Action">
           <type metamodel="/0/@metamodelDeclarations.0">
-            <classifier xsi:type="ecore:EClass" href="http://www.yakindu.org/sct/statechart/SText#//EnterEvent"/>
+            <classifier xsi:type="ecore:EClass" href="http://www.yakindu.org/sct/statechart/SText#//EntryEvent"/>
           </type>
         </elements>
         <elements xsi:type="xtext:Keyword" value="entry"/>

plugins/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/parseTreeConstruction/STextParsetreeConstructor.java

@@ -5163,7 +5163,7 @@ protected class EventSpec_Alternatives extends AlternativesToken {
     @Override
 	public IEObjectConsumer tryConsume() {
 		if(getEObject().eClass() != grammarAccess.getAlwaysEventAccess().getAlwaysEventAction_0().getType().getClassifier() && 
-		   getEObject().eClass() != grammarAccess.getEntryEventAccess().getEnterEventAction_0().getType().getClassifier() && 
+		   getEObject().eClass() != grammarAccess.getEntryEventAccess().getEntryEventAction_0().getType().getClassifier() && 
 		   getEObject().eClass() != grammarAccess.getExitEventAccess().getExitEventAction_0().getType().getClassifier() && 
 		   getEObject().eClass() != grammarAccess.getOnCycleEventAccess().getOnCycleEventAction_0().getType().getClassifier() && 
 		   getEObject().eClass() != grammarAccess.getRegularEventSpecRule().getType().getClassifier() && 
@@ -5269,7 +5269,7 @@ protected class EventSpec_BuiltinEventSpecParserRuleCall_2 extends RuleCallToken
     @Override
 	public IEObjectConsumer tryConsume() {
 		if(getEObject().eClass() != grammarAccess.getAlwaysEventAccess().getAlwaysEventAction_0().getType().getClassifier() && 
-		   getEObject().eClass() != grammarAccess.getEntryEventAccess().getEnterEventAction_0().getType().getClassifier() && 
+		   getEObject().eClass() != grammarAccess.getEntryEventAccess().getEntryEventAction_0().getType().getClassifier() && 
 		   getEObject().eClass() != grammarAccess.getExitEventAccess().getExitEventAction_0().getType().getClassifier() && 
 		   getEObject().eClass() != grammarAccess.getOnCycleEventAccess().getOnCycleEventAction_0().getType().getClassifier())
 			return null;
@@ -5502,7 +5502,7 @@ protected class BuiltinEventSpec_Alternatives extends AlternativesToken {
     @Override
 	public IEObjectConsumer tryConsume() {
 		if(getEObject().eClass() != grammarAccess.getAlwaysEventAccess().getAlwaysEventAction_0().getType().getClassifier() && 
-		   getEObject().eClass() != grammarAccess.getEntryEventAccess().getEnterEventAction_0().getType().getClassifier() && 
+		   getEObject().eClass() != grammarAccess.getEntryEventAccess().getEntryEventAction_0().getType().getClassifier() && 
 		   getEObject().eClass() != grammarAccess.getExitEventAccess().getExitEventAction_0().getType().getClassifier() && 
 		   getEObject().eClass() != grammarAccess.getOnCycleEventAccess().getOnCycleEventAction_0().getType().getClassifier())
 			return null;
@@ -5533,7 +5533,7 @@ protected class BuiltinEventSpec_EntryEventParserRuleCall_0 extends RuleCallToke
 
     @Override
 	public IEObjectConsumer tryConsume() {
-		if(getEObject().eClass() != grammarAccess.getEntryEventAccess().getEnterEventAction_0().getType().getClassifier())
+		if(getEObject().eClass() != grammarAccess.getEntryEventAccess().getEntryEventAction_0().getType().getClassifier())
 			return null;
 		if(checkForRecursion(EntryEvent_Group.class, eObjectConsumer)) return null;
 		return eObjectConsumer;
@@ -5662,11 +5662,11 @@ protected class BuiltinEventSpec_AlwaysEventParserRuleCall_3 extends RuleCallTok
 /************ begin Rule EntryEvent ****************
  *
  * EntryEvent:
- * 	{EnterEvent} "entry";
+ * 	{EntryEvent} "entry";
  *
  **/
 
-// {EnterEvent} "entry"
+// {EntryEvent} "entry"
 protected class EntryEvent_Group extends GroupToken {
 	
 	public EntryEvent_Group(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
@@ -5688,23 +5688,23 @@ protected class EntryEvent_Group extends GroupToken {
 
     @Override
 	public IEObjectConsumer tryConsume() {
-		if(getEObject().eClass() != grammarAccess.getEntryEventAccess().getEnterEventAction_0().getType().getClassifier())
+		if(getEObject().eClass() != grammarAccess.getEntryEventAccess().getEntryEventAction_0().getType().getClassifier())
 			return null;
 		return eObjectConsumer;
 	}
 
 }
 
-// {EnterEvent}
-protected class EntryEvent_EnterEventAction_0 extends ActionToken  {
+// {EntryEvent}
+protected class EntryEvent_EntryEventAction_0 extends ActionToken  {
 
-	public EntryEvent_EnterEventAction_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
+	public EntryEvent_EntryEventAction_0(AbstractToken lastRuleCallOrigin, AbstractToken next, int transitionIndex, IEObjectConsumer eObjectConsumer) {
 		super(lastRuleCallOrigin, next, transitionIndex, eObjectConsumer);
 	}
 	
 	@Override
 	public Action getGrammarElement() {
-		return grammarAccess.getEntryEventAccess().getEnterEventAction_0();
+		return grammarAccess.getEntryEventAccess().getEntryEventAction_0();
 	}
 
     @Override
@@ -5736,7 +5736,7 @@ protected class EntryEvent_EntryKeyword_1 extends KeywordToken  {
     @Override
 	public AbstractToken createFollower(int index, IEObjectConsumer inst) {
 		switch(index) {
-			case 0: return new EntryEvent_EnterEventAction_0(lastRuleCallOrigin, this, 0, inst);
+			case 0: return new EntryEvent_EntryEventAction_0(lastRuleCallOrigin, this, 0, inst);
 			default: return null;
 		}	
 	}

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

@@ -2046,7 +2046,7 @@ ruleEntryEvent returns [EObject current=null]
 ((
     {
         $current = forceCreateModelElement(
-            grammarAccess.getEntryEventAccess().getEnterEventAction_0(),
+            grammarAccess.getEntryEventAccess().getEntryEventAction_0(),
             $current);
     }
 )	otherlv_1='entry' 

plugins/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/parser/antlr/internal/InternalSTextParser.java

@@ -5362,7 +5362,7 @@ public class InternalSTextParser extends AbstractInternalAntlrParser {
             {
 
                     current = forceCreateModelElement(
-                        grammarAccess.getEntryEventAccess().getEnterEventAction_0(),
+                        grammarAccess.getEntryEventAccess().getEntryEventAction_0(),
                         current);
                 
 

plugins/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/services/STextGrammarAccess.java

@@ -1165,18 +1165,18 @@ public class STextGrammarAccess extends AbstractGrammarElementFinder {
 	public class EntryEventElements extends AbstractParserRuleElementFinder {
 		private final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), "EntryEvent");
 		private final Group cGroup = (Group)rule.eContents().get(1);
-		private final Action cEnterEventAction_0 = (Action)cGroup.eContents().get(0);
+		private final Action cEntryEventAction_0 = (Action)cGroup.eContents().get(0);
 		private final Keyword cEntryKeyword_1 = (Keyword)cGroup.eContents().get(1);
 		
 		//EntryEvent:
-		//	{EnterEvent} "entry";
+		//	{EntryEvent} "entry";
 		public ParserRule getRule() { return rule; }
 
-		//{EnterEvent} "entry"
+		//{EntryEvent} "entry"
 		public Group getGroup() { return cGroup; }
 
-		//{EnterEvent}
-		public Action getEnterEventAction_0() { return cEnterEventAction_0; }
+		//{EntryEvent}
+		public Action getEntryEventAction_0() { return cEntryEventAction_0; }
 
 		//"entry"
 		public Keyword getEntryKeyword_1() { return cEntryKeyword_1; }
@@ -2599,7 +2599,7 @@ public class STextGrammarAccess extends AbstractGrammarElementFinder {
 	}
 
 	//EntryEvent:
-	//	{EnterEvent} "entry";
+	//	{EntryEvent} "entry";
 	public EntryEventElements getEntryEventAccess() {
 		return (pEntryEvent != null) ? pEntryEvent : (pEntryEvent = new EntryEventElements());
 	}

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

@@ -395,15 +395,6 @@ public interface StextFactory extends EFactory
    */
   ReactionEffect createReactionEffect();
 
-  /**
-   * Returns a new object of class '<em>Enter Event</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Enter Event</em>'.
-   * @generated
-   */
-  EnterEvent createEnterEvent();
-
   /**
    * Returns a new object of class '<em>Logical Or Expression</em>'.
    * <!-- begin-user-doc -->

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

@@ -1364,25 +1364,6 @@ public interface StextPackage extends EPackage
    */
   int REACTION_EFFECT_FEATURE_COUNT = SGraphPackage.EFFECT_FEATURE_COUNT + 1;
 
-  /**
-   * The meta object id for the '{@link org.yakindu.sct.model.stext.stext.impl.EnterEventImpl <em>Enter Event</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.yakindu.sct.model.stext.stext.impl.EnterEventImpl
-   * @see org.yakindu.sct.model.stext.stext.impl.StextPackageImpl#getEnterEvent()
-   * @generated
-   */
-  int ENTER_EVENT = 41;
-
-  /**
-   * The number of structural features of the '<em>Enter Event</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ENTER_EVENT_FEATURE_COUNT = ENTRY_EVENT_FEATURE_COUNT + 0;
-
   /**
    * The meta object id for the '{@link org.yakindu.sct.model.stext.stext.impl.LogicalOrExpressionImpl <em>Logical Or Expression</em>}' class.
    * <!-- begin-user-doc -->
@@ -1391,7 +1372,7 @@ public interface StextPackage extends EPackage
    * @see org.yakindu.sct.model.stext.stext.impl.StextPackageImpl#getLogicalOrExpression()
    * @generated
    */
-  int LOGICAL_OR_EXPRESSION = 42;
+  int LOGICAL_OR_EXPRESSION = 41;
 
   /**
    * The feature id for the '<em><b>Left Operand</b></em>' containment reference.
@@ -1428,7 +1409,7 @@ public interface StextPackage extends EPackage
    * @see org.yakindu.sct.model.stext.stext.impl.StextPackageImpl#getLogicalAndExpression()
    * @generated
    */
-  int LOGICAL_AND_EXPRESSION = 43;
+  int LOGICAL_AND_EXPRESSION = 42;
 
   /**
    * The feature id for the '<em><b>Left Operand</b></em>' containment reference.
@@ -1465,7 +1446,7 @@ public interface StextPackage extends EPackage
    * @see org.yakindu.sct.model.stext.stext.impl.StextPackageImpl#getLogicalNotExpression()
    * @generated
    */
-  int LOGICAL_NOT_EXPRESSION = 44;
+  int LOGICAL_NOT_EXPRESSION = 43;
 
   /**
    * The feature id for the '<em><b>Operand</b></em>' containment reference.
@@ -1493,7 +1474,7 @@ public interface StextPackage extends EPackage
    * @see org.yakindu.sct.model.stext.stext.impl.StextPackageImpl#getLogicalRelationExpression()
    * @generated
    */
-  int LOGICAL_RELATION_EXPRESSION = 45;
+  int LOGICAL_RELATION_EXPRESSION = 44;
 
   /**
    * The feature id for the '<em><b>Left Operand</b></em>' containment reference.
@@ -1539,7 +1520,7 @@ public interface StextPackage extends EPackage
    * @see org.yakindu.sct.model.stext.stext.impl.StextPackageImpl#getNumericalAddSubtractExpression()
    * @generated
    */
-  int NUMERICAL_ADD_SUBTRACT_EXPRESSION = 46;
+  int NUMERICAL_ADD_SUBTRACT_EXPRESSION = 45;
 
   /**
    * The feature id for the '<em><b>Left Operand</b></em>' containment reference.
@@ -1585,7 +1566,7 @@ public interface StextPackage extends EPackage
    * @see org.yakindu.sct.model.stext.stext.impl.StextPackageImpl#getNumericalMultiplyDivideExpression()
    * @generated
    */
-  int NUMERICAL_MULTIPLY_DIVIDE_EXPRESSION = 47;
+  int NUMERICAL_MULTIPLY_DIVIDE_EXPRESSION = 46;
 
   /**
    * The feature id for the '<em><b>Left Operand</b></em>' containment reference.
@@ -1631,7 +1612,7 @@ public interface StextPackage extends EPackage
    * @see org.yakindu.sct.model.stext.stext.impl.StextPackageImpl#getNumericalUnaryExpression()
    * @generated
    */
-  int NUMERICAL_UNARY_EXPRESSION = 48;
+  int NUMERICAL_UNARY_EXPRESSION = 47;
 
   /**
    * The feature id for the '<em><b>Operator</b></em>' attribute.
@@ -1668,7 +1649,7 @@ public interface StextPackage extends EPackage
    * @see org.yakindu.sct.model.stext.stext.impl.StextPackageImpl#getPrimitiveValueExpression()
    * @generated
    */
-  int PRIMITIVE_VALUE_EXPRESSION = 49;
+  int PRIMITIVE_VALUE_EXPRESSION = 48;
 
   /**
    * The feature id for the '<em><b>Value</b></em>' attribute.
@@ -1696,7 +1677,7 @@ public interface StextPackage extends EPackage
    * @see org.yakindu.sct.model.stext.stext.impl.StextPackageImpl#getElementReferenceExpression()
    * @generated
    */
-  int ELEMENT_REFERENCE_EXPRESSION = 50;
+  int ELEMENT_REFERENCE_EXPRESSION = 49;
 
   /**
    * The feature id for the '<em><b>Value</b></em>' reference.
@@ -1724,7 +1705,7 @@ public interface StextPackage extends EPackage
    * @see org.yakindu.sct.model.stext.stext.impl.StextPackageImpl#getOperationCall()
    * @generated
    */
-  int OPERATION_CALL = 51;
+  int OPERATION_CALL = 50;
 
   /**
    * The feature id for the '<em><b>Operation</b></em>' reference.
@@ -1761,7 +1742,7 @@ public interface StextPackage extends EPackage
    * @see org.yakindu.sct.model.stext.stext.impl.StextPackageImpl#getDirection()
    * @generated
    */
-  int DIRECTION = 52;
+  int DIRECTION = 51;
 
   /**
    * The meta object id for the '{@link org.yakindu.sct.model.stext.stext.AdditiveOperator <em>Additive Operator</em>}' enum.
@@ -1771,7 +1752,7 @@ public interface StextPackage extends EPackage
    * @see org.yakindu.sct.model.stext.stext.impl.StextPackageImpl#getAdditiveOperator()
    * @generated
    */
-  int ADDITIVE_OPERATOR = 53;
+  int ADDITIVE_OPERATOR = 52;
 
   /**
    * The meta object id for the '{@link org.yakindu.sct.model.stext.stext.MultiplicativeOperator <em>Multiplicative Operator</em>}' enum.
@@ -1781,7 +1762,7 @@ public interface StextPackage extends EPackage
    * @see org.yakindu.sct.model.stext.stext.impl.StextPackageImpl#getMultiplicativeOperator()
    * @generated
    */
-  int MULTIPLICATIVE_OPERATOR = 54;
+  int MULTIPLICATIVE_OPERATOR = 53;
 
   /**
    * The meta object id for the '{@link org.yakindu.sct.model.stext.stext.UnaryOperator <em>Unary Operator</em>}' enum.
@@ -1791,7 +1772,7 @@ public interface StextPackage extends EPackage
    * @see org.yakindu.sct.model.stext.stext.impl.StextPackageImpl#getUnaryOperator()
    * @generated
    */
-  int UNARY_OPERATOR = 55;
+  int UNARY_OPERATOR = 54;
 
   /**
    * The meta object id for the '{@link org.yakindu.sct.model.stext.stext.RelationalOperator <em>Relational Operator</em>}' enum.
@@ -1801,7 +1782,7 @@ public interface StextPackage extends EPackage
    * @see org.yakindu.sct.model.stext.stext.impl.StextPackageImpl#getRelationalOperator()
    * @generated
    */
-  int RELATIONAL_OPERATOR = 56;
+  int RELATIONAL_OPERATOR = 55;
 
   /**
    * The meta object id for the '{@link org.yakindu.sct.model.stext.stext.TimeUnit <em>Time Unit</em>}' enum.
@@ -1811,7 +1792,7 @@ public interface StextPackage extends EPackage
    * @see org.yakindu.sct.model.stext.stext.impl.StextPackageImpl#getTimeUnit()
    * @generated
    */
-  int TIME_UNIT = 57;
+  int TIME_UNIT = 56;
 
   /**
    * The meta object id for the '{@link org.yakindu.sct.model.stext.stext.Type <em>Type</em>}' enum.
@@ -1821,7 +1802,7 @@ public interface StextPackage extends EPackage
    * @see org.yakindu.sct.model.stext.stext.impl.StextPackageImpl#getType()
    * @generated
    */
-  int TYPE = 58;
+  int TYPE = 57;
 
 
   /**
@@ -2630,16 +2611,6 @@ public interface StextPackage extends EPackage
    */
   EReference getReactionEffect_Actions();
 
-  /**
-   * Returns the meta object for class '{@link org.yakindu.sct.model.stext.stext.EnterEvent <em>Enter Event</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Enter Event</em>'.
-   * @see org.yakindu.sct.model.stext.stext.EnterEvent
-   * @generated
-   */
-  EClass getEnterEvent();
-
   /**
    * Returns the meta object for class '{@link org.yakindu.sct.model.stext.stext.LogicalOrExpression <em>Logical Or Expression</em>}'.
    * <!-- begin-user-doc -->
@@ -3751,16 +3722,6 @@ public interface StextPackage extends EPackage
      */
     EReference REACTION_EFFECT__ACTIONS = eINSTANCE.getReactionEffect_Actions();
 
-    /**
-     * The meta object literal for the '{@link org.yakindu.sct.model.stext.stext.impl.EnterEventImpl <em>Enter Event</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.yakindu.sct.model.stext.stext.impl.EnterEventImpl
-     * @see org.yakindu.sct.model.stext.stext.impl.StextPackageImpl#getEnterEvent()
-     * @generated
-     */
-    EClass ENTER_EVENT = eINSTANCE.getEnterEvent();
-
     /**
      * The meta object literal for the '{@link org.yakindu.sct.model.stext.stext.impl.LogicalOrExpressionImpl <em>Logical Or Expression</em>}' class.
      * <!-- begin-user-doc -->

plugins/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/stext/impl/StextFactoryImpl.java

@@ -110,7 +110,6 @@ public class StextFactoryImpl extends EFactoryImpl implements StextFactory
       case StextPackage.EXITPOINT: return createExitpoint();
       case StextPackage.REACTION_TRIGGER: return createReactionTrigger();
       case StextPackage.REACTION_EFFECT: return createReactionEffect();
-      case StextPackage.ENTER_EVENT: return createEnterEvent();
       case StextPackage.LOGICAL_OR_EXPRESSION: return createLogicalOrExpression();
       case StextPackage.LOGICAL_AND_EXPRESSION: return createLogicalAndExpression();
       case StextPackage.LOGICAL_NOT_EXPRESSION: return createLogicalNotExpression();
@@ -635,17 +634,6 @@ public class StextFactoryImpl extends EFactoryImpl implements StextFactory
     return reactionEffect;
   }
 
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EnterEvent createEnterEvent()
-  {
-    EnterEventImpl enterEvent = new EnterEventImpl();
-    return enterEvent;
-  }
-
   /**
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->

plugins/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/stext/impl/StextPackageImpl.java

@@ -24,7 +24,6 @@ import org.yakindu.sct.model.stext.stext.Clock;
 import org.yakindu.sct.model.stext.stext.DefRoot;
 import org.yakindu.sct.model.stext.stext.Direction;
 import org.yakindu.sct.model.stext.stext.ElementReferenceExpression;
-import org.yakindu.sct.model.stext.stext.EnterEvent;
 import org.yakindu.sct.model.stext.stext.EntryEvent;
 import org.yakindu.sct.model.stext.stext.EntryPointSpec;
 import org.yakindu.sct.model.stext.stext.Entrypoint;
@@ -373,13 +372,6 @@ public class StextPackageImpl extends EPackageImpl implements StextPackage
    */
   private EClass reactionEffectEClass = null;
 
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass enterEventEClass = null;
-
   /**
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
@@ -1335,16 +1327,6 @@ public class StextPackageImpl extends EPackageImpl implements StextPackage
     return (EReference)reactionEffectEClass.getEStructuralFeatures().get(0);
   }
 
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getEnterEvent()
-  {
-    return enterEventEClass;
-  }
-
   /**
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
@@ -1863,8 +1845,6 @@ public class StextPackageImpl extends EPackageImpl implements StextPackage
     reactionEffectEClass = createEClass(REACTION_EFFECT);
     createEReference(reactionEffectEClass, REACTION_EFFECT__ACTIONS);
 
-    enterEventEClass = createEClass(ENTER_EVENT);
-
     logicalOrExpressionEClass = createEClass(LOGICAL_OR_EXPRESSION);
     createEReference(logicalOrExpressionEClass, LOGICAL_OR_EXPRESSION__LEFT_OPERAND);
     createEReference(logicalOrExpressionEClass, LOGICAL_OR_EXPRESSION__RIGHT_OPERAND);
@@ -1978,7 +1958,6 @@ public class StextPackageImpl extends EPackageImpl implements StextPackage
     exitpointEClass.getESuperTypes().add(theSGraphPackage.getDeclaration());
     reactionTriggerEClass.getESuperTypes().add(theSGraphPackage.getTrigger());
     reactionEffectEClass.getESuperTypes().add(theSGraphPackage.getEffect());
-    enterEventEClass.getESuperTypes().add(this.getEntryEvent());
     logicalOrExpressionEClass.getESuperTypes().add(this.getExpression());
     logicalAndExpressionEClass.getESuperTypes().add(this.getExpression());
     logicalNotExpressionEClass.getESuperTypes().add(this.getExpression());
@@ -2109,8 +2088,6 @@ public class StextPackageImpl extends EPackageImpl implements StextPackage
     initEClass(reactionEffectEClass, ReactionEffect.class, "ReactionEffect", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEReference(getReactionEffect_Actions(), this.getStatement(), null, "actions", null, 0, -1, ReactionEffect.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-    initEClass(enterEventEClass, EnterEvent.class, "EnterEvent", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
     initEClass(logicalOrExpressionEClass, LogicalOrExpression.class, "LogicalOrExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
     initEReference(getLogicalOrExpression_LeftOperand(), this.getExpression(), null, "leftOperand", null, 0, 1, LogicalOrExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
     initEReference(getLogicalOrExpression_RightOperand(), this.getExpression(), null, "rightOperand", null, 0, 1, LogicalOrExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

plugins/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/stext/util/StextAdapterFactory.java

@@ -292,11 +292,6 @@ public class StextAdapterFactory extends AdapterFactoryImpl
         return createReactionEffectAdapter();
       }
       @Override
-      public Adapter caseEnterEvent(EnterEvent object)
-      {
-        return createEnterEventAdapter();
-      }
-      @Override
       public Adapter caseLogicalOrExpression(LogicalOrExpression object)
       {
         return createLogicalOrExpressionAdapter();
@@ -1018,21 +1013,6 @@ public class StextAdapterFactory extends AdapterFactoryImpl
     return null;
   }
 
-  /**
-   * Creates a new adapter for an object of class '{@link org.yakindu.sct.model.stext.stext.EnterEvent <em>Enter Event</em>}'.
-   * <!-- begin-user-doc -->
-   * This default implementation returns null so that we can easily ignore cases;
-   * it's useful to ignore a case when inheritance will catch all the cases anyway.
-   * <!-- end-user-doc -->
-   * @return the new adapter.
-   * @see org.yakindu.sct.model.stext.stext.EnterEvent
-   * @generated
-   */
-  public Adapter createEnterEventAdapter()
-  {
-    return null;
-  }
-
   /**
    * Creates a new adapter for an object of class '{@link org.yakindu.sct.model.stext.stext.LogicalOrExpression <em>Logical Or Expression</em>}'.
    * <!-- begin-user-doc -->

plugins/org.yakindu.sct.model.stext/src-gen/org/yakindu/sct/model/stext/stext/util/StextSwitch.java

@@ -415,16 +415,6 @@ public class StextSwitch<T> extends Switch<T>
         if (result == null) result = defaultCase(theEObject);
         return result;
       }
-      case StextPackage.ENTER_EVENT:
-      {
-        EnterEvent enterEvent = (EnterEvent)theEObject;
-        T result = caseEnterEvent(enterEvent);
-        if (result == null) result = caseEntryEvent(enterEvent);
-        if (result == null) result = caseBuiltinEventSpec(enterEvent);
-        if (result == null) result = caseEventSpec(enterEvent);
-        if (result == null) result = defaultCase(theEObject);
-        return result;
-      }
       case StextPackage.LOGICAL_OR_EXPRESSION:
       {
         LogicalOrExpression logicalOrExpression = (LogicalOrExpression)theEObject;
@@ -1165,22 +1155,6 @@ public class StextSwitch<T> extends Switch<T>
     return null;
   }
 
-  /**
-   * Returns the result of interpreting the object as an instance of '<em>Enter Event</em>'.
-   * <!-- begin-user-doc -->
-   * This implementation returns null;
-   * returning a non-null result will terminate the switch.
-   * <!-- end-user-doc -->
-   * @param object the target of the switch.
-   * @return the result of interpreting the object as an instance of '<em>Enter Event</em>'.
-   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-   * @generated
-   */
-  public T caseEnterEvent(EnterEvent object)
-  {
-    return null;
-  }
-
   /**
    * Returns the result of interpreting the object as an instance of '<em>Logical Or Expression</em>'.
    * <!-- begin-user-doc -->

plugins/org.yakindu.sct.model.stext/src/org/yakindu/sct/model/stext/SText.xtext

@@ -141,7 +141,7 @@ BuiltinEventSpec:
 	EntryEvent | ExitEvent | OnCycleEvent | AlwaysEvent;
 
 EntryEvent:
-	{EnterEvent} 'entry';
+	{EntryEvent} 'entry';
 
 ExitEvent:
 	{ExitEvent} 'exit';