Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGéry Deloge2016-11-18 09:59:49 +0000
committerGéry Deloge2016-11-18 12:31:02 +0000
commitab88d4a6b1f04cfdf219439dc0e23704d28f78c9 (patch)
treeeeaf82033351b58117bda757fcc67dce9a274e39
parentcf3a9c9d3b1d9d2f73ec8fbd4762b804e5848ab3 (diff)
downloadorg.eclipse.papyrus-ab88d4a6b1f04cfdf219439dc0e23704d28f78c9.tar.gz
org.eclipse.papyrus-ab88d4a6b1f04cfdf219439dc0e23704d28f78c9.tar.xz
org.eclipse.papyrus-ab88d4a6b1f04cfdf219439dc0e23704d28f78c9.zip
Bug 507675: [BPMN] Data Input / Data Output for Activities
Change-Id: I856518a302e9e3472aaa5120c0ec009f9c57d9a9 Signed-off-by: Géry Deloge <gery.deloge@cea.fr>
-rw-r--r--extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.collaboration/model/collaboration.paletteConfiguration36
-rw-r--r--extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.common/css/style.css39
-rw-r--r--extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.process/model/process.paletteConfiguration34
-rw-r--r--extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.ui/model/BpmnNewChildMenu.xmi8
-rw-r--r--extraplugins/bpmn/org.eclipse.papyrus.bpmn/icons/DataInputActivity.pngbin0 -> 1269 bytes
-rw-r--r--extraplugins/bpmn/org.eclipse.papyrus.bpmn/icons/DataOutputActivity.pngbin0 -> 1257 bytes
6 files changed, 98 insertions, 19 deletions
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,9 +359,9 @@
</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"/>
@@ -370,6 +370,28 @@
</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"
label="Data Object"
description="Data Object">
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 2300f69f064..164aafdea28 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
@@ -112,6 +112,14 @@
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"
elementTypeIdRef="org.eclipse.papyrus.bpmn.DataObject_DataStoreNode"/>
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
--- /dev/null
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/icons/DataInputActivity.png
Binary files 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
--- /dev/null
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/icons/DataOutputActivity.png
Binary files differ

Back to the top