447667: [Revision module] a module about revision model shall be

integrated to Papyrus
https://bugs.eclipse.org/bugs/show_bug.cgi?id=447667

Change-Id: Ia548d58546ddb32ee32b6c892a29db181a86c684

6 files changed, 97 insertions, 3 deletions

diff --git a/extraplugins/revision/org.eclipse.papyrus.revisiontool/plugin.xml b/extraplugins/revision/org.eclipse.papyrus.revisiontool/plugin.xml
index d58f86e31d4..c60b75ce670 100644
--- a/extraplugins/revision/org.eclipse.papyrus.revisiontool/plugin.xml
+++ b/extraplugins/revision/org.eclipse.papyrus.revisiontool/plugin.xml
@@ -51,6 +51,12 @@
             path="pathmap://Review_PROFILES/Versioning.profile.uml"

             provider="CEA LIST">

       </profile>

+      <profile

+            description="Profile used to store some changes during revision"

+            name="ChangeProfile"

+            path="pathmap://Review_PROFILES/Changes.profile.uml"

+            provider="CEA LIST">

+      </profile>

    </extension>

 <extension point="org.eclipse.papyrus.views.properties.context">

 <context contextModel="properties/Review.ctx"/>

diff --git a/extraplugins/revision/org.eclipse.papyrus.revisiontool/resource/Changes.profile.di b/extraplugins/revision/org.eclipse.papyrus.revisiontool/resource/Changes.profile.di
new file mode 100644
index 00000000000..8634d4c00e0
--- /dev/null
+++ b/extraplugins/revision/org.eclipse.papyrus.revisiontool/resource/Changes.profile.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>

diff --git a/extraplugins/revision/org.eclipse.papyrus.revisiontool/resource/Changes.profile.notation b/extraplugins/revision/org.eclipse.papyrus.revisiontool/resource/Changes.profile.notation
new file mode 100644
index 00000000000..1cacd0d65cb
--- /dev/null
+++ b/extraplugins/revision/org.eclipse.papyrus.revisiontool/resource/Changes.profile.notation
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_2jGcsHPKEeSEG7KBSk_15g" type="PapyrusUMLProfileDiagram" name="StashChanges" measurementUnit="Pixel">

+  <children xmi:type="notation:Shape" xmi:id="_5U4n0XPKEeSEG7KBSk_15g" type="1031">

+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5VCY0nPKEeSEG7KBSk_15g" source="Stereotype_Annotation">

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5VCY03PKEeSEG7KBSk_15g" key="StereotypeWithQualifiedNameList" value=""/>

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5VCY1HPKEeSEG7KBSk_15g" key="StereotypeList" value="StandardProfile::Metaclass"/>

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5VCY1XPKEeSEG7KBSk_15g" key="Stereotype_Presentation_Kind" value="HorizontalStereo"/>

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5VCY1nPKEeSEG7KBSk_15g" key="PropStereoDisplay" value=""/>

+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5VCY13PKEeSEG7KBSk_15g" key="StereotypePropertyLocation" value="Compartment"/>

+    </eAnnotations>

+    <children xmi:type="notation:DecorationNode" xmi:id="_5VCY0HPKEeSEG7KBSk_15g" type="1084"/>

+    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5VCY0XPKEeSEG7KBSk_15g" x="418" y="174"/>

+  </children>

+  <children xmi:type="notation:Shape" xmi:id="_66M_0HPKEeSEG7KBSk_15g" type="1026">

+    <children xmi:type="notation:DecorationNode" xmi:id="_66M_0nPKEeSEG7KBSk_15g" type="1034"/>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_66M_03PKEeSEG7KBSk_15g" type="1071">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_66M_1HPKEeSEG7KBSk_15g"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_66M_1XPKEeSEG7KBSk_15g"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_66M_1nPKEeSEG7KBSk_15g"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_66M_13PKEeSEG7KBSk_15g"/>

+    </children>

+    <children xmi:type="notation:BasicCompartment" xmi:id="_66M_2HPKEeSEG7KBSk_15g" type="1019">

+      <styles xmi:type="notation:TitleStyle" xmi:id="_66M_2XPKEeSEG7KBSk_15g"/>

