diff options
6 files changed, 91 insertions, 8 deletions
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.collaboration/plugin.xml b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.collaboration/plugin.xml index 01683b82f09..645f14d9258 100644 --- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.collaboration/plugin.xml +++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.collaboration/plugin.xml @@ -4,14 +4,14 @@ <extension point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration"> <elementTypeSet - id="org.eclipse.papyrus.bpmn.collaboration.elementTypeSet" + clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext" path="model/collaboration.elementtypesconfigurations"> </elementTypeSet> </extension> <extension point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration"> <elementTypeSet - id="org.eclipse.papyrus.bpmn.collaboration.elementTypeSetCustom" + clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext" path="model/collaborationCustom.elementtypesconfigurations"> </elementTypeSet> </extension> 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 4d86416fe72..87da872786a 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,6 +54,13 @@ OpaqueAction > Compartment[kind="symbol"] { maskLabel: stereotype; } +[appliedStereotypes~="BPMNProfile::DataInput"] +{ + fillColor: white; + maskLabel: stereotype; + transparency: 0 +} + [appliedStereotypes~="BPMNProfile::GlobalTask"] { fillColor: white; @@ -70,6 +77,16 @@ OpaqueAction > Compartment[kind="symbol"] { fillColor: white; displayTags: false; } + +[appliedStereotypes~="BPMNProfile::GlobalTask"]{ + fillColor: white; + displayTags: false; +} + +[appliedStereotypes~="BPMNProfile::CallActivity"]{ + fillColor: white; + displayTags: false; +} [appliedStereotypes~="BPMNProfile::ManualTask"]{ fillColor: white; diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.common/plugin.xml b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.common/plugin.xml index 3f64ce1a9c8..2e9c0068bf6 100644 --- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.common/plugin.xml +++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.common/plugin.xml @@ -2,7 +2,7 @@ <?eclipse version="3.4"?> <plugin> <extension - point="org.eclipse.papyrus.infra.core.papyrusDiagram"> + point="org.eclipse.papyrus.infra.ui.papyrusDiagram"> <diagramCategory class="org.eclipse.papyrus.bpmn.diagram.common.commands.CreateBpmnModelCommand" description="Papyrus BPMN diagrams" diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.common/shapes/parallel.svg b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.common/shapes/parallel.svg index 963abe76ff8..8739d46756a 100644 --- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.common/shapes/parallel.svg +++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.common/shapes/parallel.svg @@ -1 +1,67 @@ -<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="53px" height="53px" version="1.1"><defs/><g transform="translate(0.5,0.5)"><path d="M 26 1 L 51 26 L 26 51 L 1 26 Z" fill="#ffffff" stroke="#000000" stroke-miterlimit="10" pointer-events="none"/><path d="M 23 13.5 L 29 13.5 L 29 23 L 38.5 23 L 38.5 29 L 29 29 L 29 38.5 L 23 38.5 L 23 29 L 13.5 29 L 13.5 23 L 23 23 Z" fill="#000000" stroke="#ffffff" stroke-miterlimit="10" pointer-events="none"/></g></svg>
\ No newline at end of file +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="53px" + height="53px" + version="1.1" + id="svg2" + inkscape:version="0.91 r13725" + sodipodi:docname="parallel.svg"> + <metadata + id="metadata14"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + </cc:Work> + </rdf:RDF> + </metadata> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1920" + inkscape:window-height="1005" + id="namedview12" + showgrid="false" + inkscape:zoom="4.4528302" + inkscape:cx="-33.012712" + inkscape:cy="26.5" + inkscape:window-x="-9" + inkscape:window-y="-9" + inkscape:window-maximized="1" + inkscape:current-layer="svg2" /> + <defs + id="defs4" /> + <g + transform="translate(0.5,0.5)" + id="g6"> + <path + d="M 26,1 51,26 26,51 1,26 Z" + stroke-miterlimit="10" + pointer-events="none" + id="PapyrusPath" + inkscape:connector-curvature="0" + style="fill:#ffffff;stroke:#000000;stroke-miterlimit:10" /> + <path + d="M 23 13.5 L 29 13.5 L 29 23 L 38.5 23 L 38.5 29 L 29 29 L 29 38.5 L 23 38.5 L 23 29 L 13.5 29 L 13.5 23 L 23 23 Z" + fill="#000000" + stroke="#ffffff" + stroke-miterlimit="10" + pointer-events="none" + id="path10" /> + </g> +</svg> diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.process/plugin.xml b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.process/plugin.xml index 5be2fbf258e..3aa5e416b03 100644 --- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.process/plugin.xml +++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.process/plugin.xml @@ -4,14 +4,14 @@ <extension point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration"> <elementTypeSet - id="org.eclipse.papyrus.bpmn.process.elementTypeSet" + clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext" path="model/process.elementtypesconfigurations"> </elementTypeSet> </extension> <extension point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration"> <elementTypeSet - id="org.eclipse.papyrus.bpmn.process.elementTypeSetCustom" + clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext" path="model/processCustom.elementtypesconfigurations"> </elementTypeSet> </extension> diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/plugin.xml b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/plugin.xml index 00b5966d971..1e638e61fa4 100644 --- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn/plugin.xml +++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn/plugin.xml @@ -36,14 +36,14 @@ <extension point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration"> <elementTypeSet - id="org.eclipse.papyrus.bpmn.elementTypeSet" + clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext" path="model/bpmn.elementtypesconfigurations"> </elementTypeSet> </extension> <extension point="org.eclipse.papyrus.infra.elementtypesconfigurations.elementTypeSetConfiguration"> <elementTypeSet - id="org.eclipse.papyrus.bpmn.customElementTypeSet" + clientContextID="org.eclipse.papyrus.infra.services.edit.TypeContext" path="model/customBpmn.elementtypesconfigurations"> </elementTypeSet> </extension> |
