Bug 520816 - [ActivityDiagram] ActivityDiagram must be regenerated to

get code generation changes from bug 520733 

Bug 520882: [DiaGen] contribution to "org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings" must be removed. 
 - remove contribution in the plugin.xml, as expected by the bug 520882

Change-Id: Icf437218f853241a6744af4e699b97f5038b7317
Signed-off-by: Pauline DEVILLE <pauline.deville@cea.fr>

2 files changed, 55 insertions, 51 deletions

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/plugin.xml
index f90f572a250..a730745f5b9 100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/plugin.xml
@@ -161,52 +161,52 @@
 		<initializer class="org.eclipse.papyrus.uml.diagram.activity.preferences.DiagramSpecificPreferenceInitializer"/>
 	</extension>
    <extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders" id="view-provider">
-      <?gmfgen generated="true"?>
-      <viewProvider class="org.eclipse.papyrus.uml.diagram.activity.providers.UMLViewProvider">
-         <Priority name="Lowest"/>
-         <context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="PapyrusUMLActivityDiagram"/>
-         <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="Activity_Shape,Parameter_ParameterLabel,Constraint_PreconditionLabel,Constraint_PostconditionLabel,InitialNode_Shape,ActivityFinalNode_Shape,FlowFinalNode_Shape,OpaqueAction_Shape,ValuePin_OpaqueActionInputShape,ActionInputPin_OpaqueActionInputShape,InputPin_OpaqueActionInputShape,OutputPin_OpaqueActionOutputShape,CallBehaviorAction_Shape,ValuePin_CallBehaviorActionArgumentShape,ActionInputPin_CallBehaviorActionArgumentShape,InputPin_CallBehaviorActionArgumentShape,OutputPin_CallBehaviorActionResultShape,CallOperationAction_Shape,ActionInputPin_CallOperationActionArgumentShape,ValuePin_CallOperationActionArgumentShape,InputPin_CallOperationActionArgumentShape,OutputPin_CallOperationActionResultShape,ValuePin_CallOperationActionTargetShape,ActionInputPin_CallOperationActionTargetShape,InputPin_CallOperationActionTargetShape,DurationConstraint_LocalPreconditionShape,DurationConstraint_LocalPostconditionShape,TimeConstraint_LocalPreconditionShape,TimeConstraint_LocalPostconditionShape,IntervalConstraint_LocalPreconditionShape,IntervalConstraint_LocalPostconditionShape,Constraint_LocalPreconditionShape,Constraint_LocalPostconditionShape,DecisionNode_Shape,MergeNode_Shape,ForkNode_Shape,JoinNode_Shape,DataStoreNode_Shape,SendObjectAction_Shape,ValuePin_SendObjectActionRequestShape,ActionInputPin_SendObjectActionRequestShape,InputPin_SendObjectActionRequestShape,ValuePin_SendObjectActionTargetShape,ActionInputPin_SendObjectActionTargetShape,InputPin_SendObjectActionTargetShape,SendSignalAction_Shape,ActionInputPin_SendSignalActionArgumentShape,ValuePin_SendSignalActionArgumentShape,InputPin_SendSignalActionArgumentShape,ValuePin_SendSignalActionTargetShape,ActionInputPin_SendSignalActionTargetShape,InputPin_SendSignalActionTargetShape,ActivityParameterNode_Shape,AcceptEventAction_Shape,OutputPin_AcceptEventActionResultShape,ValueSpecificationAction_Shape,OutputPin_ValueSpecificationActionResultShape,ConditionalNode_Shape,ExpansionRegion_Shape,ExpansionNode_InputShape,ExpansionNode_OutputShape,LoopNode_Shape,InputPin_LoopNodeVariableInputShape,ValuePin_LoopNodeVariableInputShape,ActionInputPin_LoopNodeVariableInputShape,OutputPin_LoopNodeBodyOutputShape,OutputPin_LoopNodeVariableShape,OutputPin_LoopNodeResultShape,SequenceNode_Shape,StructuredActivityNode_Shape,InputPin_StructuredActivityNodeInputShape,ValuePin_StructuredActivityNodeInputShape,ActionInputPin_StructuredActivityNodeInputShape,OutputPin_StructuredActivityNodeOutputShape,ActivityPartition_Shape,InterruptibleActivityRegion_Shape,Comment_Shape,ReadSelfAction_Shape,OutputPin_ReadSelfActionResultShape,Activity_Shape_CN,CreateObjectAction_Shape,OutputPin_CreateObjectActionResultShape,NamedElement_DefaultShape,ReadStructuralFeatureAction_Shape,InputPin_ReadStructuralFeatureActionObjectShape,ValuePin_ReadStructuralFeatureActionObjectShape,ActionInputPin_ReadStructuralFeatureActionObjectShape,OutputPin_ReadStructuralFeatureActionResultShape,AddStructuralFeatureValueAction_Shape,InputPin_AddStructuralFeatureValueActionObjectShape,InputPin_AddStructuralFeatureValueActionValueShape,InputPin_AddStructuralFeatureValueActionInsertAtShape,ValuePin_AddStructuralFeatureValueActionObjectShape,ValuePin_AddStructuralFeatureValueActionValueShape,ValuePin_AddStructuralFeatureValueActionInsertAtShape,ActionInputPin_AddStructuralFeatureValueActionObjectShape,ActionInputPin_AddStructuralFeatureValueActionValueShape,ActionInputPin_AddStructuralFeatureValueActionInsertAtShape,OutputPin_AddStructuralFeatureValueActionResultShape,DestroyObjectAction_Shape,InputPin_DestroyObjectActionTargetShape,ValuePin_DestroyObjectActionTargetShape,ActionInputPin_DestroyObjectActionTargetShape,ReadVariableAction_Shape,OutputPin_ReadVariableActionResultShape,AddVariableValueAction_Shape,InputPin_AddVariableValueActionInsertAtShape,InputPin_AddVariableValueActionValueShape,ValuePin_AddVariableValueActionInsertAtShape,ValuePin_AddVariableValueActionValueShape,ActionInputPin_AddVariableValueActionInsertAtShape,ActionInputPin_AddVariableValueActionValueShape,BroadcastSignalAction_Shape,InputPin_BroadcastSignalActionArgumentShape,ValuePin_BroadcastSignalActionArgumentShape,ActionInputPin_BroadcastSignalActionArgumentShape,CentralBufferNode_Shape,Constraint_Shape,StartObjectBehaviorAction_Shape,OutputPin_StartObjectBehaviorActionResultShape,InputPin_StartObjectBehaviorActionObjectShape,ValuePin_StartObjectBehaviorActionObjectShape,ActionInputPin_StartObjectBehaviorActionObjectShape,InputPin_StartObjectBehaviorActionArgumentShape,ValuePin_StartObjectBehaviorActionArgumentShape,ActionInputPin_StartObjectBehaviorActionArgumentShape,TestIdentityAction_Shape,OutputPin_TestIdentityActionResultShape,InputPin_TestIdentityActionFirstShape,InputPin_TestIdentityActionSecondShape,ValuePin_TestIdentityActionFirstShape,ValuePin_TestIdentityActionSecondShape,ActionInputPin_TestIdentityActionFirstShape,ActionInputPin_TestIdentityActionSecondShape,ClearStructuralFeatureAction_Shape,OutputPin_ClearStructuralFeatureActionResultShape,InputPin_ClearStructuralFeatureActionObjectShape,ValuePin_ClearStructuralFeatureActionObjectShape,ActionInputPin_ClearStructuralFeatureActionObjectShape,CreateLinkAction_Shape,InputPin_CreateLinkActionInputShape,ValuePin_CreateLinkActionInputShape,ActionInputPin_CreateLinkActionInputShape,ReadLinkAction_Shape,OutputPin_ReadLinkActionResultShape,InputPin_ReadLinkActionInputShape,ValuePin_ReadLinkActionInputShape,ActionInputPin_ReadLinkActionInputShape,DestroyLinkAction_Shape,InputPin_DestroyLinkActionInputShape,ValuePin_DestroyLinkActionInputShape,ActionInputPin_DestroyLinkActionInputShape,ClearAssociationAction_Shape,InputPin_ClearAssociationActionObjectShape,ValuePin_ClearAssociationActionObjectShape,ActionInputPin_ClearAssociationActionObjectShape,ReadExtentAction_Shape,OutputPin_ReadExtentActionResultShape,ReclassifyObjectAction_Shape,InputPin_ReclassifyObjectActionObjectShape,ValuePin_ReclassifyObjectActionObjectShape,ActionInputPin_ReclassifyObjectActionObjectShape,ReadIsClassifiedObjectAction_Shape,OutputPin_ReadIsClassifiedObjectActionResultShape,InputPin_ReadIsClassifiedObjectActionObjectShape,ValuePin_ReadIsClassifiedObjectActionObjectShape,ActionInputPin_ReadIsClassifiedObjectActionObjectShape,ReduceAction_Shape,OutputPin_ReduceActionResultShape,InputPin_ReduceActionCollectionShape,ValuePin_ReduceActionCollectionShape,ActionInputPin_ReduceActionCollectionShape,StartClassifierBehaviorAction_Shape,InputPin_StartClassifierBehaviorActionObjectShape,ValuePin_StartClassifierBehaviorActionObjectShape,ActionInputPin_StartClassifierBehaviorActionObjectShape,CreateLinkObjectAction_Shape,InputPin_CreateLinkObjectActionInputShape,ValuePin_CreateLinkObjectActionInputShape,ActionInputPin_CreateLinkObjectActionInputShape,OutputPin_CreateLinkObjectActionResultShape,UnmarshallAction_Shape,InputPin_UnmarshallActionObjectShape,ValuePin_UnmarshallActionObjectShape,ActionInputPin_UnmarshallActionObjectShape,OutputPin_UnmarshallActionResultShape"/>
+	      <?gmfgen generated="true"?>
+	      <viewProvider class="org.eclipse.papyrus.uml.diagram.activity.providers.UMLViewProvider">
+	         <Priority name="Lowest"/>
+	         <context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="PapyrusUMLActivityDiagram"/>
+	         <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="Activity_Shape,Parameter_ParameterLabel,Constraint_PreconditionLabel,Constraint_PostconditionLabel,InitialNode_Shape,ActivityFinalNode_Shape,FlowFinalNode_Shape,OpaqueAction_Shape,ValuePin_OpaqueActionInputShape,ActionInputPin_OpaqueActionInputShape,InputPin_OpaqueActionInputShape,OutputPin_OpaqueActionOutputShape,CallBehaviorAction_Shape,ValuePin_CallBehaviorActionArgumentShape,ActionInputPin_CallBehaviorActionArgumentShape,InputPin_CallBehaviorActionArgumentShape,OutputPin_CallBehaviorActionResultShape,CallOperationAction_Shape,ActionInputPin_CallOperationActionArgumentShape,ValuePin_CallOperationActionArgumentShape,InputPin_CallOperationActionArgumentShape,OutputPin_CallOperationActionResultShape,ValuePin_CallOperationActionTargetShape,ActionInputPin_CallOperationActionTargetShape,InputPin_CallOperationActionTargetShape,DurationConstraint_LocalPreconditionShape,DurationConstraint_LocalPostconditionShape,TimeConstraint_LocalPreconditionShape,TimeConstraint_LocalPostconditionShape,IntervalConstraint_LocalPreconditionShape,IntervalConstraint_LocalPostconditionShape,Constraint_LocalPreconditionShape,Constraint_LocalPostconditionShape,DecisionNode_Shape,MergeNode_Shape,ForkNode_Shape,JoinNode_Shape,DataStoreNode_Shape,SendObjectAction_Shape,ValuePin_SendObjectActionRequestShape,ActionInputPin_SendObjectActionRequestShape,InputPin_SendObjectActionRequestShape,ValuePin_SendObjectActionTargetShape,ActionInputPin_SendObjectActionTargetShape,InputPin_SendObjectActionTargetShape,SendSignalAction_Shape,ActionInputPin_SendSignalActionArgumentShape,ValuePin_SendSignalActionArgumentShape,InputPin_SendSignalActionArgumentShape,ValuePin_SendSignalActionTargetShape,ActionInputPin_SendSignalActionTargetShape,InputPin_SendSignalActionTargetShape,ActivityParameterNode_Shape,AcceptEventAction_Shape,OutputPin_AcceptEventActionResultShape,ValueSpecificationAction_Shape,OutputPin_ValueSpecificationActionResultShape,ConditionalNode_Shape,ExpansionRegion_Shape,ExpansionNode_InputShape,ExpansionNode_OutputShape,LoopNode_Shape,InputPin_LoopNodeVariableInputShape,ValuePin_LoopNodeVariableInputShape,ActionInputPin_LoopNodeVariableInputShape,OutputPin_LoopNodeBodyOutputShape,OutputPin_LoopNodeVariableShape,OutputPin_LoopNodeResultShape,SequenceNode_Shape,StructuredActivityNode_Shape,InputPin_StructuredActivityNodeInputShape,ValuePin_StructuredActivityNodeInputShape,ActionInputPin_StructuredActivityNodeInputShape,OutputPin_StructuredActivityNodeOutputShape,ActivityPartition_Shape,InterruptibleActivityRegion_Shape,Comment_Shape,ReadSelfAction_Shape,OutputPin_ReadSelfActionResultShape,Activity_Shape_CN,CreateObjectAction_Shape,OutputPin_CreateObjectActionResultShape,NamedElement_DefaultShape,ReadStructuralFeatureAction_Shape,InputPin_ReadStructuralFeatureActionObjectShape,ValuePin_ReadStructuralFeatureActionObjectShape,ActionInputPin_ReadStructuralFeatureActionObjectShape,OutputPin_ReadStructuralFeatureActionResultShape,AddStructuralFeatureValueAction_Shape,InputPin_AddStructuralFeatureValueActionObjectShape,InputPin_AddStructuralFeatureValueActionValueShape,InputPin_AddStructuralFeatureValueActionInsertAtShape,ValuePin_AddStructuralFeatureValueActionObjectShape,ValuePin_AddStructuralFeatureValueActionValueShape,ValuePin_AddStructuralFeatureValueActionInsertAtShape,ActionInputPin_AddStructuralFeatureValueActionObjectShape,ActionInputPin_AddStructuralFeatureValueActionValueShape,ActionInputPin_AddStructuralFeatureValueActionInsertAtShape,OutputPin_AddStructuralFeatureValueActionResultShape,DestroyObjectAction_Shape,InputPin_DestroyObjectActionTargetShape,ValuePin_DestroyObjectActionTargetShape,ActionInputPin_DestroyObjectActionTargetShape,ReadVariableAction_Shape,OutputPin_ReadVariableActionResultShape,AddVariableValueAction_Shape,InputPin_AddVariableValueActionInsertAtShape,InputPin_AddVariableValueActionValueShape,ValuePin_AddVariableValueActionInsertAtShape,ValuePin_AddVariableValueActionValueShape,ActionInputPin_AddVariableValueActionInsertAtShape,ActionInputPin_AddVariableValueActionValueShape,BroadcastSignalAction_Shape,InputPin_BroadcastSignalActionArgumentShape,ValuePin_BroadcastSignalActionArgumentShape,ActionInputPin_BroadcastSignalActionArgumentShape,CentralBufferNode_Shape,Constraint_Shape,StartObjectBehaviorAction_Shape,OutputPin_StartObjectBehaviorActionResultShape,InputPin_StartObjectBehaviorActionObjectShape,ValuePin_StartObjectBehaviorActionObjectShape,ActionInputPin_StartObjectBehaviorActionObjectShape,InputPin_StartObjectBehaviorActionArgumentShape,ValuePin_StartObjectBehaviorActionArgumentShape,ActionInputPin_StartObjectBehaviorActionArgumentShape,TestIdentityAction_Shape,OutputPin_TestIdentityActionResultShape,InputPin_TestIdentityActionFirstShape,InputPin_TestIdentityActionSecondShape,ValuePin_TestIdentityActionFirstShape,ValuePin_TestIdentityActionSecondShape,ActionInputPin_TestIdentityActionFirstShape,ActionInputPin_TestIdentityActionSecondShape,ClearStructuralFeatureAction_Shape,OutputPin_ClearStructuralFeatureActionResultShape,InputPin_ClearStructuralFeatureActionObjectShape,ValuePin_ClearStructuralFeatureActionObjectShape,ActionInputPin_ClearStructuralFeatureActionObjectShape,CreateLinkAction_Shape,InputPin_CreateLinkActionInputShape,ValuePin_CreateLinkActionInputShape,ActionInputPin_CreateLinkActionInputShape,ReadLinkAction_Shape,OutputPin_ReadLinkActionResultShape,InputPin_ReadLinkActionInputShape,ValuePin_ReadLinkActionInputShape,ActionInputPin_ReadLinkActionInputShape,DestroyLinkAction_Shape,InputPin_DestroyLinkActionInputShape,ValuePin_DestroyLinkActionInputShape,ActionInputPin_DestroyLinkActionInputShape,ClearAssociationAction_Shape,InputPin_ClearAssociationActionObjectShape,ValuePin_ClearAssociationActionObjectShape,ActionInputPin_ClearAssociationActionObjectShape,ReadExtentAction_Shape,OutputPin_ReadExtentActionResultShape,ReclassifyObjectAction_Shape,InputPin_ReclassifyObjectActionObjectShape,ValuePin_ReclassifyObjectActionObjectShape,ActionInputPin_ReclassifyObjectActionObjectShape,ReadIsClassifiedObjectAction_Shape,OutputPin_ReadIsClassifiedObjectActionResultShape,InputPin_ReadIsClassifiedObjectActionObjectShape,ValuePin_ReadIsClassifiedObjectActionObjectShape,ActionInputPin_ReadIsClassifiedObjectActionObjectShape,ReduceAction_Shape,OutputPin_ReduceActionResultShape,InputPin_ReduceActionCollectionShape,ValuePin_ReduceActionCollectionShape,ActionInputPin_ReduceActionCollectionShape,StartClassifierBehaviorAction_Shape,InputPin_StartClassifierBehaviorActionObjectShape,ValuePin_StartClassifierBehaviorActionObjectShape,ActionInputPin_StartClassifierBehaviorActionObjectShape,CreateLinkObjectAction_Shape,InputPin_CreateLinkObjectActionInputShape,ValuePin_CreateLinkObjectActionInputShape,ActionInputPin_CreateLinkObjectActionInputShape,OutputPin_CreateLinkObjectActionResultShape,UnmarshallAction_Shape,InputPin_UnmarshallActionObjectShape,ValuePin_UnmarshallActionObjectShape,ActionInputPin_UnmarshallActionObjectShape,OutputPin_UnmarshallActionResultShape"/>
          <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="Action_LocalPreconditionEdge,Action_LocalPostconditionEdge,ObjectFlow_Edge,ControlFlow_Edge,ExceptionHandler_Edge,Comment_AnnotatedElementEdge,Constraint_ConstrainedElementEdge"/>