+      <styles xmi:type="notation:SortingStyle" xmi:id="_66M_2nPKEeSEG7KBSk_15g"/>

+      <styles xmi:type="notation:FilteringStyle" xmi:id="_66M_23PKEeSEG7KBSk_15g"/>

+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_66M_3HPKEeSEG7KBSk_15g"/>

+    </children>

+    <element xmi:type="uml:Stereotype" href="Changes.profile.uml#_65wT4HPKEeSEG7KBSk_15g"/>

+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_66M_0XPKEeSEG7KBSk_15g" x="425" y="348"/>

+  </children>

+  <styles xmi:type="notation:StringValueStyle" xmi:id="_2jGcsXPKEeSEG7KBSk_15g" name="diagram_compatibility_version" stringValue="1.0.0"/>

+  <styles xmi:type="notation:DiagramStyle" xmi:id="_2jGcsnPKEeSEG7KBSk_15g"/>

+  <styles xmi:type="style:PapyrusViewStyle" xmi:id="_2jGcs3PKEeSEG7KBSk_15g">

+    <owner xmi:type="uml:Profile" href="Changes.profile.uml#_2iNr4HPKEeSEG7KBSk_15g"/>

+  </styles>

+  <element xmi:type="uml:Profile" href="Changes.profile.uml#_2iNr4HPKEeSEG7KBSk_15g"/>

+  <edges xmi:type="notation:Connector" xmi:id="_9mCT83PKEeSEG7KBSk_15g" type="1013" source="_66M_0HPKEeSEG7KBSk_15g" target="_5U4n0XPKEeSEG7KBSk_15g">

+    <styles xmi:type="notation:FontStyle" xmi:id="_9mCT9HPKEeSEG7KBSk_15g"/>

+    <element xmi:type="uml:Extension" href="Changes.profile.uml#_9mCT8XPKEeSEG7KBSk_15g"/>

+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9mCT9XPKEeSEG7KBSk_15g" points="[-1, -14, 5, 149]$[-1, -138, 5, 25]"/>

+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9mME8HPKEeSEG7KBSk_15g" id="(0.49,0.14)"/>

+  </edges>

+</notation:Diagram>

diff --git a/extraplugins/revision/org.eclipse.papyrus.revisiontool/resource/Changes.profile.uml b/extraplugins/revision/org.eclipse.papyrus.revisiontool/resource/Changes.profile.uml
new file mode 100644
index 00000000000..bcbb41f6cc4
--- /dev/null
+++ b/extraplugins/revision/org.eclipse.papyrus.revisiontool/resource/Changes.profile.uml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<uml:Profile xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_2iNr4HPKEeSEG7KBSk_15g" name="Changes" metaclassReference="_5U4n0HPKEeSEG7KBSk_15g" metamodelReference="_2iNr4XPKEeSEG7KBSk_15g">

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

+    <contents xmi:type="ecore:EPackage" xmi:id="_BfrfAnPLEeSEG7KBSk_15g" name="Changes" nsURI="http:///schemas/Changes/_BfrfAHPLEeSEG7KBSk_15g/0" nsPrefix="Changes">

+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_BfrfCHPLEeSEG7KBSk_15g" source="PapyrusVersion">

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BfrfCXPLEeSEG7KBSk_15g" key="Version" value="0.0.1"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BfrfCnPLEeSEG7KBSk_15g" key="Comment" value=""/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BfrfC3PLEeSEG7KBSk_15g" key="Copyright" value="CEA LIST"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BfrfDHPLEeSEG7KBSk_15g" key="Date" value="2014-11-24"/>

+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BfrfDXPLEeSEG7KBSk_15g" key="Author" value="CEA LIST"/>

+      </eAnnotations>

+      <eClassifiers xmi:type="ecore:EClass" xmi:id="_BfrfA3PLEeSEG7KBSk_15g" name="StashChanges">

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

+        <eStructuralFeatures xmi:type="ecore:EReference" xmi:id="_BfrfBXPLEeSEG7KBSk_15g" name="base_Package" ordered="false" lowerBound="1">

+          <eType xmi:type="ecore:EClass" href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

+        </eStructuralFeatures>

+      </eClassifiers>

+    </contents>

+  </eAnnotations>

