Merge "Bug 513318: [BPMN] UnsupportedOperationException when creating a subprocess merge from papyrus/streams/2.0-maintenance 93412837d1"
diff --git a/org.eclipse.papyrus.bpmn.diagram.common/css/style.css b/org.eclipse.papyrus.bpmn.diagram.common/css/style.css
index 6d7dd27..e73087b 100755
--- a/org.eclipse.papyrus.bpmn.diagram.common/css/style.css
+++ b/org.eclipse.papyrus.bpmn.diagram.common/css/style.css
@@ -29,6 +29,14 @@
visible:false;
}
+StructuredActivityNode > Compartment[kind="symbol"]{
+ visible: false;
+}
+
+ActivityParameterNode Compartment[kind="symbol"]{
+ visible: false;
+}
+
* > Compartment[kind="symbol"] {
visible:true;
}
diff --git a/org.eclipse.papyrus.bpmn.diagram.common/shapes/BusinessRuleTask.svg b/org.eclipse.papyrus.bpmn.diagram.common/shapes/BusinessRuleTask.svg
index 119a654..8afb9a0 100755
--- a/org.eclipse.papyrus.bpmn.diagram.common/shapes/BusinessRuleTask.svg
+++ b/org.eclipse.papyrus.bpmn.diagram.common/shapes/BusinessRuleTask.svg
@@ -1,3 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="17px" height="17px" version="1.1"><defs/><g transform="translate(0.5,0.5)"><rect x="-0.17" y="0.64" width="14" height="14" fill="#ffffff" stroke="#000000" pointer-events="none"/><path d="M -0.17 3.87 L 13.83 3.87 M -0.03 9.25 L 13.75 9.25 M 3.33 3.87 L 3.33 14.64" fill="none" stroke="#000000" 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="17px"
+ height="17px"
+ version="1.1"
+ id="svg3144"
+ inkscape:version="0.48.4 r9939"
+ sodipodi:docname="BusinessRuleTask.svg">
+ <metadata
+ id="metadata3156">
+ <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="640"
+ inkscape:window-height="480"
+ id="namedview3154"
+ showgrid="false"
+ inkscape:zoom="13.882353"
+ inkscape:cx="8.5"
+ inkscape:cy="8.5"
+ inkscape:window-x="2666"
+ inkscape:window-y="793"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="svg3144" />
+ <defs
+ id="defs3146" />
+ <g
+ transform="matrix(0.82231638,0,0,0.82231638,0.59705367,1.4613164)"
+ id="g3148">
+ <rect
+ x="-0.17"
+ y="0.63999999"
+ width="14"
+ height="14"
+ pointer-events="none"
+ id="rect3150"
+ style="fill:#ffffff;stroke:#000000" />
+ <path
+ d="m -0.17,3.87 14,0 m -13.86,5.38 13.78,0 M 3.33,3.87 l 0,10.77"
+ stroke-miterlimit="10"
+ pointer-events="none"
+ id="path3152"
+ inkscape:connector-curvature="0"
+ style="fill:none;stroke:#000000;stroke-miterlimit:10" />
+ </g>
+</svg>
diff --git a/org.eclipse.papyrus.bpmn.diagram.common/shapes/ManualTask.svg b/org.eclipse.papyrus.bpmn.diagram.common/shapes/ManualTask.svg
index b767ff5..afcd41a 100755
--- a/org.eclipse.papyrus.bpmn.diagram.common/shapes/ManualTask.svg
+++ b/org.eclipse.papyrus.bpmn.diagram.common/shapes/ManualTask.svg
@@ -11,8 +11,8 @@
height="1.7583696"
version="1.1"
id="svg2"
- inkscape:version="0.48.5 r10040"
- sodipodi:docname="ManualTask.svg">
+ inkscape:version="0.48.4 r9939"
+ sodipodi:docname="ManualTask2.svg">
<metadata
id="metadata12">
<rdf:RDF>
@@ -21,6 +21,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
@@ -33,27 +34,35 @@
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:window-width="997"
- inkscape:window-height="851"
+ inkscape:window-width="1920"
+ inkscape:window-height="1018"
id="namedview10"
- showgrid="false"
+ showgrid="true"
width="8px"
- inkscape:zoom="13.882353"
- inkscape:cx="1.5982334"
- inkscape:cy="7.8227815"
- inkscape:window-x="601"
- inkscape:window-y="73"
- inkscape:window-maximized="0"
+ inkscape:zoom="256"
+ inkscape:cx="0.97871923"
+ inkscape:cy="1.0445675"
+ inkscape:window-x="1912"
+ inkscape:window-y="525"
+ inkscape:window-maximized="1"
inkscape:current-layer="svg2"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
- borderlayer="false" />
+ borderlayer="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid3126"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" />
+ </sodipodi:namedview>
<defs
id="defs4" />
<g
- transform="matrix(0.13413262,0,0,0.11771512,0.08802453,-0.01471439)"
+ transform="matrix(0.09856062,0,0,0.08649705,0.07911631,0.10760863)"
id="g6">
<path
d="M -0.17,3.94 C 0.12,2.33 0.94,1.08 1.98,0.64 l 5.51,0 c 0.34,0.22 0.55,0.73 0.55,1.3 0,0.56 -0.21,1.07 -0.55,1.29 l -3.67,0 9.34,0 c 0.41,0.26 0.67,0.86 0.67,1.54 0,0.68 -0.26,1.28 -0.67,1.54 l -6.43,0 6.43,0 c 0.41,0.25 0.67,0.85 0.67,1.53 0,0.68 -0.26,1.28 -0.67,1.54 l -5.82,0 5.05,0 c 0.51,0 0.92,0.63 0.92,1.41 0,0.78 -0.41,1.42 -0.92,1.42 l -5.2,0 4.13,0 c 0.42,0 0.77,0.53 0.77,1.18 0,0.65 -0.35,1.18 -0.77,1.18 l -10.11,0 C 0.89,14.64 0.56,14.5 0.3,14.19 0.04,13.88 -0.13,13.42 -0.17,12.92 z"
diff --git a/org.eclipse.papyrus.bpmn.diagram.common/shapes/UserTask.svg b/org.eclipse.papyrus.bpmn.diagram.common/shapes/UserTask.svg
index b49dd37..390f54a 100755
--- a/org.eclipse.papyrus.bpmn.diagram.common/shapes/UserTask.svg
+++ b/org.eclipse.papyrus.bpmn.diagram.common/shapes/UserTask.svg
@@ -1,3 +1,82 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="17px" height="17px" version="1.1"><defs/><g transform="translate(0.5,0.5)"><path d="M -0.17 14.64 L -0.17 10.37 C 0.65 8.93 1.91 7.8 3.41 7.17 C 3.84 7.03 4.3 6.98 4.75 7.01 C 4.74 8.33 5.7 9.45 6.98 9.6 C 7.68 9.65 8.36 9.39 8.87 8.9 C 9.38 8.41 9.66 7.73 9.66 7.01 C 10.2 6.94 10.75 6.99 11.27 7.17 C 12.51 7.84 13.44 8.99 13.83 10.37 L 13.83 14.64 Z M 9.66 7.01 C 9.66 7.73 9.38 8.41 8.87 8.9 C 8.36 9.39 7.68 9.65 6.98 9.6 C 5.7 9.45 4.74 8.33 4.75 7.01 C 5 6.99 5.25 6.94 5.49 6.86 L 5.64 6.25 C 5.17 6.14 4.78 5.8 4.6 5.34 C 4.21 4.58 4.6 3.74 5.54 3.26 C 6.49 2.78 7.78 2.78 8.72 3.26 C 9.67 3.74 10.05 4.58 9.66 5.34 C 9.42 5.8 8.98 6.14 8.47 6.25 L 8.62 6.86 Z" fill="#ffffff" stroke="#000000" stroke-miterlimit="10" pointer-events="none"/><path d="M 2.22 12.2 L 2.22 14.48 M 11 12.2 L 11 14.48" fill="none" stroke="#000000" stroke-miterlimit="10" pointer-events="none"/><path d="M 4.6 5.34 C 3.93 4.65 3.75 3.62 4.15 2.74 C 4.66 1.59 5.75 0.82 6.98 0.76 C 8.38 0.64 9.69 1.43 10.26 2.74 C 10.62 3.65 10.38 4.69 9.66 5.34 C 9.71 4.86 9.6 4.38 9.37 3.96 C 8.74 3.56 7.96 3.5 7.28 3.81 C 6.56 3.45 5.71 3.51 5.05 3.96 C 4.76 4.36 4.6 4.84 4.6 5.34 Z" fill="#000000" stroke="#000000" 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="17px"
+ height="17px"
+ version="1.1"
+ id="svg3110"
+ inkscape:version="0.48.4 r9939"
+ sodipodi:docname="UserTask.svg">
+ <metadata
+ id="metadata3124">
+ <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="1018"
+ id="namedview3122"
+ showgrid="true"
+ inkscape:zoom="27.764706"
+ inkscape:cx="14.534113"
+ inkscape:cy="5.179427"
+ inkscape:window-x="1912"
+ inkscape:window-y="525"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg3110">
+ <inkscape:grid
+ type="xygrid"
+ id="grid3128"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" />
+ </sodipodi:namedview>
+ <defs
+ id="defs3112" />
+ <g
+ transform="matrix(0.87514124,0,0,0.87514124,0.56041243,0.74706886)"
+ id="g3114">
+ <path
+ d="m -0.17,14.64 0,-4.27 C 0.65,8.93 1.91,7.8 3.41,7.17 3.84,7.03 4.3,6.98 4.75,7.01 4.74,8.33 5.7,9.45 6.98,9.6 7.68,9.65 8.36,9.39 8.87,8.9 9.38,8.41 9.66,7.73 9.66,7.01 c 0.54,-0.07 1.09,-0.02 1.61,0.16 1.24,0.67 2.17,1.82 2.56,3.2 l 0,4.27 z M 9.66,7.01 C 9.66,7.73 9.38,8.41 8.87,8.9 8.36,9.39 7.68,9.65 6.98,9.6 5.7,9.45 4.74,8.33 4.75,7.01 5,6.99 5.25,6.94 5.49,6.86 L 5.64,6.25 C 5.17,6.14 4.78,5.8 4.6,5.34 4.21,4.58 4.6,3.74 5.54,3.26 6.49,2.78 7.78,2.78 8.72,3.26 9.67,3.74 10.05,4.58 9.66,5.34 9.42,5.8 8.98,6.14 8.47,6.25 l 0.15,0.61 z"
+ stroke-miterlimit="10"
+ pointer-events="none"
+ id="path3116"
+ inkscape:connector-curvature="0"
+ style="fill:#ffffff;stroke:#000000;stroke-miterlimit:10" />
+ <path
+ d="m 2.22,12.2 0,2.28 M 11,12.2 l 0,2.28"
+ stroke-miterlimit="10"
+ pointer-events="none"
+ id="path3118"
+ inkscape:connector-curvature="0"
+ style="fill:none;stroke:#000000;stroke-miterlimit:10" />
+ <path
+ d="M 4.6,5.34 C 3.93,4.65 3.75,3.62 4.15,2.74 4.66,1.59 5.75,0.82 6.98,0.76 8.38,0.64 9.69,1.43 10.26,2.74 10.62,3.65 10.38,4.69 9.66,5.34 9.71,4.86 9.6,4.38 9.37,3.96 8.74,3.56 7.96,3.5 7.28,3.81 6.56,3.45 5.71,3.51 5.05,3.96 4.76,4.36 4.6,4.84 4.6,5.34 z"
+ stroke-miterlimit="10"
+ pointer-events="none"
+ id="path3120"
+ inkscape:connector-curvature="0"
+ style="fill:#000000;stroke:#000000;stroke-miterlimit:10" />
+ </g>
+</svg>