-      </viewProvider>
-   </extension>
+	      </viewProvider>
+	   </extension>
 
    <extension point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders" id="ep-provider">
-      <?gmfgen generated="true"?>
-      <editpartProvider class="org.eclipse.papyrus.uml.diagram.activity.providers.UMLEditPartProvider">
-         <Priority name="Lowest"/>
-         <object class="org.eclipse.gmf.runtime.notation.Diagram" id="generated-diagram">
-            <method name="getType()" value="PapyrusUMLActivityDiagram"/>
-         </object>
-         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-nodes">
-            <method name="getType()" value="Activity_Shape,Parameter_ParameterLabel,Constraint_PreconditionLabel,Constraint_PostconditionLabel,InitialNode_Shape,ActivityFinalNode_Shape,FlowFinalNode_Shape,OpaqueAction_Shape,ValuePin_OpaqueActionInputShape,ActionInputPin_OpaqueActionInputShape,InputPin_OpaqueActionInputShape,OutputPin_OpaqueActionOutputShape,CallBehaviorAction_Shape,ValuePin_CallBehaviorActionArgumentShape,ActionInputPin_CallBehaviorActionArgumentShape,InputPin_CallBehaviorActionArgumentShape,OutputPin_CallBehaviorActionResultShape,CallOperationAction_Shape,ActionInputPin_CallOperationActionArgumentShape,ValuePin_CallOperationActionArgumentShape,InputPin_CallOperationActionArgumentShape,OutputPin_CallOperationActionResultShape,ValuePin_CallOperationActionTargetShape,ActionInputPin_CallOperationActionTargetShape,InputPin_CallOperationActionTargetShape,DurationConstraint_LocalPreconditionShape,DurationConstraint_LocalPostconditionShape,TimeConstraint_LocalPreconditionShape,TimeConstraint_LocalPostconditionShape,IntervalConstraint_LocalPreconditionShape,IntervalConstraint_LocalPostconditionShape,Constraint_LocalPreconditionShape,Constraint_LocalPostconditionShape,DecisionNode_Shape,MergeNode_Shape,ForkNode_Shape,JoinNode_Shape,DataStoreNode_Shape,SendObjectAction_Shape,ValuePin_SendObjectActionRequestShape,ActionInputPin_SendObjectActionRequestShape,InputPin_SendObjectActionRequestShape,ValuePin_SendObjectActionTargetShape,ActionInputPin_SendObjectActionTargetShape,InputPin_SendObjectActionTargetShape,SendSignalAction_Shape,ActionInputPin_SendSignalActionArgumentShape,ValuePin_SendSignalActionArgumentShape,InputPin_SendSignalActionArgumentShape,ValuePin_SendSignalActionTargetShape,ActionInputPin_SendSignalActionTargetShape,InputPin_SendSignalActionTargetShape,ActivityParameterNode_Shape,AcceptEventAction_Shape,OutputPin_AcceptEventActionResultShape,ValueSpecificationAction_Shape,OutputPin_ValueSpecificationActionResultShape,ConditionalNode_Shape,ExpansionRegion_Shape,ExpansionNode_InputShape,ExpansionNode_OutputShape,LoopNode_Shape,InputPin_LoopNodeVariableInputShape,ValuePin_LoopNodeVariableInputShape,ActionInputPin_LoopNodeVariableInputShape,OutputPin_LoopNodeBodyOutputShape,OutputPin_LoopNodeVariableShape,OutputPin_LoopNodeResultShape,SequenceNode_Shape,StructuredActivityNode_Shape,InputPin_StructuredActivityNodeInputShape,ValuePin_StructuredActivityNodeInputShape,ActionInputPin_StructuredActivityNodeInputShape,OutputPin_StructuredActivityNodeOutputShape,ActivityPartition_Shape,InterruptibleActivityRegion_Shape,Comment_Shape,ReadSelfAction_Shape,OutputPin_ReadSelfActionResultShape,Activity_Shape_CN,CreateObjectAction_Shape,OutputPin_CreateObjectActionResultShape,NamedElement_DefaultShape,ReadStructuralFeatureAction_Shape,InputPin_ReadStructuralFeatureActionObjectShape,ValuePin_ReadStructuralFeatureActionObjectShape,ActionInputPin_ReadStructuralFeatureActionObjectShape,OutputPin_ReadStructuralFeatureActionResultShape,AddStructuralFeatureValueAction_Shape,InputPin_AddStructuralFeatureValueActionObjectShape,InputPin_AddStructuralFeatureValueActionValueShape,InputPin_AddStructuralFeatureValueActionInsertAtShape,ValuePin_AddStructuralFeatureValueActionObjectShape,ValuePin_AddStructuralFeatureValueActionValueShape,ValuePin_AddStructuralFeatureValueActionInsertAtShape,ActionInputPin_AddStructuralFeatureValueActionObjectShape,ActionInputPin_AddStructuralFeatureValueActionValueShape,ActionInputPin_AddStructuralFeatureValueActionInsertAtShape,OutputPin_AddStructuralFeatureValueActionResultShape,DestroyObjectAction_Shape,InputPin_DestroyObjectActionTargetShape,ValuePin_DestroyObjectActionTargetShape,ActionInputPin_DestroyObjectActionTargetShape,ReadVariableAction_Shape,OutputPin_ReadVariableActionResultShape,AddVariableValueAction_Shape,InputPin_AddVariableValueActionInsertAtShape,InputPin_AddVariableValueActionValueShape,ValuePin_AddVariableValueActionInsertAtShape,ValuePin_AddVariableValueActionValueShape,ActionInputPin_AddVariableValueActionInsertAtShape,ActionInputPin_AddVariableValueActionValueShape,BroadcastSignalAction_Shape,InputPin_BroadcastSignalActionArgumentShape,ValuePin_BroadcastSignalActionArgumentShape,ActionInputPin_BroadcastSignalActionArgumentShape,CentralBufferNode_Shape,Constraint_Shape,StartObjectBehaviorAction_Shape,OutputPin_StartObjectBehaviorActionResultShape,InputPin_StartObjectBehaviorActionObjectShape,ValuePin_StartObjectBehaviorActionObjectShape,ActionInputPin_StartObjectBehaviorActionObjectShape,InputPin_StartObjectBehaviorActionArgumentShape,ValuePin_StartObjectBehaviorActionArgumentShape,ActionInputPin_StartObjectBehaviorActionArgumentShape,TestIdentityAction_Shape,OutputPin_TestIdentityActionResultShape,InputPin_TestIdentityActionFirstShape,InputPin_TestIdentityActionSecondShape,ValuePin_TestIdentityActionFirstShape,ValuePin_TestIdentityActionSecondShape,ActionInputPin_TestIdentityActionFirstShape,ActionInputPin_TestIdentityActionSecondShape,ClearStructuralFeatureAction_Shape,OutputPin_ClearStructuralFeatureActionResultShape,InputPin_ClearStructuralFeatureActionObjectShape,ValuePin_ClearStructuralFeatureActionObjectShape,ActionInputPin_ClearStructuralFeatureActionObjectShape,CreateLinkAction_Shape,InputPin_CreateLinkActionInputShape,ValuePin_CreateLinkActionInputShape,ActionInputPin_CreateLinkActionInputShape,ReadLinkAction_Shape,OutputPin_ReadLinkActionResultShape,InputPin_ReadLinkActionInputShape,ValuePin_ReadLinkActionInputShape,ActionInputPin_ReadLinkActionInputShape,DestroyLinkAction_Shape,InputPin_DestroyLinkActionInputShape,ValuePin_DestroyLinkActionInputShape,ActionInputPin_DestroyLinkActionInputShape,ClearAssociationAction_Shape,InputPin_ClearAssociationActionObjectShape,ValuePin_ClearAssociationActionObjectShape,ActionInputPin_ClearAssociationActionObjectShape,ReadExtentAction_Shape,OutputPin_ReadExtentActionResultShape,ReclassifyObjectAction_Shape,InputPin_ReclassifyObjectActionObjectShape,ValuePin_ReclassifyObjectActionObjectShape,ActionInputPin_ReclassifyObjectActionObjectShape,ReadIsClassifiedObjectAction_Shape,OutputPin_ReadIsClassifiedObjectActionResultShape,InputPin_ReadIsClassifiedObjectActionObjectShape,ValuePin_ReadIsClassifiedObjectActionObjectShape,ActionInputPin_ReadIsClassifiedObjectActionObjectShape,ReduceAction_Shape,OutputPin_ReduceActionResultShape,InputPin_ReduceActionCollectionShape,ValuePin_ReduceActionCollectionShape,ActionInputPin_ReduceActionCollectionShape,StartClassifierBehaviorAction_Shape,InputPin_StartClassifierBehaviorActionObjectShape,ValuePin_StartClassifierBehaviorActionObjectShape,ActionInputPin_StartClassifierBehaviorActionObjectShape,CreateLinkObjectAction_Shape,InputPin_CreateLinkObjectActionInputShape,ValuePin_CreateLinkObjectActionInputShape,ActionInputPin_CreateLinkObjectActionInputShape,OutputPin_CreateLinkObjectActionResultShape,UnmarshallAction_Shape,InputPin_UnmarshallActionObjectShape,ValuePin_UnmarshallActionObjectShape,ActionInputPin_UnmarshallActionObjectShape,OutputPin_UnmarshallActionResultShape"/>
-         </object>
-         <object class="org.eclipse.gmf.runtime.notation.Edge" id="generated-links">
-            <method name="getType()" value="Action_LocalPreconditionEdge,Action_LocalPostconditionEdge,ObjectFlow_Edge,ControlFlow_Edge,ExceptionHandler_Edge,Comment_AnnotatedElementEdge,Constraint_ConstrainedElementEdge"/>
-         </object>
-         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-labels">
-            <method name="getType()" value="Activity_NameLabel,Activity_KeywordLabel,InitialNode_FloatingNameLabel,InitialNode_StereotypeLabel,ActivityFinalNode_FloatingNameLabel,ActivityFinalNode_StereotypeLabel,FlowFinalNode_FloatingNameLabel,FlowFinalNode_StereotypeLabel,OpaqueAction_NameLabel,OpaqueAction_FloatingNameLabel,ValuePin_OpaqueActionInputNameLabel,ValuePin_OpaqueActionInputValueLabel,ValuePin_OpaqueActionInputStereotypeLabel,ActionInputPin_OpaqueActionInputNameLabel,ActionInputPin_OpaqueActionInputValueLabel,ActionInputPin_OpaqueActionInputStereotypeLabel,InputPin_OpaqueActionInputNameLabel,InputPin_OpaqueActionInputStereotypeLabel,OutputPin_OpaqueActionOutputNameLabel,OutputPin_OpaqueActionOutputStereotypeLabel,CallBehaviorAction_NameLabel,CallBehaviorAction_FloatingNameLabel,ValuePin_CallBehaviorActionArgumentNameLabel,ValuePin_CallBehaviorActionArgumentValueLabel,ValuePin_CallBehaviorActionArgumentStereotypeLabel,ActionInputPin_CallBehaviorActionArgumentNameLabel,ActionInputPin_CallBehaviorActionArgumentValueLabel,ActionInputPin_CallBehaviorActionArgumentStereotypeLabel,InputPin_CallBehaviorActionArgumentNameLabel,InputPin_CallBehaviorActionArgumentStereotypeLabel,OutputPin_CallBehaviorActionResultNameLabel,OutputPin_CallBehaviorActionResultStereotypeLabel,CallOperationAction_NameLabel,CallOperationAction_FloatingNameLabel,ActionInputPin_CallOperationActionArgumentNameLabel,ActionInputPin_CallOperationActionArgumentValueLabel,ActionInputPin_CallOperationActionArgumentStereotypeLabel,ValuePin_CallOperationActionArgumentNameLabel,ValuePin_CallOperationActionArgumentValueLabel,ValuePin_CallOperationActionArgumentStereotypeLabel,InputPin_CallOperationActionArgumentNameLabel,InputPin_CallOperationActionArgumentStereotypeLabel,OutputPin_CallOperationActionResultNameLabel,OutputPin_CallOperationActionResultStereotypeLabel,ValuePin_CallOperationActionTargetNameLabel,ValuePin_CallOperationActionTargetValueLabel,ValuePin_CallOperationActionTargetStereotypeLabel,ActionInputPin_CallOperationActionTargetNameLabel,ActionInputPin_CallOperationActionTargetValueLabel,ActionInputPin_CallOperationActionTargetStereotypeLabel,InputPin_CallOperationActionTargetNameLabel,InputPin_CallOperationActionTargetStereotypeLabel,DurationConstraint_LocalPreconditionNameLabel,DurationConstraint_LocalPreconditionBodyLabel,DurationConstraint_LocalPostconditionNameLabel,DurationConstraint_LocalPostconditionBodyLabel,TimeConstraint_LocalPreconditionNameLabel,TimeConstraint_LocalPreconditionBodyLabel,TimeConstraint_LocalPostconditionNameLabel,TimeConstraint_LocalPostconditionBodyLabel,IntervalConstraint_LocalPreconditionNameLabel,IntervalConstraint_LocalPreconditionBodyLabel,IntervalConstraint_LocalPostconditionNameLabel,IntervalConstraint_LocalPostconditionBodyLabel,Constraint_LocalPreconditionNameLabel,Constraint_LocalPreconditionBodyLabel,Constraint_LocalPostconditionNameLabel,Constraint_LocalPostconditionBodyLabel,DecisionNode_FloatingNameLabel,DecisionNode_DecisionInputLabel,DecisionNode_StereotypeLabel,MergeNode_FloatingNameLabel,MergeNode_StereotypeLabel,ForkNode_FloatingNameLabel,ForkNode_StereotypeLabel,JoinNode_FloatingNameLabel,JoinNode_JoinSpecLabel,JoinNode_StereotypeLabel,DataStoreNode_NameLabel,DataStoreNode_SelectionLabel,DataStoreNode_FloatingNameLabel,SendObjectAction_NameLabel,SendObjectAction_FloatingNameLabel,ValuePin_SendObjectActionRequestNameLabel,ValuePin_SendObjectActionRequestValueLabel,ValuePin_SendObjectActionRequestStereotypeLabel,ActionInputPin_SendObjectActionRequestNameLabel,ActionInputPin_SendObjectActionRequestValueLabel,ActionInputPin_SendObjectActionRequestStereotypeLabel,InputPin_SendObjectActionRequestNameLabel,InputPin_SendObjectActionRequestStereotypeLabel,ValuePin_SendObjectActionTargetNameLabel,ValuePin_SendObjectActionTargetValueLabel,ValuePin_SendObjectActionTargetStereotypeLabel,ActionInputPin_SendObjectActionTargetNameLabel,ActionInputPin_SendObjectActionTargetValueLabel,ActionInputPin_SendObjectActionTargetStereotypeLabel,InputPin_SendObjectActionTargetNameLabel,InputPin_SendObjectActionTargetStereotypeLabel,SendSignalAction_NameLabel,SendSignalAction_FloatingNameLabel,ActionInputPin_SendSignalActionArgumentNameLabel,ActionInputPin_SendSignalActionArgumentValueLabel,ActionInputPin_SendSignalActionArgumentStereotypeLabel,ValuePin_SendSignalActionArgumentNameLabel,ValuePin_SendSignalActionArgumentValueLabel,ValuePin_SendSignalActionArgumentStereotypeLabel,InputPin_SendSignalActionArgumentNameLabel,InputPin_SendSignalActionArgumentStereotypeLabel,ValuePin_SendSignalActionTargetNameLabel,ValuePin_SendSignalActionTargetValueLabel,ValuePin_SendSignalActionTargetStereotypeLabel,ActionInputPin_SendSignalActionTargetNameLabel,ActionInputPin_SendSignalActionTargetValueLabel,ActionInputPin_SendSignalActionTargetStereotypeLabel,InputPin_SendSignalActionTargetNameLabel,InputPin_SendSignalActionTargetStereotypeLabel,ActivityParameterNode_NameLabel,ActivityParameterNode_StreamLabel,ActivityParameterNode_ExceptionLabel,AcceptEventAction_NameLabel,AcceptEventAction_TriggerLabel,AcceptEventAction_StereotypeLabel,AcceptEventAction_FloatingNameLabel,OutputPin_AcceptEventActionResultNameLabel,OutputPin_AcceptEventActionResultStereotypeLabel,ValueSpecificationAction_NameLabel,ValueSpecificationAction_FloatingNameLabel,OutputPin_ValueSpecificationActionResultNameLabel,OutputPin_ValueSpecificationActionResultStereotypeLabel,ConditionalNode_KeywordLabel,ExpansionRegion_KeywordLabel,LoopNode_KeywordLabel,InputPin_LoopNodeVariableInputNameLabel,InputPin_LoopNodeVariableInputStereotypeLabel,ValuePin_LoopNodeVariableInputNameLabel,ValuePin_LoopNodeVariableInputValueLabel,ValuePin_LoopNodeVariableInputStereotypeLabel,ActionInputPin_LoopNodeVariableInputNameLabel,ActionInputPin_LoopNodeVariableInputValueLabel,ActionInputPin_LoopNodeVariableInputStereotypeLabel,OutputPin_LoopNodeBodyOutputNameLabel,OutputPin_LoopNodeBodyOutputStereotypeLabel,OutputPin_LoopNodeVariableNameLabel,OutputPin_LoopNodeVariableStereotypeLabel,OutputPin_LoopNodeResultNameLabel,OutputPin_LoopNodeResultStereotypeLabel,SequenceNode_KeywordLabel,StructuredActivityNode_KeywordLabel,InputPin_StructuredActivityNodeInputNameLabel,InputPin_StructuredActivityNodeInputStereotypeLabel,ValuePin_StructuredActivityNodeInputNameLabel,ValuePin_StructuredActivityNodeInputValueLabel,ValuePin_StructuredActivityNodeInputStereotypeLabel,ActionInputPin_StructuredActivityNodeInputNameLabel,ActionInputPin_StructuredActivityNodeInputValueLabel,ActionInputPin_StructuredActivityNodeInputStereotypeLabel,OutputPin_StructuredActivityNodeOutputNameLabel,OutputPin_StructuredActivityNodeOutputStereotypeLabel,ActivityPartition_NameLabel,ActivityPartition_FloatingNameLabel,Comment_BodyLabel,ReadSelfAction_NameLabel,ReadSelfAction_FloatingNameLabel,OutputPin_ReadSelfActionResultNameLabel,OutputPin_ReadSelfActionResultStereotypeLabel,Activity_NameLabel_CN,Activity_KeywordLabel_CN,CreateObjectAction_NameLabel,CreateObjectAction_FloatingNameLabel,OutputPin_CreateObjectActionResultNameLabel,OutputPin_CreateObjectActionResultStereotypeLabel,NamedElement_NameLabel,ReadStructuralFeatureAction_NameLabel,ReadStructuralFeatureAction_FloatingNameLabel,InputPin_ReadStructuralFeatureActionObjectNameLabel,InputPin_ReadStructuralFeatureActionObjectStereotypeLabel,ValuePin_ReadStructuralFeatureActionObjectNameLabel,ValuePin_ReadStructuralFeatureActionObjectValueLabel,ValuePin_ReadStructuralFeatureActionObjectStereotypeLabel,ActionInputPin_ReadStructuralFeatureActionObjectNameLabel,ActionInputPin_ReadStructuralFeatureActionObjectValueLabel,ActionInputPin_ReadStructuralFeatureActionObjectStereotypeLabel,OutputPin_ReadStructuralFeatureActionResultNameLabel,OutputPin_ReadStructuralFeatureActionResultStereotypeLabel,AddStructuralFeatureValueAction_NameLabel,AddStructuralFeatureValueAction_FloatingNameLabel,InputPin_AddStructuralFeatureValueActionObjectNameLabel,InputPin_AddStructuralFeatureValueActionObjectStereotypeLabel,InputPin_AddStructuralFeatureValueActionValueNameLabel,InputPin_AddStructuralFeatureValueActionValueStereotypeLabel,InputPin_AddStructuralFeatureValueActionInsertAtNameLabel,InputPin_AddStructuralFeatureValueActionInsertAtStereotypeLabel,ValuePin_AddStructuralFeatureValueActionObjectNameLabel,ValuePin_AddStructuralFeatureValueActionObjectValueLabel,ValuePin_AddStructuralFeatureValueActionObjectStereotypeLabel,ValuePin_AddStructuralFeatureValueActionValueNameLabel,ValuePin_AddStructuralFeatureValueActionValueValueLabel,ValuePin_AddStructuralFeatureValueActionValueStereotypeLabel,ValuePin_AddStructuralFeatureValueActionInsertAtNameLabel,ValuePin_AddStructuralFeatureValueActionInsertAtValueLabel,ValuePin_AddStructuralFeatureValueActionInsertAtStereotypeLabel,ActionInputPin_AddStructuralFeatureValueActionObjectNameLabel,ActionInputPin_AddStructuralFeatureValueActionObjectValueLabel,ActionInputPin_AddStructuralFeatureValueActionObjectStereotypeLabel,ActionInputPin_AddStructuralFeatureValueActionValueNameLabel,ActionInputPin_AddStructuralFeatureValueActionValueValueLabel,ActionInputPin_AddStructuralFeatureValueActionValueStereotypeLabel,ActionInputPin_AddStructuralFeatureValueActionInsertAtNameLabel,ActionInputPin_AddStructuralFeatureValueActionInsertAtValueLabel,ActionInputPin_AddStructuralFeatureValueActionInsertAtStereotypeLabel,OutputPin_AddStructuralFeatureValueActionResultNameLabel,OutputPin_AddStructuralFeatureValueActionResultStereotypeLabel,DestroyObjectAction_NameLabel,DestroyObjectAction_FloatingNameLabel,InputPin_DestroyObjectActionTargetNameLabel,InputPin_DestroyObjectActionTargetStereotypeLabel,ValuePin_DestroyObjectActionTargetNameLabel,ValuePin_DestroyObjectActionTargetValueLabel,ValuePin_DestroyObjectActionTargetStereotypeLabel,ActionInputPin_DestroyObjectActionTargetNameLabel,ActionInputPin_DestroyObjectActionTargetValueLabel,ActionInputPin_DestroyObjectActionTargetStereotypeLabel,ReadVariableAction_NameLabel,ReadVariableAction_FloatingNameLabel,OutputPin_ReadVariableActionResultNameLabel,OutputPin_ReadVariableActionResultStereotypeLabel,AddVariableValueAction_NameLabel,AddVariableValueAction_FloatingNameLabel,InputPin_AddVariableValueActionInsertAtNameLabel,InputPin_AddVariableValueActionInsertAtStereotypeLabel,InputPin_AddVariableValueActionValueNameLabel,InputPin_AddVariableValueActionValueStereotypeLabel,ValuePin_AddVariableValueActionInsertAtNameLabel,ValuePin_AddVariableValueActionInsertAtValueLabel,ValuePin_AddVariableValueActionInsertAtStereotypeLabel,ValuePin_AddVariableValueActionValueNameLabel,ValuePin_AddVariableValueActionValueValueLabel,ValuePin_AddVariableValueActionValueStereotypeLabel,ActionInputPin_AddVariableValueActionInsertAtNameLabel,ActionInputPin_AddVariableValueActionInsertAtValueLabel,ActionInputPin_AddVariableValueActionInsertAtStereotypeLabel,ActionInputPin_AddVariableValueActionValueNameLabel,ActionInputPin_AddVariableValueActionValueValueLabel,ActionInputPin_AddVariableValueActionValueStereotypeLabel,BroadcastSignalAction_NameLabel,BroadcastSignalAction_FloatingNameLabel,InputPin_BroadcastSignalActionArgumentNameLabel,InputPin_BroadcastSignalActionArgumentValueLabel,InputPin_BroadcastSignalActionArgumentStereotypeLabel,ValuePin_BroadcastSignalActionArgumentNameLabel,ValuePin_BroadcastSignalActionArgumentValueLabel,ValuePin_BroadcastSignalActionArgumentStereotypeLabel,ActionInputPin_BroadcastSignalActionArgumentNameLabel,ActionInputPin_BroadcastSignalActionArgumentValueLabel,ActionInputPin_BroadcastSignalActionArgumentStereotypeLabel,CentralBufferNode_NameLabel,CentralBufferNode_SelectionLabel,CentralBufferNode_FloatingNameLabel,Constraint_NameLabel,Constraint_BodyLabel,StartObjectBehaviorAction_NameLabel,StartObjectBehaviorAction_FloatingNameLabel,OutputPin_StartObjectBehaviorActionResultNameLabel,OutputPin_StartObjectBehaviorActionResultStereotypeLabel,InputPin_StartObjectBehaviorActionObjectNameLabel,InputPin_StartObjectBehaviorActionObjectStereotypeLabel,ValuePin_StartObjectBehaviorActionObjectNameLabel,ValuePin_StartObjectBehaviorActionObjectValueLabel,ValuePin_StartObjectBehaviorActionObjectStereotypeLabel,ActionInputPin_StartObjectBehaviorActionObjectNameLabel,ActionInputPin_StartObjectBehaviorActionObjectValueLabel,ActionInputPin_StartObjectBehaviorActionObjectStereotypeLabel,InputPin_StartObjectBehaviorActionArgumentNameLabel,InputPin_StartObjectBehaviorActionArgumentStereotypeLabel,ValuePin_StartObjectBehaviorActionArgumentNameLabel,ValuePin_StartObjectBehaviorActionArgumentValueLabel,ValuePin_StartObjectBehaviorActionArgumentStereotypeLabel,ActionInputPin_StartObjectBehaviorActionArgumentNameLabel,ActionInputPin_StartObjectBehaviorActionArgumentValueLabel,ActionInputPin_StartObjectBehaviorActionArgumentStereotypeLabel,TestIdentityAction_NameLabel,TestIdentityAction_FloatingNameLabel,OutputPin_TestIdentityActionResultNameLabel,OutputPin_TestIdentityActionResultStereotypeLabel,InputPin_TestIdentityActionFirstNameLabel,InputPin_TestIdentityActionFirstStereotypeLabel,InputPin_TestIdentityActionSecondNameLabel,InputPin_TestIdentityActionSecondStereotypeLabel,ValuePin_TestIdentityActionFirstNameLabel,ValuePin_TestIdentityActionFirstValueLabel,ValuePin_TestIdentityActionFirstStereotypeLabel,ValuePin_TestIdentityActionSecondNameLabel,ValuePin_TestIdentityActionSecondValueLabel,ValuePin_TestIdentityActionSecondStereotypeLabel,ActionInputPin_TestIdentityActionFirstNameLabel,ActionInputPin_TestIdentityActionFirstValueLabel,ActionInputPin_TestIdentityActionFirstStereotypeLabel,ActionInputPin_TestIdentityActionSecondNameLabel,ActionInputPin_TestIdentityActionSecondValueLabel,ActionInputPin_TestIdentityActionSecondStereotypeLabel,ClearStructuralFeatureAction_NameLabel,ClearStructuralFeatureAction_FloatingNameLabel,OutputPin_ClearStructuralFeatureActionResultNameLabel,OutputPin_ClearStructuralFeatureActionResultStereotypeLabel,InputPin_ClearStructuralFeatureActionObjectNameLabel,InputPin_ClearStructuralFeatureActionObjectStereotypeLabel,ValuePin_ClearStructuralFeatureActionObjectNameLabel,ValuePin_ClearStructuralFeatureActionObjectValueLabel,ValuePin_ClearStructuralFeatureActionObjectStereotypeLabel,ActionInputPin_ClearStructuralFeatureActionObjectNameLabel,ActionInputPin_ClearStructuralFeatureActionObjectValueLabel,ActionInputPin_ClearStructuralFeatureActionObjectStereotypeLabel,CreateLinkAction_NameLabel,CreateLinkAction_FloatingNameLabel,InputPin_CreateLinkActionInputNameLabel,InputPin_CreateLinkActionInputStereotypeLabel,ValuePin_CreateLinkActionInputNameLabel,ValuePin_CreateLinkActionInputValueLabel,ValuePin_CreateLinkActionInputStereotypeLabel,ActionInputPin_CreateLinkActionInputNameLabel,ActionInputPin_CreateLinkActionInputValueLabel,ActionInputPin_CreateLinkActionInputStereotypeLabel,ReadLinkAction_NameLabel,ReadLinkAction_FloatingNameLabel,OutputPin_ReadLinkActionResultNameLabel,OutputPin_ReadLinkActionResultStereotypeLabel,InputPin_ReadLinkActionInputNameLabel,InputPin_ReadLinkActionInputStereotypeLabel,ValuePin_ReadLinkActionInputNameLabel,ValuePin_ReadLinkActionInputValueLabel,ValuePin_ReadLinkActionInputStereotypeLabel,ActionInputPin_ReadLinkActionInputNameLabel,ActionInputPin_ReadLinkActionInputValueLabel,ActionInputPin_ReadLinkActionInputStereotypeLabel,DestroyLinkAction_NameLabel,DestroyLinkAction_FloatingNameLabel,InputPin_DestroyLinkActionInputNameLabel,InputPin_DestroyLinkActionInputStereotypeLabel,ValuePin_DestroyLinkActionInputNameLabel,ValuePin_DestroyLinkActionInputValueLabel,ValuePin_DestroyLinkActionInputStereotypeLabel,ActionInputPin_DestroyLinkActionInputNameLabel,ActionInputPin_DestroyLinkActionInputValueLabel,ActionInputPin_DestroyLinkActionInputStereotypeLabel,ClearAssociationAction_NameLabel,ClearAssociationAction_FloatingNameLabel,InputPin_ClearAssociationActionObjectNameLabel,InputPin_ClearAssociationActionObjectStereotypeLabel,ValuePin_ClearAssociationActionObjectNameLabel,ValuePin_ClearAssociationActionObjectValueLabel,ValuePin_ClearAssociationActionObjectStereotypeLabel,ActionInputPin_ClearAssociationActionObjectNameLabel,ActionInputPin_ClearAssociationActionObjectValueLabel,ActionInputPin_ClearAssociationActionObjectStereotypeLabel,ReadExtentAction_NameLabel,ReadExtentAction_FloatingNameLabel,OutputPin_ReadExtentActionResultNameLabel,OutputPin_ReadExtentActionResultStereotypeLabel,ReclassifyObjectAction_NameLabel,ReclassifyObjectAction_FloatingNameLabel,InputPin_ReclassifyObjectActionObjectNameLabel,InputPin_ReclassifyObjectActionObjectStereotypeLabel,ValuePin_ReclassifyObjectActionObjectNameLabel,ValuePin_ReclassifyObjectActionObjectValueLabel,ValuePin_ReclassifyObjectActionObjectStereotypeLabel,ActionInputPin_ReclassifyObjectActionObjectNameLabel,ActionInputPin_ReclassifyObjectActionObjectValueLabel,ActionInputPin_ReclassifyObjectActionObjectStereotypeLabel,ReadIsClassifiedObjectAction_NameLabel,ReadIsClassifiedObjectAction_FloatingNameLabel,OutputPin_ReadIsClassifiedObjectActionResultNameLabel,OutputPin_ReadIsClassifiedObjectActionResultStereotypeLabel,InputPin_ReadIsClassifiedObjectActionObjectNameLabel,InputPin_ReadIsClassifiedObjectActionObjectStereotypeLabel,ValuePin_ReadIsClassifiedObjectActionObjectNameLabel,ValuePin_ReadIsClassifiedObjectActionObjectValueLabel,ValuePin_ReadIsClassifiedObjectActionObjectStereotypeLabel,ActionInputPin_ReadIsClassifiedObjectActionObjectNameLabel,ActionInputPin_ReadIsClassifiedObjectActionObjectValueLabel,ActionInputPin_ReadIsClassifiedObjectActionObjectStereotypeLabel,ReduceAction_NameLabel,ReduceAction_FloatingNameLabel,OutputPin_ReduceActionResultNameLabel,OutputPin_ReduceActionResultStereotypeLabel,InputPin_ReduceActionCollectionNameLabel,InputPin_ReduceActionCollectionStereotypeLabel,ValuePin_ReduceActionCollectionNameLabel,ValuePin_ReduceActionCollectionValueLabel,ValuePin_ReduceActionCollectionStereotypeLabel,ActionInputPin_ReduceActionCollectionNameLabel,ActionInputPin_ReduceActionCollectionValueLabel,ActionInputPin_ReduceActionCollectionStereotypeLabel,StartClassifierBehaviorAction_NameLabel,StartClassifierBehaviorAction_FloatingNameLabel,InputPin_StartClassifierBehaviorActionObjectNameLabel,InputPin_StartClassifierBehaviorActionObjectStereotypeLabel,ValuePin_StartClassifierBehaviorActionObjectNameLabel,ValuePin_StartClassifierBehaviorActionObjectValueLabel,ValuePin_StartClassifierBehaviorActionObjectStereotypeLabel,ActionInputPin_StartClassifierBehaviorActionObjectNameLabel,ActionInputPin_StartClassifierBehaviorActionObjectValueLabel,ActionInputPin_StartClassifierBehaviorActionObjectStereotypeLabel,CreateLinkObjectAction_NameLabel,CreateLinkObjectAction_FloatingNameLabel,InputPin_CreateLinkObjectActionInputNameLabel,InputPin_CreateLinkObjectActionInputStereotypeLabel,ValuePin_CreateLinkObjectActionInputNameLabel,ValuePin_CreateLinkObjectActionInputValueLabel,ValuePin_CreateLinkObjectActionInputStereotypeLabel,ActionInputPin_CreateLinkObjectActionInputNameLabel,ActionInputPin_CreateLinkObjectActionInputValueLabel,ActionInputPin_CreateLinkObjectActionInputStereotypeLabel,OutputPin_CreateLinkObjectActionResultNameLabel,OutputPin_CreateLinkObjectActionResultStereotypeLabel,UnmarshallAction_NameLabel,UnmarshallAction_FloatingNameLabel,InputPin_UnmarshallActionObjectNameLabel,InputPin_UnmarshallActionObjectStereotypeLabel,ValuePin_UnmarshallActionObjectNameLabel,ValuePin_UnmarshallActionObjectValueLabel,ValuePin_UnmarshallActionObjectStereotypeLabel,ActionInputPin_UnmarshallActionObjectNameLabel,ActionInputPin_UnmarshallActionObjectValueLabel,ActionInputPin_UnmarshallActionObjectStereotypeLabel,OutputPin_UnmarshallActionResultNameLabel,OutputPin_UnmarshallActionResultStereotypeLabel"/>
-         </object>
-         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-compartments">
-            <method name="getType()" value="Activity_ParameterCompartment,Activity_PreconditionCompartment,Activity_PostconditionCompartment,Activity_ActivityNodeCompartment,ConditionalNode_ActivityNodeCompartment,ExpansionRegion_ActivityNodeCompartment,LoopNode_ActivityNodeCompartment,SequenceNode_ActivityNodeCompartment,StructuredActivityNode_ActivityNodeCompartment,ActivityPartition_ActivityNodeCompartment,InterruptibleActivityRegion_ActivityNodeCompartment,Activity_ParameterCompartment_CN,Activity_PreconditionCompartment_CN,Activity_PostconditionCompartment_CN,Activity_ActivityNodeCompartment_CN"/>
-         </object>
-         <context views="generated-diagram,generated-nodes,generated-links,generated-labels,generated-compartments"/>
-      </editpartProvider>
-   </extension>
+	      <?gmfgen generated="true"?>
+	      <editpartProvider class="org.eclipse.papyrus.uml.diagram.activity.providers.UMLEditPartProvider">
+	         <Priority name="Lowest"/>
+	         <object class="org.eclipse.gmf.runtime.notation.Diagram" id="generated-diagram">
+	            <method name="getType()" value="PapyrusUMLActivityDiagram"/>
+	         </object>
+	         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-nodes">
+	            <method name="getType()" value="Activity_Shape,Parameter_ParameterLabel,Constraint_PreconditionLabel,Constraint_PostconditionLabel,InitialNode_Shape,ActivityFinalNode_Shape,FlowFinalNode_Shape,OpaqueAction_Shape,ValuePin_OpaqueActionInputShape,ActionInputPin_OpaqueActionInputShape,InputPin_OpaqueActionInputShape,OutputPin_OpaqueActionOutputShape,CallBehaviorAction_Shape,ValuePin_CallBehaviorActionArgumentShape,ActionInputPin_CallBehaviorActionArgumentShape,InputPin_CallBehaviorActionArgumentShape,OutputPin_CallBehaviorActionResultShape,CallOperationAction_Shape,ActionInputPin_CallOperationActionArgumentShape,ValuePin_CallOperationActionArgumentShape,InputPin_CallOperationActionArgumentShape,OutputPin_CallOperationActionResultShape,ValuePin_CallOperationActionTargetShape,ActionInputPin_CallOperationActionTargetShape,InputPin_CallOperationActionTargetShape,DurationConstraint_LocalPreconditionShape,DurationConstraint_LocalPostconditionShape,TimeConstraint_LocalPreconditionShape,TimeConstraint_LocalPostconditionShape,IntervalConstraint_LocalPreconditionShape,IntervalConstraint_LocalPostconditionShape,Constraint_LocalPreconditionShape,Constraint_LocalPostconditionShape,DecisionNode_Shape,MergeNode_Shape,ForkNode_Shape,JoinNode_Shape,DataStoreNode_Shape,SendObjectAction_Shape,ValuePin_SendObjectActionRequestShape,ActionInputPin_SendObjectActionRequestShape,InputPin_SendObjectActionRequestShape,ValuePin_SendObjectActionTargetShape,ActionInputPin_SendObjectActionTargetShape,InputPin_SendObjectActionTargetShape,SendSignalAction_Shape,ActionInputPin_SendSignalActionArgumentShape,ValuePin_SendSignalActionArgumentShape,InputPin_SendSignalActionArgumentShape,ValuePin_SendSignalActionTargetShape,ActionInputPin_SendSignalActionTargetShape,InputPin_SendSignalActionTargetShape,ActivityParameterNode_Shape,AcceptEventAction_Shape,OutputPin_AcceptEventActionResultShape,ValueSpecificationAction_Shape,OutputPin_ValueSpecificationActionResultShape,ConditionalNode_Shape,ExpansionRegion_Shape,ExpansionNode_InputShape,ExpansionNode_OutputShape,LoopNode_Shape,InputPin_LoopNodeVariableInputShape,ValuePin_LoopNodeVariableInputShape,ActionInputPin_LoopNodeVariableInputShape,OutputPin_LoopNodeBodyOutputShape,OutputPin_LoopNodeVariableShape,OutputPin_LoopNodeResultShape,SequenceNode_Shape,StructuredActivityNode_Shape,InputPin_StructuredActivityNodeInputShape,ValuePin_StructuredActivityNodeInputShape,ActionInputPin_StructuredActivityNodeInputShape,OutputPin_StructuredActivityNodeOutputShape,ActivityPartition_Shape,InterruptibleActivityRegion_Shape,Comment_Shape,ReadSelfAction_Shape,OutputPin_ReadSelfActionResultShape,Activity_Shape_CN,CreateObjectAction_Shape,OutputPin_CreateObjectActionResultShape,NamedElement_DefaultShape,ReadStructuralFeatureAction_Shape,InputPin_ReadStructuralFeatureActionObjectShape,ValuePin_ReadStructuralFeatureActionObjectShape,ActionInputPin_ReadStructuralFeatureActionObjectShape,OutputPin_ReadStructuralFeatureActionResultShape,AddStructuralFeatureValueAction_Shape,InputPin_AddStructuralFeatureValueActionObjectShape,InputPin_AddStructuralFeatureValueActionValueShape,InputPin_AddStructuralFeatureValueActionInsertAtShape,ValuePin_AddStructuralFeatureValueActionObjectShape,ValuePin_AddStructuralFeatureValueActionValueShape,ValuePin_AddStructuralFeatureValueActionInsertAtShape,ActionInputPin_AddStructuralFeatureValueActionObjectShape,ActionInputPin_AddStructuralFeatureValueActionValueShape,ActionInputPin_AddStructuralFeatureValueActionInsertAtShape,OutputPin_AddStructuralFeatureValueActionResultShape,DestroyObjectAction_Shape,InputPin_DestroyObjectActionTargetShape,ValuePin_DestroyObjectActionTargetShape,ActionInputPin_DestroyObjectActionTargetShape,ReadVariableAction_Shape,OutputPin_ReadVariableActionResultShape,AddVariableValueAction_Shape,InputPin_AddVariableValueActionInsertAtShape,InputPin_AddVariableValueActionValueShape,ValuePin_AddVariableValueActionInsertAtShape,ValuePin_AddVariableValueActionValueShape,ActionInputPin_AddVariableValueActionInsertAtShape,ActionInputPin_AddVariableValueActionValueShape,BroadcastSignalAction_Shape,InputPin_BroadcastSignalActionArgumentShape,ValuePin_BroadcastSignalActionArgumentShape,ActionInputPin_BroadcastSignalActionArgumentShape,CentralBufferNode_Shape,Constraint_Shape,StartObjectBehaviorAction_Shape,OutputPin_StartObjectBehaviorActionResultShape,InputPin_StartObjectBehaviorActionObjectShape,ValuePin_StartObjectBehaviorActionObjectShape,ActionInputPin_StartObjectBehaviorActionObjectShape,InputPin_StartObjectBehaviorActionArgumentShape,ValuePin_StartObjectBehaviorActionArgumentShape,ActionInputPin_StartObjectBehaviorActionArgumentShape,TestIdentityAction_Shape,OutputPin_TestIdentityActionResultShape,InputPin_TestIdentityActionFirstShape,InputPin_TestIdentityActionSecondShape,ValuePin_TestIdentityActionFirstShape,ValuePin_TestIdentityActionSecondShape,ActionInputPin_TestIdentityActionFirstShape,ActionInputPin_TestIdentityActionSecondShape,ClearStructuralFeatureAction_Shape,OutputPin_ClearStructuralFeatureActionResultShape,InputPin_ClearStructuralFeatureActionObjectShape,ValuePin_ClearStructuralFeatureActionObjectShape,ActionInputPin_ClearStructuralFeatureActionObjectShape,CreateLinkAction_Shape,InputPin_CreateLinkActionInputShape,ValuePin_CreateLinkActionInputShape,ActionInputPin_CreateLinkActionInputShape,ReadLinkAction_Shape,OutputPin_ReadLinkActionResultShape,InputPin_ReadLinkActionInputShape,ValuePin_ReadLinkActionInputShape,ActionInputPin_ReadLinkActionInputShape,DestroyLinkAction_Shape,InputPin_DestroyLinkActionInputShape,ValuePin_DestroyLinkActionInputShape,ActionInputPin_DestroyLinkActionInputShape,ClearAssociationAction_Shape,InputPin_ClearAssociationActionObjectShape,ValuePin_ClearAssociationActionObjectShape,ActionInputPin_ClearAssociationActionObjectShape,ReadExtentAction_Shape,OutputPin_ReadExtentActionResultShape,ReclassifyObjectAction_Shape,InputPin_ReclassifyObjectActionObjectShape,ValuePin_ReclassifyObjectActionObjectShape,ActionInputPin_ReclassifyObjectActionObjectShape,ReadIsClassifiedObjectAction_Shape,OutputPin_ReadIsClassifiedObjectActionResultShape,InputPin_ReadIsClassifiedObjectActionObjectShape,ValuePin_ReadIsClassifiedObjectActionObjectShape,ActionInputPin_ReadIsClassifiedObjectActionObjectShape,ReduceAction_Shape,OutputPin_ReduceActionResultShape,InputPin_ReduceActionCollectionShape,ValuePin_ReduceActionCollectionShape,ActionInputPin_ReduceActionCollectionShape,StartClassifierBehaviorAction_Shape,InputPin_StartClassifierBehaviorActionObjectShape,ValuePin_StartClassifierBehaviorActionObjectShape,ActionInputPin_StartClassifierBehaviorActionObjectShape,CreateLinkObjectAction_Shape,InputPin_CreateLinkObjectActionInputShape,ValuePin_CreateLinkObjectActionInputShape,ActionInputPin_CreateLinkObjectActionInputShape,OutputPin_CreateLinkObjectActionResultShape,UnmarshallAction_Shape,InputPin_UnmarshallActionObjectShape,ValuePin_UnmarshallActionObjectShape,ActionInputPin_UnmarshallActionObjectShape,OutputPin_UnmarshallActionResultShape"/>
+	         </object>
+	         <object class="org.eclipse.gmf.runtime.notation.Edge" id="generated-links">
+	            <method name="getType()" value="Action_LocalPreconditionEdge,Action_LocalPostconditionEdge,ObjectFlow_Edge,ControlFlow_Edge,ExceptionHandler_Edge,Comment_AnnotatedElementEdge,Constraint_ConstrainedElementEdge"/>
+	         </object>
+	         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-labels">
+	            <method name="getType()" value="Activity_NameLabel,Activity_KeywordLabel,InitialNode_FloatingNameLabel,InitialNode_StereotypeLabel,ActivityFinalNode_FloatingNameLabel,ActivityFinalNode_StereotypeLabel,FlowFinalNode_FloatingNameLabel,FlowFinalNode_StereotypeLabel,OpaqueAction_NameLabel,OpaqueAction_FloatingNameLabel,ValuePin_OpaqueActionInputNameLabel,ValuePin_OpaqueActionInputValueLabel,ValuePin_OpaqueActionInputStereotypeLabel,ActionInputPin_OpaqueActionInputNameLabel,ActionInputPin_OpaqueActionInputValueLabel,ActionInputPin_OpaqueActionInputStereotypeLabel,InputPin_OpaqueActionInputNameLabel,InputPin_OpaqueActionInputStereotypeLabel,OutputPin_OpaqueActionOutputNameLabel,OutputPin_OpaqueActionOutputStereotypeLabel,CallBehaviorAction_NameLabel,CallBehaviorAction_FloatingNameLabel,ValuePin_CallBehaviorActionArgumentNameLabel,ValuePin_CallBehaviorActionArgumentValueLabel,ValuePin_CallBehaviorActionArgumentStereotypeLabel,ActionInputPin_CallBehaviorActionArgumentNameLabel,ActionInputPin_CallBehaviorActionArgumentValueLabel,ActionInputPin_CallBehaviorActionArgumentStereotypeLabel,InputPin_CallBehaviorActionArgumentNameLabel,InputPin_CallBehaviorActionArgumentStereotypeLabel,OutputPin_CallBehaviorActionResultNameLabel,OutputPin_CallBehaviorActionResultStereotypeLabel,CallOperationAction_NameLabel,CallOperationAction_FloatingNameLabel,ActionInputPin_CallOperationActionArgumentNameLabel,ActionInputPin_CallOperationActionArgumentValueLabel,ActionInputPin_CallOperationActionArgumentStereotypeLabel,ValuePin_CallOperationActionArgumentNameLabel,ValuePin_CallOperationActionArgumentValueLabel,ValuePin_CallOperationActionArgumentStereotypeLabel,InputPin_CallOperationActionArgumentNameLabel,InputPin_CallOperationActionArgumentStereotypeLabel,OutputPin_CallOperationActionResultNameLabel,OutputPin_CallOperationActionResultStereotypeLabel,ValuePin_CallOperationActionTargetNameLabel,ValuePin_CallOperationActionTargetValueLabel,ValuePin_CallOperationActionTargetStereotypeLabel,ActionInputPin_CallOperationActionTargetNameLabel,ActionInputPin_CallOperationActionTargetValueLabel,ActionInputPin_CallOperationActionTargetStereotypeLabel,InputPin_CallOperationActionTargetNameLabel,InputPin_CallOperationActionTargetStereotypeLabel,DurationConstraint_LocalPreconditionNameLabel,DurationConstraint_LocalPreconditionBodyLabel,DurationConstraint_LocalPostconditionNameLabel,DurationConstraint_LocalPostconditionBodyLabel,TimeConstraint_LocalPreconditionNameLabel,TimeConstraint_LocalPreconditionBodyLabel,TimeConstraint_LocalPostconditionNameLabel,TimeConstraint_LocalPostconditionBodyLabel,IntervalConstraint_LocalPreconditionNameLabel,IntervalConstraint_LocalPreconditionBodyLabel,IntervalConstraint_LocalPostconditionNameLabel,IntervalConstraint_LocalPostconditionBodyLabel,Constraint_LocalPreconditionNameLabel,Constraint_LocalPreconditionBodyLabel,Constraint_LocalPostconditionNameLabel,Constraint_LocalPostconditionBodyLabel,DecisionNode_FloatingNameLabel,DecisionNode_DecisionInputLabel,DecisionNode_StereotypeLabel,MergeNode_FloatingNameLabel,MergeNode_StereotypeLabel,ForkNode_FloatingNameLabel,ForkNode_StereotypeLabel,JoinNode_FloatingNameLabel,JoinNode_JoinSpecLabel,JoinNode_StereotypeLabel,DataStoreNode_NameLabel,DataStoreNode_SelectionLabel,DataStoreNode_FloatingNameLabel,SendObjectAction_NameLabel,SendObjectAction_FloatingNameLabel,ValuePin_SendObjectActionRequestNameLabel,ValuePin_SendObjectActionRequestValueLabel,ValuePin_SendObjectActionRequestStereotypeLabel,ActionInputPin_SendObjectActionRequestNameLabel,ActionInputPin_SendObjectActionRequestValueLabel,ActionInputPin_SendObjectActionRequestStereotypeLabel,InputPin_SendObjectActionRequestNameLabel,InputPin_SendObjectActionRequestStereotypeLabel,ValuePin_SendObjectActionTargetNameLabel,ValuePin_SendObjectActionTargetValueLabel,ValuePin_SendObjectActionTargetStereotypeLabel,ActionInputPin_SendObjectActionTargetNameLabel,ActionInputPin_SendObjectActionTargetValueLabel,ActionInputPin_SendObjectActionTargetStereotypeLabel,InputPin_SendObjectActionTargetNameLabel,InputPin_SendObjectActionTargetStereotypeLabel,SendSignalAction_NameLabel,SendSignalAction_FloatingNameLabel,ActionInputPin_SendSignalActionArgumentNameLabel,ActionInputPin_SendSignalActionArgumentValueLabel,ActionInputPin_SendSignalActionArgumentStereotypeLabel,ValuePin_SendSignalActionArgumentNameLabel,ValuePin_SendSignalActionArgumentValueLabel,ValuePin_SendSignalActionArgumentStereotypeLabel,InputPin_SendSignalActionArgumentNameLabel,InputPin_SendSignalActionArgumentStereotypeLabel,ValuePin_SendSignalActionTargetNameLabel,ValuePin_SendSignalActionTargetValueLabel,ValuePin_SendSignalActionTargetStereotypeLabel,ActionInputPin_SendSignalActionTargetNameLabel,ActionInputPin_SendSignalActionTargetValueLabel,ActionInputPin_SendSignalActionTargetStereotypeLabel,InputPin_SendSignalActionTargetNameLabel,InputPin_SendSignalActionTargetStereotypeLabel,ActivityParameterNode_NameLabel,ActivityParameterNode_StreamLabel,ActivityParameterNode_ExceptionLabel,AcceptEventAction_NameLabel,AcceptEventAction_TriggerLabel,AcceptEventAction_StereotypeLabel,AcceptEventAction_FloatingNameLabel,OutputPin_AcceptEventActionResultNameLabel,OutputPin_AcceptEventActionResultStereotypeLabel,ValueSpecificationAction_NameLabel,ValueSpecificationAction_FloatingNameLabel,OutputPin_ValueSpecificationActionResultNameLabel,OutputPin_ValueSpecificationActionResultStereotypeLabel,ConditionalNode_KeywordLabel,ExpansionRegion_KeywordLabel,LoopNode_KeywordLabel,InputPin_LoopNodeVariableInputNameLabel,InputPin_LoopNodeVariableInputStereotypeLabel,ValuePin_LoopNodeVariableInputNameLabel,ValuePin_LoopNodeVariableInputValueLabel,ValuePin_LoopNodeVariableInputStereotypeLabel,ActionInputPin_LoopNodeVariableInputNameLabel,ActionInputPin_LoopNodeVariableInputValueLabel,ActionInputPin_LoopNodeVariableInputStereotypeLabel,OutputPin_LoopNodeBodyOutputNameLabel,OutputPin_LoopNodeBodyOutputStereotypeLabel,OutputPin_LoopNodeVariableNameLabel,OutputPin_LoopNodeVariableStereotypeLabel,OutputPin_LoopNodeResultNameLabel,OutputPin_LoopNodeResultStereotypeLabel,SequenceNode_KeywordLabel,StructuredActivityNode_KeywordLabel,InputPin_StructuredActivityNodeInputNameLabel,InputPin_StructuredActivityNodeInputStereotypeLabel,ValuePin_StructuredActivityNodeInputNameLabel,ValuePin_StructuredActivityNodeInputValueLabel,ValuePin_StructuredActivityNodeInputStereotypeLabel,ActionInputPin_StructuredActivityNodeInputNameLabel,ActionInputPin_StructuredActivityNodeInputValueLabel,ActionInputPin_StructuredActivityNodeInputStereotypeLabel,OutputPin_StructuredActivityNodeOutputNameLabel,OutputPin_StructuredActivityNodeOutputStereotypeLabel,ActivityPartition_NameLabel,ActivityPartition_FloatingNameLabel,Comment_BodyLabel,ReadSelfAction_NameLabel,ReadSelfAction_FloatingNameLabel,OutputPin_ReadSelfActionResultNameLabel,OutputPin_ReadSelfActionResultStereotypeLabel,Activity_NameLabel_CN,Activity_KeywordLabel_CN,CreateObjectAction_NameLabel,CreateObjectAction_FloatingNameLabel,OutputPin_CreateObjectActionResultNameLabel,OutputPin_CreateObjectActionResultStereotypeLabel,NamedElement_NameLabel,ReadStructuralFeatureAction_NameLabel,ReadStructuralFeatureAction_FloatingNameLabel,InputPin_ReadStructuralFeatureActionObjectNameLabel,InputPin_ReadStructuralFeatureActionObjectStereotypeLabel,ValuePin_ReadStructuralFeatureActionObjectNameLabel,ValuePin_ReadStructuralFeatureActionObjectValueLabel,ValuePin_ReadStructuralFeatureActionObjectStereotypeLabel,ActionInputPin_ReadStructuralFeatureActionObjectNameLabel,ActionInputPin_ReadStructuralFeatureActionObjectValueLabel,ActionInputPin_ReadStructuralFeatureActionObjectStereotypeLabel,OutputPin_ReadStructuralFeatureActionResultNameLabel,OutputPin_ReadStructuralFeatureActionResultStereotypeLabel,AddStructuralFeatureValueAction_NameLabel,AddStructuralFeatureValueAction_FloatingNameLabel,InputPin_AddStructuralFeatureValueActionObjectNameLabel,InputPin_AddStructuralFeatureValueActionObjectStereotypeLabel,InputPin_AddStructuralFeatureValueActionValueNameLabel,InputPin_AddStructuralFeatureValueActionValueStereotypeLabel,InputPin_AddStructuralFeatureValueActionInsertAtNameLabel,InputPin_AddStructuralFeatureValueActionInsertAtStereotypeLabel,ValuePin_AddStructuralFeatureValueActionObjectNameLabel,ValuePin_AddStructuralFeatureValueActionObjectValueLabel,ValuePin_AddStructuralFeatureValueActionObjectStereotypeLabel,ValuePin_AddStructuralFeatureValueActionValueNameLabel,ValuePin_AddStructuralFeatureValueActionValueValueLabel,ValuePin_AddStructuralFeatureValueActionValueStereotypeLabel,ValuePin_AddStructuralFeatureValueActionInsertAtNameLabel,ValuePin_AddStructuralFeatureValueActionInsertAtValueLabel,ValuePin_AddStructuralFeatureValueActionInsertAtStereotypeLabel,ActionInputPin_AddStructuralFeatureValueActionObjectNameLabel,ActionInputPin_AddStructuralFeatureValueActionObjectValueLabel,ActionInputPin_AddStructuralFeatureValueActionObjectStereotypeLabel,ActionInputPin_AddStructuralFeatureValueActionValueNameLabel,ActionInputPin_AddStructuralFeatureValueActionValueValueLabel,ActionInputPin_AddStructuralFeatureValueActionValueStereotypeLabel,ActionInputPin_AddStructuralFeatureValueActionInsertAtNameLabel,ActionInputPin_AddStructuralFeatureValueActionInsertAtValueLabel,ActionInputPin_AddStructuralFeatureValueActionInsertAtStereotypeLabel,OutputPin_AddStructuralFeatureValueActionResultNameLabel,OutputPin_AddStructuralFeatureValueActionResultStereotypeLabel,DestroyObjectAction_NameLabel,DestroyObjectAction_FloatingNameLabel,InputPin_DestroyObjectActionTargetNameLabel,InputPin_DestroyObjectActionTargetStereotypeLabel,ValuePin_DestroyObjectActionTargetNameLabel,ValuePin_DestroyObjectActionTargetValueLabel,ValuePin_DestroyObjectActionTargetStereotypeLabel,ActionInputPin_DestroyObjectActionTargetNameLabel,ActionInputPin_DestroyObjectActionTargetValueLabel,ActionInputPin_DestroyObjectActionTargetStereotypeLabel,ReadVariableAction_NameLabel,ReadVariableAction_FloatingNameLabel,OutputPin_ReadVariableActionResultNameLabel,OutputPin_ReadVariableActionResultStereotypeLabel,AddVariableValueAction_NameLabel,AddVariableValueAction_FloatingNameLabel,InputPin_AddVariableValueActionInsertAtNameLabel,InputPin_AddVariableValueActionInsertAtStereotypeLabel,InputPin_AddVariableValueActionValueNameLabel,InputPin_AddVariableValueActionValueStereotypeLabel,ValuePin_AddVariableValueActionInsertAtNameLabel,ValuePin_AddVariableValueActionInsertAtValueLabel,ValuePin_AddVariableValueActionInsertAtStereotypeLabel,ValuePin_AddVariableValueActionValueNameLabel,ValuePin_AddVariableValueActionValueValueLabel,ValuePin_AddVariableValueActionValueStereotypeLabel,ActionInputPin_AddVariableValueActionInsertAtNameLabel,ActionInputPin_AddVariableValueActionInsertAtValueLabel,ActionInputPin_AddVariableValueActionInsertAtStereotypeLabel,ActionInputPin_AddVariableValueActionValueNameLabel,ActionInputPin_AddVariableValueActionValueValueLabel,ActionInputPin_AddVariableValueActionValueStereotypeLabel,BroadcastSignalAction_NameLabel,BroadcastSignalAction_FloatingNameLabel,InputPin_BroadcastSignalActionArgumentNameLabel,InputPin_BroadcastSignalActionArgumentValueLabel,InputPin_BroadcastSignalActionArgumentStereotypeLabel,ValuePin_BroadcastSignalActionArgumentNameLabel,ValuePin_BroadcastSignalActionArgumentValueLabel,ValuePin_BroadcastSignalActionArgumentStereotypeLabel,ActionInputPin_BroadcastSignalActionArgumentNameLabel,ActionInputPin_BroadcastSignalActionArgumentValueLabel,ActionInputPin_BroadcastSignalActionArgumentStereotypeLabel,CentralBufferNode_NameLabel,CentralBufferNode_SelectionLabel,CentralBufferNode_FloatingNameLabel,Constraint_NameLabel,Constraint_BodyLabel,StartObjectBehaviorAction_NameLabel,StartObjectBehaviorAction_FloatingNameLabel,OutputPin_StartObjectBehaviorActionResultNameLabel,OutputPin_StartObjectBehaviorActionResultStereotypeLabel,InputPin_StartObjectBehaviorActionObjectNameLabel,InputPin_StartObjectBehaviorActionObjectStereotypeLabel,ValuePin_StartObjectBehaviorActionObjectNameLabel,ValuePin_StartObjectBehaviorActionObjectValueLabel,ValuePin_StartObjectBehaviorActionObjectStereotypeLabel,ActionInputPin_StartObjectBehaviorActionObjectNameLabel,ActionInputPin_StartObjectBehaviorActionObjectValueLabel,ActionInputPin_StartObjectBehaviorActionObjectStereotypeLabel,InputPin_StartObjectBehaviorActionArgumentNameLabel,InputPin_StartObjectBehaviorActionArgumentStereotypeLabel,ValuePin_StartObjectBehaviorActionArgumentNameLabel,ValuePin_StartObjectBehaviorActionArgumentValueLabel,ValuePin_StartObjectBehaviorActionArgumentStereotypeLabel,ActionInputPin_StartObjectBehaviorActionArgumentNameLabel,ActionInputPin_StartObjectBehaviorActionArgumentValueLabel,ActionInputPin_StartObjectBehaviorActionArgumentStereotypeLabel,TestIdentityAction_NameLabel,TestIdentityAction_FloatingNameLabel,OutputPin_TestIdentityActionResultNameLabel,OutputPin_TestIdentityActionResultStereotypeLabel,InputPin_TestIdentityActionFirstNameLabel,InputPin_TestIdentityActionFirstStereotypeLabel,InputPin_TestIdentityActionSecondNameLabel,InputPin_TestIdentityActionSecondStereotypeLabel,ValuePin_TestIdentityActionFirstNameLabel,ValuePin_TestIdentityActionFirstValueLabel,ValuePin_TestIdentityActionFirstStereotypeLabel,ValuePin_TestIdentityActionSecondNameLabel,ValuePin_TestIdentityActionSecondValueLabel,ValuePin_TestIdentityActionSecondStereotypeLabel,ActionInputPin_TestIdentityActionFirstNameLabel,ActionInputPin_TestIdentityActionFirstValueLabel,ActionInputPin_TestIdentityActionFirstStereotypeLabel,ActionInputPin_TestIdentityActionSecondNameLabel,ActionInputPin_TestIdentityActionSecondValueLabel,ActionInputPin_TestIdentityActionSecondStereotypeLabel,ClearStructuralFeatureAction_NameLabel,ClearStructuralFeatureAction_FloatingNameLabel,OutputPin_ClearStructuralFeatureActionResultNameLabel,OutputPin_ClearStructuralFeatureActionResultStereotypeLabel,InputPin_ClearStructuralFeatureActionObjectNameLabel,InputPin_ClearStructuralFeatureActionObjectStereotypeLabel,ValuePin_ClearStructuralFeatureActionObjectNameLabel,ValuePin_ClearStructuralFeatureActionObjectValueLabel,ValuePin_ClearStructuralFeatureActionObjectStereotypeLabel,ActionInputPin_ClearStructuralFeatureActionObjectNameLabel,ActionInputPin_ClearStructuralFeatureActionObjectValueLabel,ActionInputPin_ClearStructuralFeatureActionObjectStereotypeLabel,CreateLinkAction_NameLabel,CreateLinkAction_FloatingNameLabel,InputPin_CreateLinkActionInputNameLabel,InputPin_CreateLinkActionInputStereotypeLabel,ValuePin_CreateLinkActionInputNameLabel,ValuePin_CreateLinkActionInputValueLabel,ValuePin_CreateLinkActionInputStereotypeLabel,ActionInputPin_CreateLinkActionInputNameLabel,ActionInputPin_CreateLinkActionInputValueLabel,ActionInputPin_CreateLinkActionInputStereotypeLabel,ReadLinkAction_NameLabel,ReadLinkAction_FloatingNameLabel,OutputPin_ReadLinkActionResultNameLabel,OutputPin_ReadLinkActionResultStereotypeLabel,InputPin_ReadLinkActionInputNameLabel,InputPin_ReadLinkActionInputStereotypeLabel,ValuePin_ReadLinkActionInputNameLabel,ValuePin_ReadLinkActionInputValueLabel,ValuePin_ReadLinkActionInputStereotypeLabel,ActionInputPin_ReadLinkActionInputNameLabel,ActionInputPin_ReadLinkActionInputValueLabel,ActionInputPin_ReadLinkActionInputStereotypeLabel,DestroyLinkAction_NameLabel,DestroyLinkAction_FloatingNameLabel,InputPin_DestroyLinkActionInputNameLabel,InputPin_DestroyLinkActionInputStereotypeLabel,ValuePin_DestroyLinkActionInputNameLabel,ValuePin_DestroyLinkActionInputValueLabel,ValuePin_DestroyLinkActionInputStereotypeLabel,ActionInputPin_DestroyLinkActionInputNameLabel,ActionInputPin_DestroyLinkActionInputValueLabel,ActionInputPin_DestroyLinkActionInputStereotypeLabel,ClearAssociationAction_NameLabel,ClearAssociationAction_FloatingNameLabel,InputPin_ClearAssociationActionObjectNameLabel,InputPin_ClearAssociationActionObjectStereotypeLabel,ValuePin_ClearAssociationActionObjectNameLabel,ValuePin_ClearAssociationActionObjectValueLabel,ValuePin_ClearAssociationActionObjectStereotypeLabel,ActionInputPin_ClearAssociationActionObjectNameLabel,ActionInputPin_ClearAssociationActionObjectValueLabel,ActionInputPin_ClearAssociationActionObjectStereotypeLabel,ReadExtentAction_NameLabel,ReadExtentAction_FloatingNameLabel,OutputPin_ReadExtentActionResultNameLabel,OutputPin_ReadExtentActionResultStereotypeLabel,ReclassifyObjectAction_NameLabel,ReclassifyObjectAction_FloatingNameLabel,InputPin_ReclassifyObjectActionObjectNameLabel,InputPin_ReclassifyObjectActionObjectStereotypeLabel,ValuePin_ReclassifyObjectActionObjectNameLabel,ValuePin_ReclassifyObjectActionObjectValueLabel,ValuePin_ReclassifyObjectActionObjectStereotypeLabel,ActionInputPin_ReclassifyObjectActionObjectNameLabel,ActionInputPin_ReclassifyObjectActionObjectValueLabel,ActionInputPin_ReclassifyObjectActionObjectStereotypeLabel,ReadIsClassifiedObjectAction_NameLabel,ReadIsClassifiedObjectAction_FloatingNameLabel,OutputPin_ReadIsClassifiedObjectActionResultNameLabel,OutputPin_ReadIsClassifiedObjectActionResultStereotypeLabel,InputPin_ReadIsClassifiedObjectActionObjectNameLabel,InputPin_ReadIsClassifiedObjectActionObjectStereotypeLabel,ValuePin_ReadIsClassifiedObjectActionObjectNameLabel,ValuePin_ReadIsClassifiedObjectActionObjectValueLabel,ValuePin_ReadIsClassifiedObjectActionObjectStereotypeLabel,ActionInputPin_ReadIsClassifiedObjectActionObjectNameLabel,ActionInputPin_ReadIsClassifiedObjectActionObjectValueLabel,ActionInputPin_ReadIsClassifiedObjectActionObjectStereotypeLabel,ReduceAction_NameLabel,ReduceAction_FloatingNameLabel,OutputPin_ReduceActionResultNameLabel,OutputPin_ReduceActionResultStereotypeLabel,InputPin_ReduceActionCollectionNameLabel,InputPin_ReduceActionCollectionStereotypeLabel,ValuePin_ReduceActionCollectionNameLabel,ValuePin_ReduceActionCollectionValueLabel,ValuePin_ReduceActionCollectionStereotypeLabel,ActionInputPin_ReduceActionCollectionNameLabel,ActionInputPin_ReduceActionCollectionValueLabel,ActionInputPin_ReduceActionCollectionStereotypeLabel,StartClassifierBehaviorAction_NameLabel,StartClassifierBehaviorAction_FloatingNameLabel,InputPin_StartClassifierBehaviorActionObjectNameLabel,InputPin_StartClassifierBehaviorActionObjectStereotypeLabel,ValuePin_StartClassifierBehaviorActionObjectNameLabel,ValuePin_StartClassifierBehaviorActionObjectValueLabel,ValuePin_StartClassifierBehaviorActionObjectStereotypeLabel,ActionInputPin_StartClassifierBehaviorActionObjectNameLabel,ActionInputPin_StartClassifierBehaviorActionObjectValueLabel,ActionInputPin_StartClassifierBehaviorActionObjectStereotypeLabel,CreateLinkObjectAction_NameLabel,CreateLinkObjectAction_FloatingNameLabel,InputPin_CreateLinkObjectActionInputNameLabel,InputPin_CreateLinkObjectActionInputStereotypeLabel,ValuePin_CreateLinkObjectActionInputNameLabel,ValuePin_CreateLinkObjectActionInputValueLabel,ValuePin_CreateLinkObjectActionInputStereotypeLabel,ActionInputPin_CreateLinkObjectActionInputNameLabel,ActionInputPin_CreateLinkObjectActionInputValueLabel,ActionInputPin_CreateLinkObjectActionInputStereotypeLabel,OutputPin_CreateLinkObjectActionResultNameLabel,OutputPin_CreateLinkObjectActionResultStereotypeLabel,UnmarshallAction_NameLabel,UnmarshallAction_FloatingNameLabel,InputPin_UnmarshallActionObjectNameLabel,InputPin_UnmarshallActionObjectStereotypeLabel,ValuePin_UnmarshallActionObjectNameLabel,ValuePin_UnmarshallActionObjectValueLabel,ValuePin_UnmarshallActionObjectStereotypeLabel,ActionInputPin_UnmarshallActionObjectNameLabel,ActionInputPin_UnmarshallActionObjectValueLabel,ActionInputPin_UnmarshallActionObjectStereotypeLabel,OutputPin_UnmarshallActionResultNameLabel,OutputPin_UnmarshallActionResultStereotypeLabel"/>
+	         </object>
+	         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-compartments">
+	            <method name="getType()" value="Activity_ParameterCompartment,Activity_PreconditionCompartment,Activity_PostconditionCompartment,Activity_ActivityNodeCompartment,ConditionalNode_ActivityNodeCompartment,ExpansionRegion_ActivityNodeCompartment,LoopNode_ActivityNodeCompartment,SequenceNode_ActivityNodeCompartment,StructuredActivityNode_ActivityNodeCompartment,ActivityPartition_ActivityNodeCompartment,InterruptibleActivityRegion_ActivityNodeCompartment,Activity_ParameterCompartment_CN,Activity_PreconditionCompartment_CN,Activity_PostconditionCompartment_CN,Activity_ActivityNodeCompartment_CN"/>
+	         </object>
+	         <context views="generated-diagram,generated-nodes,generated-links,generated-labels,generated-compartments"/>
+	      </editpartProvider>
+	   </extension>
 
    
    <extension point="org.eclipse.gmf.runtime.common.ui.services.iconProviders" id="icon-provider">