+  <elementImport xmi:type="uml:ElementImport" xmi:id="_5U4n0HPKEeSEG7KBSk_15g" alias="Package">

+    <importedElement xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>

+  </elementImport>

+  <packageImport xmi:type="uml:PackageImport" xmi:id="_2iNr4XPKEeSEG7KBSk_15g">

+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_METAMODELS/UML.metamodel.uml#_0"/>

+  </packageImport>

+  <packageImport xmi:type="uml:PackageImport" xmi:id="_2iNr4nPKEeSEG7KBSk_15g">

+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>

+  </packageImport>

+  <packagedElement xmi:type="uml:Stereotype" xmi:id="_65wT4HPKEeSEG7KBSk_15g" name="StashChanges">

+    <ownedAttribute xmi:type="uml:Property" xmi:id="_9mCT8HPKEeSEG7KBSk_15g" name="base_Package" association="_9mCT8XPKEeSEG7KBSk_15g">

+      <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Package"/>

+    </ownedAttribute>

+  </packagedElement>

+  <packagedElement xmi:type="uml:Extension" xmi:id="_9mCT8XPKEeSEG7KBSk_15g" name="E_StashChanges_Package1" memberEnd="_9mCT8nPKEeSEG7KBSk_15g _9mCT8HPKEeSEG7KBSk_15g">

+    <ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="_9mCT8nPKEeSEG7KBSk_15g" name="extension_StashChanges" type="_65wT4HPKEeSEG7KBSk_15g" aggregation="composite" association="_9mCT8XPKEeSEG7KBSk_15g"/>

+  </packagedElement>

+</uml:Profile>

diff --git a/extraplugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/dialogs/CreateOrSelectReviewModelDialog.java b/extraplugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/dialogs/CreateOrSelectReviewModelDialog.java
index 6efd947444c..32b91a1c3eb 100644
--- a/extraplugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/dialogs/CreateOrSelectReviewModelDialog.java
+++ b/extraplugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/dialogs/CreateOrSelectReviewModelDialog.java
@@ -30,6 +30,7 @@ import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;

 import org.eclipse.swt.widgets.Button;

 import org.eclipse.swt.widgets.Composite;

+import org.eclipse.swt.widgets.Display;

 import org.eclipse.swt.widgets.Label;

 import org.eclipse.swt.widgets.Shell;

 import org.eclipse.swt.widgets.Text;

@@ -282,7 +283,9 @@ public class CreateOrSelectReviewModelDialog extends FormDialog {
 			//creation

 			if (!(newTypeNameText.getText().trim().equals(""))){

 				resultReviewName=newTypeNameText.getText().trim();

+			

 				reviewResourceManager.createReviewModel(resultReviewName);

+				

 			}

 		}

 		super.okPressed();

diff --git a/extraplugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/RevisonDiagLayer.java b/extraplugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/RevisonDiagLayer.java
index 1b0fa13fdfa..ab2eea9ca26 100644
--- a/extraplugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/RevisonDiagLayer.java
+++ b/extraplugins/revision/org.eclipse.papyrus.revisiontool/src/org/eclipse/papyrus/revision/tool/ui/RevisonDiagLayer.java
@@ -104,9 +104,11 @@ public class RevisonDiagLayer {
 

 				if(fig instanceof PolylineConnectionEx){

 					Rectangle rect = new Rectangle(((PolylineConnectionEx)fig).getPoints().getFirstPoint(), ((PolylineConnectionEx)fig).getPoints().getLastPoint());

-					if(editPart instanceof ConnectionEditPart){

-						rect=((GraphicalEditPart)((ConnectionEditPart)editPart).getSource()).getFigure().getBounds().getCopy();

-						rect=rect.getUnion(((GraphicalEditPart)((ConnectionEditPart)editPart).getTarget()).getFigure().getBounds());

+					if(rect.x==0 &&rect.y==0){

+						if(editPart instanceof ConnectionEditPart){

+							rect=((GraphicalEditPart)((ConnectionEditPart)editPart).getSource()).getFigure().getBounds().getCopy();

+							rect=rect.getUnion(((GraphicalEditPart)((ConnectionEditPart)editPart).getTarget()).getFigure().getBounds());

+						}

 					}

 					removedFig.setBounds(rect);