Просмотр исходного кода

Local reaction also includes reaction of execution flow (YAKHMI-110)

benjamin.schwertfeger@gmail.com 14 лет назад
Родитель
Сommit
3e97746688

BIN
plugins/org.yakindu.sct.model.sexec.edit/icons/full/ctool16/CreateExecutionFlow_nodes_ExecutionFlow.gif


+ 44 - 7
plugins/org.yakindu.sct.model.sexec.edit/src/org/yakindu/sct/model/sexec/provider/ExecutionFlowItemProvider.java

@@ -68,6 +68,7 @@ public class ExecutionFlowItemProvider
 			addNamePropertyDescriptor(object);
 			addNamePropertyDescriptor(object);
 			addSubScopesPropertyDescriptor(object);
 			addSubScopesPropertyDescriptor(object);
 			addSuperScopePropertyDescriptor(object);
 			addSuperScopePropertyDescriptor(object);
+			addSimpleNamePropertyDescriptor(object);
 		}
 		}
 		return itemPropertyDescriptors;
 		return itemPropertyDescriptors;
 	}
 	}
@@ -160,6 +161,28 @@ public class ExecutionFlowItemProvider
 				 null));
 				 null));
 	}
 	}
 
 
+	/**
+	 * This adds a property descriptor for the Simple Name feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addSimpleNamePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_ExecutionNode_simpleName_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_ExecutionNode_simpleName_feature", "_UI_ExecutionNode_type"),
+				 SexecPackage.Literals.EXECUTION_NODE__SIMPLE_NAME,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
 	/**
 	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * 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.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
@@ -175,11 +198,12 @@ public class ExecutionFlowItemProvider
 			childrenFeatures.add(SexecPackage.Literals.EXECUTION_SCOPE__STATE_VECTOR);
 			childrenFeatures.add(SexecPackage.Literals.EXECUTION_SCOPE__STATE_VECTOR);
 			childrenFeatures.add(SexecPackage.Literals.EXECUTION_SCOPE__ENTER_SEQUENCE);
 			childrenFeatures.add(SexecPackage.Literals.EXECUTION_SCOPE__ENTER_SEQUENCE);
 			childrenFeatures.add(SexecPackage.Literals.EXECUTION_SCOPE__EXIT_SEQUENCE);
 			childrenFeatures.add(SexecPackage.Literals.EXECUTION_SCOPE__EXIT_SEQUENCE);
+			childrenFeatures.add(SexecPackage.Literals.EXECUTION_NODE__REACTIONS);
+			childrenFeatures.add(SexecPackage.Literals.EXECUTION_NODE__REACT_SEQUENCE);
 			childrenFeatures.add(SexecPackage.Literals.EXECUTION_FLOW__STATES);
 			childrenFeatures.add(SexecPackage.Literals.EXECUTION_FLOW__STATES);
 			childrenFeatures.add(SexecPackage.Literals.EXECUTION_FLOW__NODES);
 			childrenFeatures.add(SexecPackage.Literals.EXECUTION_FLOW__NODES);
 			childrenFeatures.add(SexecPackage.Literals.EXECUTION_FLOW__REGIONS);
 			childrenFeatures.add(SexecPackage.Literals.EXECUTION_FLOW__REGIONS);
 			childrenFeatures.add(SexecPackage.Literals.EXECUTION_FLOW__HISTORY_VECTOR);
 			childrenFeatures.add(SexecPackage.Literals.EXECUTION_FLOW__HISTORY_VECTOR);
-			childrenFeatures.add(SexecPackage.Literals.EXECUTION_FLOW__REACTIONS);
 		}
 		}
 		return childrenFeatures;
 		return childrenFeatures;
 	}
 	}
@@ -235,16 +259,18 @@ public class ExecutionFlowItemProvider
 
 
 		switch (notification.getFeatureID(ExecutionFlow.class)) {
 		switch (notification.getFeatureID(ExecutionFlow.class)) {
 			case SexecPackage.EXECUTION_FLOW__NAME:
 			case SexecPackage.EXECUTION_FLOW__NAME:
+			case SexecPackage.EXECUTION_FLOW__SIMPLE_NAME:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
 				return;
 			case SexecPackage.EXECUTION_FLOW__STATE_VECTOR:
 			case SexecPackage.EXECUTION_FLOW__STATE_VECTOR:
 			case SexecPackage.EXECUTION_FLOW__ENTER_SEQUENCE:
 			case SexecPackage.EXECUTION_FLOW__ENTER_SEQUENCE:
 			case SexecPackage.EXECUTION_FLOW__EXIT_SEQUENCE:
 			case SexecPackage.EXECUTION_FLOW__EXIT_SEQUENCE:
+			case SexecPackage.EXECUTION_FLOW__REACTIONS:
+			case SexecPackage.EXECUTION_FLOW__REACT_SEQUENCE:
 			case SexecPackage.EXECUTION_FLOW__STATES:
 			case SexecPackage.EXECUTION_FLOW__STATES:
 			case SexecPackage.EXECUTION_FLOW__NODES:
 			case SexecPackage.EXECUTION_FLOW__NODES:
 			case SexecPackage.EXECUTION_FLOW__REGIONS:
 			case SexecPackage.EXECUTION_FLOW__REGIONS:
 			case SexecPackage.EXECUTION_FLOW__HISTORY_VECTOR:
 			case SexecPackage.EXECUTION_FLOW__HISTORY_VECTOR:
-			case SexecPackage.EXECUTION_FLOW__REACTIONS:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 				return;
 				return;
 		}
 		}
@@ -277,11 +303,26 @@ public class ExecutionFlowItemProvider
 				(SexecPackage.Literals.EXECUTION_SCOPE__EXIT_SEQUENCE,
 				(SexecPackage.Literals.EXECUTION_SCOPE__EXIT_SEQUENCE,
 				 SexecFactory.eINSTANCE.createSequence()));
 				 SexecFactory.eINSTANCE.createSequence()));
 
 
+		newChildDescriptors.add
+			(createChildParameter
+				(SexecPackage.Literals.EXECUTION_NODE__REACTIONS,
+				 SexecFactory.eINSTANCE.createReaction()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(SexecPackage.Literals.EXECUTION_NODE__REACT_SEQUENCE,
+				 SexecFactory.eINSTANCE.createSequence()));
+
 		newChildDescriptors.add
 		newChildDescriptors.add
 			(createChildParameter
 			(createChildParameter
 				(SexecPackage.Literals.EXECUTION_FLOW__STATES,
 				(SexecPackage.Literals.EXECUTION_FLOW__STATES,
 				 SexecFactory.eINSTANCE.createExecutionState()));
 				 SexecFactory.eINSTANCE.createExecutionState()));
 
 
+		newChildDescriptors.add
+			(createChildParameter
+				(SexecPackage.Literals.EXECUTION_FLOW__NODES,
+				 SexecFactory.eINSTANCE.createExecutionFlow()));
+
 		newChildDescriptors.add
 		newChildDescriptors.add
 			(createChildParameter
 			(createChildParameter
 				(SexecPackage.Literals.EXECUTION_FLOW__NODES,
 				(SexecPackage.Literals.EXECUTION_FLOW__NODES,
@@ -311,11 +352,6 @@ public class ExecutionFlowItemProvider
 			(createChildParameter
 			(createChildParameter
 				(SexecPackage.Literals.EXECUTION_FLOW__HISTORY_VECTOR,
 				(SexecPackage.Literals.EXECUTION_FLOW__HISTORY_VECTOR,
 				 SexecFactory.eINSTANCE.createStateVector()));
 				 SexecFactory.eINSTANCE.createStateVector()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(SexecPackage.Literals.EXECUTION_FLOW__REACTIONS,
-				 SexecFactory.eINSTANCE.createReaction()));
 	}
 	}
 
 
 	/**
 	/**
@@ -334,6 +370,7 @@ public class ExecutionFlowItemProvider
 			childFeature == SexecPackage.Literals.EXECUTION_FLOW__HISTORY_VECTOR ||
 			childFeature == SexecPackage.Literals.EXECUTION_FLOW__HISTORY_VECTOR ||
 			childFeature == SexecPackage.Literals.EXECUTION_SCOPE__ENTER_SEQUENCE ||
 			childFeature == SexecPackage.Literals.EXECUTION_SCOPE__ENTER_SEQUENCE ||
 			childFeature == SexecPackage.Literals.EXECUTION_SCOPE__EXIT_SEQUENCE ||
 			childFeature == SexecPackage.Literals.EXECUTION_SCOPE__EXIT_SEQUENCE ||
+			childFeature == SexecPackage.Literals.EXECUTION_NODE__REACT_SEQUENCE ||
 			childFeature == SexecPackage.Literals.EXECUTION_FLOW__STATES ||
 			childFeature == SexecPackage.Literals.EXECUTION_FLOW__STATES ||
 			childFeature == SexecPackage.Literals.EXECUTION_FLOW__NODES;
 			childFeature == SexecPackage.Literals.EXECUTION_FLOW__NODES;