-      <?gmfgen generated="true"?>
-      <IconProvider class="org.eclipse.papyrus.uml.diagram.activity.providers.UMLIconProvider">
-         <Priority name="Low"/>
-      </IconProvider>
-   </extension>
+	      <?gmfgen generated="true"?>
+	      <IconProvider class="org.eclipse.papyrus.uml.diagram.activity.providers.UMLIconProvider">
+	         <Priority name="Low"/>
+	      </IconProvider>
+	   </extension>
 
    <extension point="org.eclipse.gmf.runtime.common.ui.services.parserProviders" id="parser-provider">
-      <?gmfgen generated="true"?>
-      <ParserProvider class="org.eclipse.papyrus.uml.diagram.activity.providers.UMLParserProvider">
-         <Priority name="Lowest"/>
-      </ParserProvider>
-   </extension>
+	      <?gmfgen generated="true"?>
+	      <ParserProvider class="org.eclipse.papyrus.uml.diagram.activity.providers.UMLParserProvider">
+	         <Priority name="Lowest"/>
+	      </ParserProvider>
+	   </extension>
 
 
 	   <extension point="org.eclipse.core.expressions.propertyTesters" id="navigator-proptest.isURIEditorInput">
@@ -2141,12 +2141,12 @@ self.structuralFeature.oclAsType(Property).opposite.type = self.object.type]]>
    </diagramReconciler>
 </extension>
    <extension point="org.eclipse.papyrus.infra.gmfdiag.common.visualTypeProviders">
