Bug 520828 - [StateMachineDiagram] StateMachine 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: I411b9f238f3cfc0566a662ff9621a4f731508c90
Signed-off-by: Pauline DEVILLE <pauline.deville@cea.fr>

2 files changed, 55 insertions, 57 deletions

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/plugin.xml
index 1513456aec3..4778a07457f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/plugin.xml
@@ -140,52 +140,52 @@
 
 	
    <extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders" id="view-provider">
-      <?gmfgen generated="true"?>
-      <viewProvider class="org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLViewProvider">
-         <Priority name="Lowest"/>
-         <context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="PapyrusUMLStateMachineDiagram"/>
-         <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="StateMachine_Shape,State_Shape_TN,Region_Shape,FinalState_Shape,State_Shape,Pseudostate_InitialShape,Pseudostate_JoinShape,Pseudostate_ForkShape,Pseudostate_ChoiceShape,Pseudostate_JunctionShape,Pseudostate_ShallowHistoryShape,Pseudostate_DeepHistoryShape,Pseudostate_TerminateShape,Pseudostate_EntryPointShape,Pseudostate_ExitPointShape,ConnectionPointReference_Shape,Comment_Shape,Constraint_Shape,Transition_InternalTransitionLabel,Behavior_EntryBehaviorLabel,Behavior_DoActivityBehaviorLabel,Behavior_ExitBehaviorLabel"/>
+	      <?gmfgen generated="true"?>
+	      <viewProvider class="org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLViewProvider">
+	         <Priority name="Lowest"/>
+	         <context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="PapyrusUMLStateMachineDiagram"/>
+	         <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="StateMachine_Shape,State_Shape_TN,Region_Shape,FinalState_Shape,State_Shape,Pseudostate_InitialShape,Pseudostate_JoinShape,Pseudostate_ForkShape,Pseudostate_ChoiceShape,Pseudostate_JunctionShape,Pseudostate_ShallowHistoryShape,Pseudostate_DeepHistoryShape,Pseudostate_TerminateShape,Pseudostate_EntryPointShape,Pseudostate_ExitPointShape,ConnectionPointReference_Shape,Comment_Shape,Constraint_Shape,Transition_InternalTransitionLabel,Behavior_EntryBehaviorLabel,Behavior_DoActivityBehaviorLabel,Behavior_ExitBehaviorLabel"/>
          <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="Transition_Edge,Generalization_Edge,Comment_AnnotatedElementEdge,Constraint_ConstrainedElementEdge,Constraint_ContextEdge"/>
