Sfoglia il codice sorgente

made BuiltinEventSpec abstract

Andreas Mülder 11 anni fa
parent
commit
2376305611

+ 0 - 5
plugins/org.yakindu.sct.model.stext.edit/src/org/yakindu/sct/model/stext/stext/provider/ReactionTriggerItemProvider.java

@@ -159,11 +159,6 @@ public class ReactionTriggerItemProvider
   {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(StextPackage.Literals.REACTION_TRIGGER__TRIGGERS,
-				 StextFactory.eINSTANCE.createEventSpec()));
-
 		newChildDescriptors.add
 			(createChildParameter
 				(StextPackage.Literals.REACTION_TRIGGER__TRIGGERS,

+ 1 - 0
plugins/org.yakindu.sct.model.stext.edit/src/org/yakindu/sct/model/stext/stext/provider/StateSpecificationItemProvider.java

@@ -23,6 +23,7 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
 
 import org.yakindu.sct.model.sgraph.SGraphFactory;
+
 import org.yakindu.sct.model.stext.stext.StateSpecification;
 import org.yakindu.sct.model.stext.stext.StextFactory;
 import org.yakindu.sct.model.stext.stext.StextPackage;

+ 0 - 25
plugins/org.yakindu.sct.model.stext.edit/src/org/yakindu/sct/model/stext/stext/provider/StextItemProviderAdapterFactory.java

@@ -577,30 +577,6 @@ public class StextItemProviderAdapterFactory extends StextAdapterFactory impleme
 		return exitPointSpecItemProvider;
 	}
 
-  /**
-	 * This keeps track of the one adapter used for all {@link org.yakindu.sct.model.stext.stext.EventSpec} instances.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  protected EventSpecItemProvider eventSpecItemProvider;
-
-  /**
-	 * This creates an adapter for a {@link org.yakindu.sct.model.stext.stext.EventSpec}.
-	 * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-	 * @generated
-	 */
-  @Override
-  public Adapter createEventSpecAdapter()
-  {
-		if (eventSpecItemProvider == null) {
-			eventSpecItemProvider = new EventSpecItemProvider(this);
-		}
-
-		return eventSpecItemProvider;
-	}
-
   /**
 	 * This keeps track of the one adapter used for all {@link org.yakindu.sct.model.stext.stext.RegularEventSpec} instances.
 	 * <!-- begin-user-doc -->
@@ -1018,7 +994,6 @@ public class StextItemProviderAdapterFactory extends StextAdapterFactory impleme
 		if (guardItemProvider != null) guardItemProvider.dispose();
 		if (entryPointSpecItemProvider != null) entryPointSpecItemProvider.dispose();
 		if (exitPointSpecItemProvider != null) exitPointSpecItemProvider.dispose();
-		if (eventSpecItemProvider != null) eventSpecItemProvider.dispose();
 		if (regularEventSpecItemProvider != null) regularEventSpecItemProvider.dispose();
 		if (timeEventSpecItemProvider != null) timeEventSpecItemProvider.dispose();
 		if (entryEventItemProvider != null) entryEventItemProvider.dispose();

+ 1 - 1
plugins/org.yakindu.sct.model.stext/model/SText.ecore

@@ -64,7 +64,7 @@
   <eClassifiers xsi:type="ecore:EClass" name="ExitPointSpec" eSuperTypes="../../org.yakindu.sct.model.sgraph/model/emf/sgraph.ecore#//ReactionProperty">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="exitpoint" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="EventSpec"/>
+  <eClassifiers xsi:type="ecore:EClass" name="EventSpec" abstract="true"/>
   <eClassifiers xsi:type="ecore:EClass" name="RegularEventSpec" eSuperTypes="#//EventSpec">
     <eStructuralFeatures xsi:type="ecore:EReference" name="event" eType="ecore:EClass ../../org.yakindu.base.expressions/model/Expressions.ecore#//Expression"
         containment="true"/>

+ 7 - 7
plugins/org.yakindu.sct.model.stext/src/org/yakindu/sct/model/stext/GenerateSText.mwe2

@@ -48,13 +48,13 @@ Workflow {
 				xmlVersion = "1.0"
 			}
 
-			// generates Java API for the generated EPackages 
-			fragment = ecore.EcoreGeneratorFragment {
-				generateEdit = true
-				genModel = "model/SText.genmodel"
-				emfRuntimeVersion = "2.8"
-				xmiModelDirectory = "${runtimeProject}/model"
-			}
+//			// generates Java API for the generated EPackages 
+//			fragment = ecore.EcoreGeneratorFragment {
+//				generateEdit = true
+//				genModel = "model/SText.genmodel"
+//				emfRuntimeVersion = "2.8"
+//				xmiModelDirectory = "${runtimeProject}/model"
+//			}
 
 			// the serialization component
 			fragment = parseTreeConstructor.ParseTreeConstructorFragment {}