From 5ffdefb497e0b878e3f49808067491e9993bba26 Mon Sep 17 00:00:00 2001
From: Géry Deloge
Date: Fri, 18 Nov 2016 10:59:49 +0100
Subject: Bug 507675: [BPMN] Data Input / Data Output for Activities

Change-Id: I856518a302e9e3472aaa5120c0ec009f9c57d9a9
Signed-off-by: Géry Deloge <gery.deloge@cea.fr>
---
 .../model/collaboration.paletteConfiguration       |  36 +++++++++++++++----
 .../css/style.css                                  |  39 +++++++++++++++++----
 .../model/process.paletteConfiguration             |  34 ++++++++++++++----
 .../model/BpmnNewChildMenu.xmi                     |   8 +++++
 .../icons/DataInputActivity.png                    | Bin 0 -> 1269 bytes
 .../icons/DataOutputActivity.png                   | Bin 0 -> 1257 bytes
 6 files changed, 98 insertions(+), 19 deletions(-)
 create mode 100644 extraplugins/bpmn/org.eclipse.papyrus.bpmn/icons/DataInputActivity.png
 create mode 100644 extraplugins/bpmn/org.eclipse.papyrus.bpmn/icons/DataOutputActivity.png

(limited to 'extraplugins')

diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.collaboration/model/collaboration.paletteConfiguration b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.collaboration/model/collaboration.paletteConfiguration
index e499bd0adcb..e803ae8bc3d 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.collaboration/model/collaboration.paletteConfiguration
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.collaboration/model/collaboration.paletteConfiguration
@@ -348,9 +348,9 @@
 		</ownedConfigurations>
 		<ownedConfigurations
 				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.collaboration.dataInput.tool"
-				label="Data Input"
-				description="Data Input">
+				id="bpmn.collaboration.dataInputTask.tool"
+				label="Data Input (Task)"
+				description="Data Input (Task)">
 			<icon
 					pluginID="org.eclipse.papyrus.bpmn"
 					iconPath="/icons/DataInput.png"/>
@@ -359,14 +359,36 @@
 		</ownedConfigurations>
 		<ownedConfigurations
 				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.collaboration.dataOutput.tool"
-				label="Data Output"
-				description="Data Output">
+				id="bpmn.collaboration.dataOutputTask.tool"
+				label="Data Output (Task)"
+				description="Data Output (Task)">
 			<icon
 					pluginID="org.eclipse.papyrus.bpmn"
 					iconPath="/icons/DataOutput.png"/>
 			<elementDescriptors
-					elementTypeId="org.eclipse.papyrus.bpmn.process.DataOutput_OutputPin_3014"/>
+					elementTypeId="org.eclipse.papyrus.bpmn.collaboration.DataOutput_OutputPin_3014"/>
+		</ownedConfigurations>
+		<ownedConfigurations
+				xsi:type="paletteconfiguration:ToolConfiguration"
+				id="bpmn.collaboration.dataInputActivity.tool"
+				label="Data Input (Activity)"
+				description="Data Input (Activity Parameter Node)">
+			<icon
+					pluginID="org.eclipse.papyrus.bpmn"
+					iconPath="/icons/DataInputActivity.png"/>
+			<elementDescriptors
+					elementTypeId="org.eclipse.papyrus.bpmn.collaboration.DataInput_ActivityParameterNode_3059"/>
+		</ownedConfigurations>
+		<ownedConfigurations
+				xsi:type="paletteconfiguration:ToolConfiguration"
+				id="bpmn.collaboration.dataOutputActivity.tool"
+				label="Data Output (Activity)"
+				description="Data Output (Activity Parameter Node)">
+			<icon
+					pluginID="org.eclipse.papyrus.bpmn"
+					iconPath="/icons/DataOutputActivity.png"/>
+			<elementDescriptors
+					elementTypeId="org.eclipse.papyrus.bpmn.collaboration.DataOutput_ActivityParameterNode_3059"/>
 		</ownedConfigurations>
 		<ownedConfigurations
 				xsi:type="paletteconfiguration:ToolConfiguration"
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.common/css/style.css b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.common/css/style.css
index 87da872786a..6d7dd2738e5 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.common/css/style.css
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.common/css/style.css
@@ -54,12 +54,6 @@ OpaqueAction > Compartment[kind="symbol"] {
 	maskLabel: stereotype;
 }
 