-      <?gmfgen generated="true"?>
-      <visualTypeProvider
-            class="org.eclipse.papyrus.uml.diagram.activity.providers.UMLVisualTypeProvider"
-            diagramType="PapyrusUMLActivityDiagram">
-         </visualTypeProvider>
-   </extension>
+	      <?gmfgen generated="true"?>
+	      <visualTypeProvider
+	            class="org.eclipse.papyrus.uml.diagram.activity.providers.UMLVisualTypeProvider"
+	            diagramType="PapyrusUMLActivityDiagram">
+	         </visualTypeProvider>
+	   </extension>
 
 
 <extension
@@ -2179,13 +2179,6 @@ self.structuralFeature.oclAsType(Property).opposite.type = self.object.type]]>
 	<?gmfgen generated="false"?>
 	<initializer class="org.eclipse.papyrus.uml.diagram.activity.edit.utils.updater.preferences.AutomatedModelCompletionPreferencesInitializer"/>
 </extension>
-<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings" id="element-types-bindings">
-      <?gmfgen generated="true"?>
-
-<binding context="org.eclipse.papyrus.infra.services.edit.TypeContext">
-         <advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/>
-      </binding>
-   </extension>
 
 
 
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/providers/UMLViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/providers/UMLViewProvider.java
index d01734523ec..df00d0e3f44 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/providers/UMLViewProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/src-gen/org/eclipse/papyrus/uml/diagram/activity/providers/UMLViewProvider.java
@@ -25,6 +25,7 @@ import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;
 import org.eclipse.gmf.runtime.common.core.service.IOperation;
 import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
 import org.eclipse.gmf.runtime.diagram.core.providers.IViewProvider;
+import org.eclipse.gmf.runtime.diagram.core.services.view.CreateChildViewOperation;
 import org.eclipse.gmf.runtime.diagram.core.services.view.CreateDiagramViewOperation;
 import org.eclipse.gmf.runtime.diagram.core.services.view.CreateEdgeViewOperation;
 import org.eclipse.gmf.runtime.diagram.core.services.view.CreateNodeViewOperation;
@@ -76,6 +77,16 @@ public class UMLViewProvider extends AbstractProvider implements IViewProvider {
 			return provides((CreateViewForKindOperation) operation);
 		}
 		assert operation instanceof CreateViewOperation;
+
+		/* we check this view provider is the good one for the currently edited diagram */
+		if (operation instanceof CreateChildViewOperation) {
+			View container = ((CreateChildViewOperation) operation).getContainerView();
+			Diagram diagram = container.getDiagram();
+			if (!getDiagramProvidedId().equals(diagram.getType())) {
+				return false;
+			}
+		}
+
 		if (operation instanceof CreateDiagramViewOperation) {
 			return provides((CreateDiagramViewOperation) operation);
 		} else if (operation instanceof CreateEdgeViewOperation) {