-      </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.statemachine.providers.UMLEditPartProvider">
-         <Priority name="Lowest"/>
-         <object class="org.eclipse.gmf.runtime.notation.Diagram" id="generated-diagram">
-            <method name="getType()" value="PapyrusUMLStateMachineDiagram"/>
-         </object>
-         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-nodes">
-            <method name="getType()" value="StateMachine_Shape,State_Shape_TN,Region_Shape,FinalState_Shape,State_Shape,Pseudostate_InitialShape,Pseudostate_JoinShape,Pseudostate_ForkShape,Pseudostate_ChoiceShape,Pseudostate_JunctionShape,Pseudostate_ShallowHistoryShape,Pseudostate_DeepHistoryShape,Pseudostate_TerminateShape,Pseudostate_EntryPointShape,Pseudostate_ExitPointShape,ConnectionPointReference_Shape,Comment_Shape,Constraint_Shape,Transition_InternalTransitionLabel,Behavior_EntryBehaviorLabel,Behavior_DoActivityBehaviorLabel,Behavior_ExitBehaviorLabel"/>
-         </object>
-         <object class="org.eclipse.gmf.runtime.notation.Edge" id="generated-links">
-            <method name="getType()" value="Transition_Edge,Generalization_Edge,Comment_AnnotatedElementEdge,Constraint_ConstrainedElementEdge,Constraint_ContextEdge"/>
-         </object>
-         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-labels">
-            <method name="getType()" value="StateMachine_NameLabel,State_NameLabel_TN,FinalState_FloatingNameLabel,FinalState_StereotypeLabel,State_NameLabel,State_FloatingNameLabel,Pseudostate_InitialFloatingNameLabel,Pseudostate_InitialStereotypeLabel,Pseudostate_JoinFloatingNameLabel,Pseudostate_JoinStereotypeLabel,Pseudostate_ForkFloatingNameLabel,Pseudostate_ForkStereotypeLabel,Pseudostate_ChoiceFloatingNameLabel,Pseudostate_ChoiceStereotypeLabel,Pseudostate_JunctionFloatingNameLabel,Pseudostate_JunctionStereotypeLabel,Pseudostate_ShallowHistoryFloatingNameLabel,Pseudostate_ShallowHistoryStereotypeLabel,Pseudostate_DeepHistoryFloatingNameLabel,Pseudostate_DeepHistoryStereotypeLabel,Pseudostate_TerminateFloatingNameLabel,Pseudostate_TerminateStereotypeLabel,Pseudostate_EntryPointFloatingNameLabel,Pseudostate_EntryPointStereotypeLabel,Pseudostate_ExitPointFloatingNameLabel,Pseudostate_ExitPointStereotypeLabel,ConnectionPointReference_NameLabel,ConnectionPointReference_StereotypeLabel,Comment_BodyLabel,Constraint_NameLabel,Constraint_BodyLabel"/>
-         </object>
-         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-compartments">
-            <method name="getType()" value="Region_SubvertexCompartment,StateMachine_RegionCompartment,State_RegionCompartment,State_RegionCompartment_TN"/>
-         </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.statemachine.providers.UMLEditPartProvider">
+	         <Priority name="Lowest"/>
+	         <object class="org.eclipse.gmf.runtime.notation.Diagram" id="generated-diagram">
+	            <method name="getType()" value="PapyrusUMLStateMachineDiagram"/>
+	         </object>
+	         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-nodes">
+	            <method name="getType()" value="StateMachine_Shape,State_Shape_TN,Region_Shape,FinalState_Shape,State_Shape,Pseudostate_InitialShape,Pseudostate_JoinShape,Pseudostate_ForkShape,Pseudostate_ChoiceShape,Pseudostate_JunctionShape,Pseudostate_ShallowHistoryShape,Pseudostate_DeepHistoryShape,Pseudostate_TerminateShape,Pseudostate_EntryPointShape,Pseudostate_ExitPointShape,ConnectionPointReference_Shape,Comment_Shape,Constraint_Shape,Transition_InternalTransitionLabel,Behavior_EntryBehaviorLabel,Behavior_DoActivityBehaviorLabel,Behavior_ExitBehaviorLabel"/>
+	         </object>
+	         <object class="org.eclipse.gmf.runtime.notation.Edge" id="generated-links">
+	            <method name="getType()" value="Transition_Edge,Generalization_Edge,Comment_AnnotatedElementEdge,Constraint_ConstrainedElementEdge,Constraint_ContextEdge"/>
+	         </object>
+	         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-labels">
+	            <method name="getType()" value="StateMachine_NameLabel,State_NameLabel_TN,FinalState_FloatingNameLabel,FinalState_StereotypeLabel,State_NameLabel,State_FloatingNameLabel,Pseudostate_InitialFloatingNameLabel,Pseudostate_InitialStereotypeLabel,Pseudostate_JoinFloatingNameLabel,Pseudostate_JoinStereotypeLabel,Pseudostate_ForkFloatingNameLabel,Pseudostate_ForkStereotypeLabel,Pseudostate_ChoiceFloatingNameLabel,Pseudostate_ChoiceStereotypeLabel,Pseudostate_JunctionFloatingNameLabel,Pseudostate_JunctionStereotypeLabel,Pseudostate_ShallowHistoryFloatingNameLabel,Pseudostate_ShallowHistoryStereotypeLabel,Pseudostate_DeepHistoryFloatingNameLabel,Pseudostate_DeepHistoryStereotypeLabel,Pseudostate_TerminateFloatingNameLabel,Pseudostate_TerminateStereotypeLabel,Pseudostate_EntryPointFloatingNameLabel,Pseudostate_EntryPointStereotypeLabel,Pseudostate_ExitPointFloatingNameLabel,Pseudostate_ExitPointStereotypeLabel,ConnectionPointReference_NameLabel,ConnectionPointReference_StereotypeLabel,Comment_BodyLabel,Constraint_NameLabel,Constraint_BodyLabel"/>
+	         </object>
+	         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-compartments">
+	            <method name="getType()" value="Region_SubvertexCompartment,StateMachine_RegionCompartment,State_RegionCompartment,State_RegionCompartment_TN"/>
+	         </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.statemachine.providers.UMLIconProvider">
-         <Priority name="Low"/>
-      </IconProvider>
-   </extension>
+	      <?gmfgen generated="true"?>
+	      <IconProvider class="org.eclipse.papyrus.uml.diagram.statemachine.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.statemachine.providers.UMLParserProvider">
-         <Priority name="Lowest"/>
-      </ParserProvider>
-   </extension>
+	      <?gmfgen generated="true"?>
+	      <ParserProvider class="org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLParserProvider">
+	         <Priority name="Lowest"/>
+	      </ParserProvider>
+	   </extension>
 
    
 	   
@@ -480,12 +480,12 @@
    </diagramReconciler>
 </extension>
    <extension point="org.eclipse.papyrus.infra.gmfdiag.common.visualTypeProviders">
-      <?gmfgen generated="true"?>
-      <visualTypeProvider
-            class="org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLVisualTypeProvider"
-            diagramType="PapyrusUMLStateMachineDiagram">
-         </visualTypeProvider>
-   </extension>
+	      <?gmfgen generated="true"?>
+	      <visualTypeProvider
+	            class="org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLVisualTypeProvider"
+	            diagramType="PapyrusUMLStateMachineDiagram">
+	         </visualTypeProvider>
+	   </extension>
 <extension
       point="org.eclipse.papyrus.infra.hyperlink.hyperlinkContributor">
    <contributor
@@ -495,19 +495,6 @@
          label="Owned state machine hyperlinks">
    </contributor>
 </extension>
-<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings" id="element-types-bindings">
-      <?gmfgen generated="true"?>
-      <clientContext id="org.eclipse.papyrus.uml.diagram.statemachine.TypeContext">
-         <enablement>
-            <test
-               property="org.eclipse.gmf.runtime.emf.core.editingDomain"
-               value="org.eclipse.papyrus.uml.diagram.statemachine.EditingDomain"/>
-         </enablement>
-      </clientContext> 
-      <binding context="org.eclipse.papyrus.uml.diagram.statemachine.TypeContext">
-         <advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/>
-      </binding>
-   </extension>
 
 <extension point="org.eclipse.papyrus.infra.gmfdiag.assistant.modelProviders">
     <modelProvider uri="model/stateMachineDiagram.assistants"/>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src-gen/org/eclipse/papyrus/uml/diagram/statemachine/providers/UMLViewProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src-gen/org/eclipse/papyrus/uml/diagram/statemachine/providers/UMLViewProvider.java
index 6a162421416..d07a33c015b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src-gen/org/eclipse/papyrus/uml/diagram/statemachine/providers/UMLViewProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/src-gen/org/eclipse/papyrus/uml/diagram/statemachine/providers/UMLViewProvider.java
@@ -23,6 +23,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;
@@ -141,6 +142,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) {