-[appliedStereotypes~="BPMNProfile::DataInput"]
-{
-	fillColor: white;	
-	maskLabel: stereotype;
-	transparency: 0
-}
 
 [appliedStereotypes~="BPMNProfile::GlobalTask"]
 {
@@ -376,3 +370,36 @@ alternateBorderColor path{
 [appliedStereotypes~="BPMNProfile::Lane"] > Compartment[kind="symbol"] {
 	visible: false;
 }
+
+
+ActivityParameterNode[appliedStereotypes~="BPMNProfile::DataOutput"] {
+	transparency:0.0;
+	lineWidth:2.0;
+	elementIcon:false;
+}
+
+ActivityParameterNode[appliedStereotypes~="BPMNProfile::DataInput"] {
+	transparency:0.0;
+	lineWidth:1.0;
+	elementIcon:false;
+}
+
+[appliedStereotypes~="BPMNProfile::DataInput"] > Label {
+	visible:false;
+}
+
+[appliedStereotypes~="BPMNProfile::DataOutput"] > Label {
+	visible:false;
+}
+
+[appliedStereotypes~="BPMNProfile::SequenceFlow"] > Label{
+	visible:false;
+}
+
+[appliedStereotypes~="BPMNProfile::StartEvent"] > Label{
+	visible:false;
+}
+
+[appliedStereotypes~="BPMNProfile::EndEvent"] > Label{
+	visible:false;
+}
\ No newline at end of file
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.process/model/process.paletteConfiguration b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.process/model/process.paletteConfiguration
index 9b2fabba20b..1488051d523 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.process/model/process.paletteConfiguration
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.process/model/process.paletteConfiguration
@@ -348,9 +348,9 @@
 		</ownedConfigurations>
 		<ownedConfigurations
 				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.process.dataInput.tool"
-				label="Data Input"
-				description="Data Input">
+				id="bpmn.process.dataInputTask.tool"
+				label="Data Input (Task)"
+				description="Data Input (Task)">
 			<icon
 					pluginID="org.eclipse.papyrus.bpmn"
 					iconPath="/icons/DataInput.png"/>
@@ -359,15 +359,37 @@
 		</ownedConfigurations>
 		<ownedConfigurations
 				xsi:type="paletteconfiguration:ToolConfiguration"
-				id="bpmn.process.dataOutput.tool"
-				label="Data Output"
-				description="Data Output">
+				id="bpmn.process.dataOutputTask.tool"
+				label="Data Output (Task)"
+				description="Data Output (Task)">
 			<icon
 					pluginID="org.eclipse.papyrus.bpmn"
 					iconPath="/icons/DataOutput.png"/>
 			<elementDescriptors
 					elementTypeId="org.eclipse.papyrus.bpmn.process.DataOutput_OutputPin_3014"/>
 		</ownedConfigurations>
+		<ownedConfigurations
+				xsi:type="paletteconfiguration:ToolConfiguration"
+				id="bpmn.process.dataInputActivity.tool"
+				label="Data Input (Activity)"
+				description="Data Input (Activity Parameter Node)">
+			<icon
+					pluginID="org.eclipse.papyrus.bpmn"
+					iconPath="/icons/DataInputActivity.png"/>
+			<elementDescriptors
+					elementTypeId="org.eclipse.papyrus.bpmn.process.DataInput_ActivityParameterNode_3059"/>
+		</ownedConfigurations>
+		<ownedConfigurations
+				xsi:type="paletteconfiguration:ToolConfiguration"
+				id="bpmn.process.dataOutputActivity.tool"
+				label="Data Output (Activity)"
+				description="Data Output (Activity Parameter Node)">
+			<icon
+					pluginID="org.eclipse.papyrus.bpmn"
+					iconPath="/icons/DataOutputActivity.png"/>
+			<elementDescriptors
+					elementTypeId="org.eclipse.papyrus.bpmn.process.DataOutput_ActivityParameterNode_3059"/>
+		</ownedConfigurations>
 		<ownedConfigurations
 				xsi:type="paletteconfiguration:ToolConfiguration"
 				id="bpmn.process.dataObject.tool"
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.ui/model/BpmnNewChildMenu.xmi b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.ui/model/BpmnNewChildMenu.xmi
index 9229e21330f..1f35ab75b1c 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.ui/model/BpmnNewChildMenu.xmi
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.ui/model/BpmnNewChildMenu.xmi
@@ -111,6 +111,14 @@
       label="Data Output"
       icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/DataOutput.png"
       elementTypeIdRef="org.eclipse.papyrus.bpmn.DataOutput_OutputPin"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
+        label="Data Input Activity"
+        icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/DataInputActivity.png"
+        elementTypeIdRef="org.eclipse.papyrus.bpmn.DataInput_ActivityParameterNode"/>
+  <menu xsi:type="ElementCreationMenuModel:CreationMenu"
+        label="Data Output Activity"
+        icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/DataOutputActivity.png"
+        elementTypeIdRef="org.eclipse.papyrus.bpmn.DataOutput_ActivityParameterNode"/>
   <menu xsi:type="ElementCreationMenuModel:CreationMenu"
       label="Data Object"
       icon="platform:/plugin/org.eclipse.papyrus.bpmn/icons/DataObject.png"
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/icons/DataInputActivity.png b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/icons/DataInputActivity.png
new file mode 100644
index 00000000000..e281fcb7e42
Binary files /dev/null and b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/icons/DataInputActivity.png differ
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/icons/DataOutputActivity.png b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/icons/DataOutputActivity.png
new file mode 100644
index 00000000000..1b7ff55a85c
Binary files /dev/null and b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/icons/DataOutputActivity.png differ
-- 
cgit v1.2.3