436569: [Diagram Version] test that diagram has a version

https://bugs.eclipse.org/bugs/show_bug.cgi?id=436569
Merge branch 'master' of
ssh://ptessier@git.eclipse.org:29418/papyrus/org.eclipse.papyrus

Change-Id: I4426bf3205edf9c1397d2204cf02383fa91c86ce

3 files changed, 12 insertions, 1 deletions

diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/diagram/editparts/LinkLabelEditPart.xtend b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/diagram/editparts/LinkLabelEditPart.xtend
index 0019f97e6b6..92a862615da 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/diagram/editparts/LinkLabelEditPart.xtend
+++ b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/diagram/editparts/LinkLabelEditPart.xtend
@@ -24,7 +24,7 @@ import xpt.Common
 
 
 	override implementsList(GenLinkLabel it) '''
-	implements org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart
+	implements org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart, org.eclipse.papyrus.infra.gmfdiag.common.editpart.IControlParserForDirectEdit
 	«««	BEGIN: PapyrusGenCode
 	«IF it.eResource.allContents.filter(typeof (LabelVisibilityPreference)).filter[v |v.externalNodeLabels.contains(it)].size != 0»
 	, org.eclipse.papyrus.uml.diagram.common.editparts.ILabelRoleProvider
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/model/GenericDiagramFucntion.uml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/model/GenericDiagramFucntion.uml
index d9efef0e539..35cedd02933 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/model/GenericDiagramFucntion.uml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/model/GenericDiagramFucntion.uml
@@ -15,6 +15,7 @@
       <packagedElement xmi:type="uml:Class" xmi:id="_seSb0GP6EeOq0pDGL_YBMA" name="Edit Grid and Ruler Property"/>

       <packagedElement xmi:type="uml:Class" xmi:id="_uKPAQGP6EeOq0pDGL_YBMA" name="Snap To Grid Behavior"/>

       <packagedElement xmi:type="uml:Class" xmi:id="_UzjXQOGuEeO_JM12vRgWBQ" name="DropDromModelExplorer"/>

+      <packagedElement xmi:type="uml:Class" xmi:id="_dQjtQOvJEeOv4v5t8d2cOg" name="DiagramVersion"/>

     </packagedElement>

     <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_V0CKUHaNEeKemeMpJaVA3A">

       <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_V1EsIHaNEeKemeMpJaVA3A" source="http://www.eclipse.org/uml2/2.0.0/UML">

@@ -30,4 +31,5 @@
   <Requirements:Requirement xmi:id="_tDokkGP6EeOq0pDGL_YBMA" text="The user must be able to change the Diagram Viewer properties (Snap To Grid/To Geometry, Show Rulers, Show Grid, Grid Style, Grid Color, Grid Order, Ruler Units, Grid Spacing )" id="Req_005" base_Class="_seSb0GP6EeOq0pDGL_YBMA"/>

   <Requirements:Requirement xmi:id="_u_1LgGP6EeOq0pDGL_YBMA" text="Snap To Grid must be able to snap on : &#xD;&#xA;- 4 corners of rectangle&#xD;&#xA;- 4 middles of side of a rectangle&#xD;&#xA;- anchors of link&#xD;&#xA;- bendpoints" id="Req_005" base_Class="_uKPAQGP6EeOq0pDGL_YBMA"/>

   <Requirements:Requirement xmi:id="_Uzo20OGuEeO_JM12vRgWBQ" text="Its possible to drop the seame element several time on the canva" id="Req006" base_Class="_UzjXQOGuEeO_JM12vRgWBQ"/>

+  <Requirements:Requirement xmi:id="_dQusYOvJEeOv4v5t8d2cOg" text="Each diagram must have a version  inorder to able possble migration" id="Req007" base_Class="_dQjtQOvJEeOv4v5t8d2cOg"/>

 </xmi:XMI>

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/factory/InteractionOverviewDiagramViewFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/factory/InteractionOverviewDiagramViewFactory.java
index c00f984d212..e14ec1589d9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/factory/InteractionOverviewDiagramViewFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/src-gen/org/eclipse/papyrus/uml/diagram/interactionoverview/factory/InteractionOverviewDiagramViewFactory.java
@@ -11,7 +11,9 @@
 package org.eclipse.papyrus.uml.diagram.interactionoverview.factory;
 
 import org.eclipse.gmf.runtime.diagram.ui.view.factories.DiagramViewFactory;
+import org.eclipse.gmf.runtime.notation.Diagram;
 import org.eclipse.gmf.runtime.notation.MeasurementUnit;
+import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramVersioningUtils;
 
 public class InteractionOverviewDiagramViewFactory extends DiagramViewFactory {
 
@@ -25,4 +27,11 @@ public class InteractionOverviewDiagramViewFactory extends DiagramViewFactory {
 	protected MeasurementUnit getMeasurementUnit() {
 		return MeasurementUnit.PIXEL_LITERAL;
 	}
+	@Override
+	protected Diagram createDiagramView() {
+		// TODO Auto-generated method stub
+		Diagram diagram= super.createDiagramView();
+		DiagramVersioningUtils.stampCurrentVersion(diagram);
+		return diagram;
+	}
 }